Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小程序增加租戶

This commit is contained in:
zhangyue 2026-07-31 12:20:43 +08:00
parent e0205ee03c
commit a182acff73
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonP2ServiceImpl.java
View File

@ -251,32 +251,38 @@ public class IotCommonP2ServiceImpl {
todayDataCounts = nowDay.getDayOfMonth(); todayDataCounts = nowDay.getDayOfMonth();
yesterDataCounts = todayDataCounts; yesterDataCounts = todayDataCounts;
int lastDayOfMonth = yesterMonth.with(TemporalAdjusters.lastDayOfMonth()).getDayOfMonth();
if(todayDataCounts < lastDayOfMonth) {//查询的日期大于上个月的总天数时，不需要截取
String newTimes = yesterMonth.format(monthdtf); String newTimes = yesterMonth.format(monthdtf);
voSurvIntegrateParam.setStartTime(newTimes); voSurvIntegrateParam.setStartTime(newTimes);
voSurvIntegrateParam.setEndTime(newTimes); voSurvIntegrateParam.setEndTime(newTimes);
VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam); VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult(); LinkedHashMap<String, List<String>> yesterResult = yesterData.getSurvResult();
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode()); List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode());
if(y1!=null){ if (y1 != null) {
tempDatas.addAll(y1.subList(yesterDataCounts,y1.size())); tempDatas.addAll(y1.subList(yesterDataCounts, y1.size()));
} }
List<String> y2= yesterResult.get(PollutionEnum.dataWaterPh.getCode()); List<String> y2 = yesterResult.get(PollutionEnum.dataWaterPh.getCode());
if(y2!=null){ if (y2 != null) {
phDatas.addAll(y2.subList(yesterDataCounts,y2.size())); phDatas.addAll(y2.subList(yesterDataCounts, y2.size()));
} }
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterDdl.getCode()); List<String> y3 = yesterResult.get(PollutionEnum.dataWaterDdl.getCode());
if(y3!=null){ if (y3 != null) {
ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size())); ddlDatas.addAll(y3.subList(yesterDataCounts, y3.size()));
} }
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode()); List<String> y4 = yesterResult.get(PollutionEnum.dataWaterNtu.getCode());
if(y4!=null) { if (y4 != null) {
ntuDatas.addAll(y4.subList(yesterDataCounts,y4.size())); ntuDatas.addAll(y4.subList(yesterDataCounts, y4.size()));
} }
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterDo.getCode()); List<String> y5 = yesterResult.get(PollutionEnum.dataWaterDo.getCode());
if(y5!=null){ if (y5 != null) {
doDatas.addAll(y5.subList(yesterDataCounts,y5.size())); doDatas.addAll(y5.subList(yesterDataCounts, y5.size()));
}
timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts, yesterData.getIndexs().size()));
} }
timeList.addAll(yesterData.getIndexs().subList(yesterDataCounts,yesterData.getIndexs().size()));
} }
} else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())){//检查是否是本年 } else if (IotConstants.year_months.equals(screenSummaryVo.getSummrayMode())){//检查是否是本年
if(nowDay.format(yeardtf).equals(startTime)){//如果查询是本年，再查询一次去年，拼接为12个月 if(nowDay.format(yeardtf).equals(startTime)){//如果查询是本年，再查询一次去年，拼接为12个月