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

统计bug

This commit is contained in:
zy 2025-12-06 15:31:49 +08:00
parent 231d73e4e1
commit 648c95f93d
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,11 +226,11 @@ public class IotCommonP2ServiceImpl {
LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
//处理时间格式
yesterData.setIndexs(commonService.processTime(yesterData.getIndexs(),"yyyy-MM-dd HH","H时"));
List<String> y1 = yesterResult.get(PollutionEnum.dataSoilTemp.getCode());
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode());
if(y1!=null){
tempDatas.addAll(y1.subList(yesterDataCounts,y1.size()));
}
List<String> y2= yesterResult.get(PollutionEnum.dataSoilPh.getCode());
List<String> y2= yesterResult.get(PollutionEnum.dataWaterDdl.getCode());
if(y2!=null){
phDatas.addAll(y2.subList(yesterDataCounts,y2.size()));
}
@ -259,15 +259,15 @@ public class IotCommonP2ServiceImpl {
voSurvIntegrateParam.setEndTime(newTimes);
VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
List<String> y1 = yesterResult.get(PollutionEnum.dataSoilTemp.getCode());
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode());
if(y1!=null){
tempDatas.addAll(y1.subList(yesterDataCounts,y1.size()));
}
List<String> y2= yesterResult.get(PollutionEnum.dataSoilPh.getCode());
List<String> y2= yesterResult.get(PollutionEnum.dataWaterPh.getCode());
if(y2!=null){
phDatas.addAll(y2.subList(yesterDataCounts,y2.size()));
}
List<String> y3 = yesterResult.get(PollutionEnum.dataSoilDdl.getCode());
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterDdl.getCode());
if(y3!=null){
ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
@ -292,15 +292,15 @@ public class IotCommonP2ServiceImpl {
voSurvIntegrateParam.setEndTime(newTimes);
VOSurvIntegrateResult yesterData = commonService.survDataIntegrateStatistic(voSurvIntegrateParam);
LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
List<String> y1 = yesterResult.get(PollutionEnum.dataSoilTemp.getCode());
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTemp.getCode());
if(y1!=null){
tempDatas.addAll(y1.subList(yesterDataCounts,y1.size()));
}
List<String> y2= yesterResult.get(PollutionEnum.dataSoilPh.getCode());
List<String> y2= yesterResult.get(PollutionEnum.dataWaterPh.getCode());
if(y2!=null){
phDatas.addAll(y2.subList(yesterDataCounts,y2.size()));
}
List<String> y3 = yesterResult.get(PollutionEnum.dataSoilDdl.getCode());
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterDdl.getCode());
if(y3!=null){
ddlDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
@ -317,15 +317,15 @@ public class IotCommonP2ServiceImpl {
}
timeList.addAll(survIntegrateResult.getIndexs().subList(0,todayDataCounts));
List<String> t1 = survResult.get(PollutionEnum.dataSoilTemp.getCode());
List<String> t1 = survResult.get(PollutionEnum.dataWaterTemp.getCode());
if(t1!=null){
tempDatas.addAll(t1.subList(0,todayDataCounts)) ;
}
List<String> t2= survResult.get(PollutionEnum.dataSoilPh.getCode());
List<String> t2= survResult.get(PollutionEnum.dataWaterPh.getCode());
if(t2!=null){
phDatas.addAll(t2.subList(0,todayDataCounts));
}
List<String> t3 = survResult.get(PollutionEnum.dataSoilDdl.getCode());
List<String> t3 = survResult.get(PollutionEnum.dataWaterDdl.getCode());
if(t3!=null){
ddlDatas.addAll(t3.subList(0,todayDataCounts));
}

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

@ -1206,23 +1206,23 @@ public class IotCommonServiceImpl {
LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
//处理时间格式
yesterData.setIndexs(processTime(yesterData.getIndexs(),"yyyy-MM-dd HH","H时"));
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTn.getCode());
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTnSy.getCode());
if(y1!=null){
tnDatas.addAll(y1.subList(yesterDataCounts,y1.size()));
}
List<String> y2= yesterResult.get(PollutionEnum.dataWaterTp.getCode());
List<String> y2= yesterResult.get(PollutionEnum.dataWaterTpSy.getCode());
if(y2!=null){
tpDatas.addAll(y2.subList(yesterDataCounts,y2.size()));
}
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterNo.getCode());
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterNoSy.getCode());
if(y3!=null){
noDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterCod.getCode());
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterCodSy.getCode());
if(y4!=null) {
codDatas.addAll(y4.subList(yesterDataCounts,y4.size()));
}
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterNh.getCode());
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterNhSy.getCode());
if(y5!=null){
nhDatas.addAll(y5.subList(yesterDataCounts,y5.size()));
}
@ -1239,23 +1239,23 @@ public class IotCommonServiceImpl {
voSurvIntegrateParam.setEndTime(newTimes);
VOSurvIntegrateResult yesterData = WaterIntegrateStatistic(voSurvIntegrateParam);
LinkedHashMap<String,List<String>> yesterResult = yesterData.getSurvResult();
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTn.getCode());
List<String> y1 = yesterResult.get(PollutionEnum.dataWaterTnSy.getCode());
if(y1!=null){
tnDatas.addAll(y1.subList(yesterDataCounts,y1.size()));
}
List<String> y2= yesterResult.get(PollutionEnum.dataWaterTp.getCode());
List<String> y2= yesterResult.get(PollutionEnum.dataWaterTpSy.getCode());
if(y2!=null){
tpDatas.addAll(y2.subList(yesterDataCounts,y2.size()));
}
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterNo.getCode());
List<String> y3 = yesterResult.get(PollutionEnum.dataWaterNoSy.getCode());
if(y3!=null){
noDatas.addAll(y3.subList(yesterDataCounts,y3.size()));
}
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterCod.getCode());
List<String> y4 = yesterResult.get(PollutionEnum.dataWaterCodSy.getCode());
if(y4!=null) {
codDatas.addAll(y4.subList(yesterDataCounts,y4.size()));
}
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterNh.getCode());
List<String> y5 = yesterResult.get(PollutionEnum.dataWaterNhSy.getCode());
if(y5!=null){
nhDatas.addAll(y5.subList(yesterDataCounts,y5.size()));
}
@ -1264,23 +1264,23 @@ public class IotCommonServiceImpl {
}
timeList.addAll(survIntegrateResult.getIndexs().subList(0,todayDataCounts));
List<String> t1 = survResult.get(PollutionEnum.dataWaterTn.getCode());
List<String> t1 = survResult.get(PollutionEnum.dataWaterTnSy.getCode());
if(t1!=null){
tnDatas.addAll(t1.subList(0,todayDataCounts)) ;
}
List<String> t2= survResult.get(PollutionEnum.dataWaterTp.getCode());
List<String> t2= survResult.get(PollutionEnum.dataWaterTpSy.getCode());
if(t2!=null){
tpDatas.addAll(t2.subList(0,todayDataCounts));
}
List<String> t3 = survResult.get(PollutionEnum.dataWaterNo.getCode());
List<String> t3 = survResult.get(PollutionEnum.dataWaterNoSy.getCode());
if(t3!=null){
noDatas.addAll(t3.subList(0,todayDataCounts));
}
List<String> t4 = survResult.get(PollutionEnum.dataWaterCod.getCode());
List<String> t4 = survResult.get(PollutionEnum.dataWaterCodSy.getCode());
if(t4!=null) {
codDatas.addAll(t4.subList(0,todayDataCounts));
}
List<String> t5 = survResult.get(PollutionEnum.dataWaterNh.getCode());
List<String> t5 = survResult.get(PollutionEnum.dataWaterNhSy.getCode());
if(t5!=null){
nhDatas.addAll(t5.subList(0,todayDataCounts));
}