diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java index 181d3e4..56cea0f 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java @@ -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();