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

移动端接口bug

This commit is contained in:
zy 2026-05-08 18:46:18 +08:00
parent 9e403c1f98
commit 8896dd685f
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
View File

@ -162,18 +162,18 @@ public class SurvStationInfoController {
finalDataCounts=finalDataCounts+dataCounts;
}
// //畜禽
// if(!liveList.isEmpty()) {
// //计算历史数据量
// Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
// finalDataCounts=finalDataCounts+dataCounts;
// }
if(!liveList.isEmpty()) {
//计算历史数据量
Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
finalDataCounts=finalDataCounts+dataCounts;
}
//气实时
// if(!airList.isEmpty()) {
//
// //计算历史数据量
// Integer dataCounts = hisdataAirService.getHisDataCount(airList);
// finalDataCounts=finalDataCounts+dataCounts;
// }
if(!airList.isEmpty()) {
//计算历史数据量
Integer dataCounts = hisdataAirService.getHisDataCount(airList);
finalDataCounts=finalDataCounts+dataCounts;
}
//土壤实时
if(!soilList.isEmpty()){
//计算历史数据量
@ -328,18 +328,18 @@ public class SurvStationInfoController {
finalDataCounts=finalDataCounts+dataCounts;
}
// //气实时
// if(!airList.isEmpty()) {
// SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList);
// ConstructAir constructAir = new ConstructAir();
// SurvTransdataAir survTransdataAir = new SurvTransdataAir();
// BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir);
// constructAir.setTransdataAir(survTransdataAir);
// constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode()));
// airData.addAll(zhAdminFeignClient.constructAir(constructAir));
// //计算历史数据量
// Integer dataCounts = hisdataAirService.getHisDataCount(airList);
// finalDataCounts=finalDataCounts+dataCounts;
// }
if(!airList.isEmpty()) {
SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList);
ConstructAir constructAir = new ConstructAir();
SurvTransdataAir survTransdataAir = new SurvTransdataAir();
BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir);
constructAir.setTransdataAir(survTransdataAir);
constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode()));
airData.addAll(zhAdminFeignClient.constructAir(constructAir));
//计算历史数据量
Integer dataCounts = hisdataAirService.getHisDataCount(airList);
finalDataCounts=finalDataCounts+dataCounts;
}
//土壤实时
if(!soilList.isEmpty()){
SurvTransdataSoilVo survTransdataSoilVo = transdataSoilService.getNewestDataWithStation(soilList);
@ -367,15 +367,15 @@ public class SurvStationInfoController {
finalDataCounts=finalDataCounts+dataCounts;
}
// //恶臭实时
// if(!stinkList.isEmpty()){
// SurvTransdataStinkVo survTransdataStinkVo = survTransdataVocsService.getNewestDataWithStation(stinkList);
// ConstructStink constructStink = new ConstructStink();
// constructStink.setTransdataStinkVo(survTransdataStinkVo);
// stinkData.addAll(zhAdminFeignClient.constructStink(constructStink));
// //计算历史数据量
// Integer dataCounts = survHisdataVocsService.getHisDataCount(stinkList);
//// finalDataCounts=finalDataCounts+dataCounts;
// }
if(!stinkList.isEmpty()){
SurvTransdataStinkVo survTransdataStinkVo = survTransdataVocsService.getNewestDataWithStation(stinkList);
ConstructStink constructStink = new ConstructStink();
constructStink.setTransdataStinkVo(survTransdataStinkVo);
stinkData.addAll(zhAdminFeignClient.constructStink(constructStink));
//计算历史数据量
Integer dataCounts = survHisdataVocsService.getHisDataCount(stinkList);
// finalDataCounts=finalDataCounts+dataCounts;
}
//获取数据量
curStation.setSurvDataCount(finalDataCounts);
//重新计算设备数