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:31:02 +08:00
parent ee9af0baf3
commit 9e403c1f98
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,16 +317,16 @@ public class SurvStationInfoController {
finalDataCounts=finalDataCounts+dataCounts;
}
// //畜禽
// if(!liveList.isEmpty()) {
// SurvTransdataLivestockwaterVo survTransdataLivestockwaterVo = livestockwaterService.getNewestDataWithStation(liveList);
// ConstructLive constructLive = new ConstructLive();
// constructLive.setDeploy(deployMap.get(survTransdataLivestockwaterVo.getDeployCode()));
// constructLive.setTransdataLivestockwaterVo(survTransdataLivestockwaterVo);
// LiveData.addAll(zhAdminFeignClient.constructLive(constructLive));
// //计算历史数据量
// Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
// finalDataCounts=finalDataCounts+dataCounts;
// }
if(!liveList.isEmpty()) {
SurvTransdataLivestockwaterVo survTransdataLivestockwaterVo = livestockwaterService.getNewestDataWithStation(liveList);
ConstructLive constructLive = new ConstructLive();
constructLive.setDeploy(deployMap.get(survTransdataLivestockwaterVo.getDeployCode()));
constructLive.setTransdataLivestockwaterVo(survTransdataLivestockwaterVo);
LiveData.addAll(zhAdminFeignClient.constructLive(constructLive));
//计算历史数据量
Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList);
finalDataCounts=finalDataCounts+dataCounts;
}
// //气实时
// if(!airList.isEmpty()) {
// SurvTransdataAirVo survTransdataAirVo=transdataAirService.getNewestDataWithStation(airList);
@ -405,7 +405,7 @@ public class SurvStationInfoController {
jsonObject.put("soilSurvData",soilData);//土壤
jsonObject.put("waterSurvData",waterData);//水五常
jsonObject.put("orientSurvData",orientData);//面源
jsonObject.put("liveSurvData",liveList);//畜禽
jsonObject.put("liveSurvData",LiveData);//畜禽
jsonObject.put("stinkSurvData",stinkData);//恶臭
//历史数据
JSONArray hisjsonArray = new JSONArray();