From ad7f11cc3d86cca98dcf27bcb70689efbbd9eda4 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 6 Dec 2025 16:58:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=86=E5=BC=80?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SurvStationInfoController.java | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) 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 cffac6e..9892477 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 @@ -274,7 +274,14 @@ public class SurvStationInfoController { List adds = iotutils.addOnlineStatus(camList); jsonObject.put("survCamera",adds); - List jsonArray = new ArrayList<>(); + List orientData = new ArrayList<>(); + List LiveData = new ArrayList<>(); + List stinkData = new ArrayList<>(); + List airData = new ArrayList<>(); + List soilData = new ArrayList<>(); + List waterData = new ArrayList<>(); + + Integer finalDataCounts = 0; //水实时 if(!orientList.isEmpty()) { @@ -282,7 +289,7 @@ public class SurvStationInfoController { ConstructOrient constructOrient = new ConstructOrient(); constructOrient.setDeploy(deployMap.get(survTransdataOrientwaterVo.getDeployCode())); constructOrient.setTransdataOrientwaterVo(survTransdataOrientwaterVo); - jsonArray.addAll(zhAdminFeignClient.constructOrient(constructOrient)); + orientData.addAll(zhAdminFeignClient.constructOrient(constructOrient)); //计算历史数据量 Integer dataCounts = hisdataOrientwaterService.getHisDataCount(orientList); finalDataCounts=finalDataCounts+dataCounts; @@ -292,7 +299,7 @@ public class SurvStationInfoController { ConstructLive constructLive = new ConstructLive(); constructLive.setDeploy(deployMap.get(survTransdataLivestockwaterVo.getDeployCode())); constructLive.setTransdataLivestockwaterVo(survTransdataLivestockwaterVo); - jsonArray.addAll(zhAdminFeignClient.constructLive(constructLive)); + LiveData.addAll(zhAdminFeignClient.constructLive(constructLive)); //计算历史数据量 Integer dataCounts = hisdataLivestockwaterService.getHisDataCount(liveList); finalDataCounts=finalDataCounts+dataCounts; @@ -305,7 +312,7 @@ public class SurvStationInfoController { BeanUtil.copyProperties(survTransdataAirVo,survTransdataAir); constructAir.setTransdataAir(survTransdataAir); constructAir.setDeploy(deployMap.get(survTransdataAirVo.getDeployCode())); - jsonArray.addAll(zhAdminFeignClient.constructAir(constructAir)); + airData.addAll(zhAdminFeignClient.constructAir(constructAir)); //计算历史数据量 Integer dataCounts = hisdataAirService.getHisDataCount(airList); finalDataCounts=finalDataCounts+dataCounts; @@ -318,7 +325,7 @@ public class SurvStationInfoController { BeanUtil.copyProperties(survTransdataSoilVo,survTransdataSoil); constructSoil.setTransdataSoil(survTransdataSoil); constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode())); - jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil)); + soilData.addAll(zhAdminFeignClient.constructSoil(constructSoil)); //计算历史数据量 Integer dataCounts = hisdataSoilService.getHisDataCount(soilList); finalDataCounts=finalDataCounts+dataCounts; @@ -331,7 +338,7 @@ public class SurvStationInfoController { BeanUtil.copyProperties(survTransdataSoilVo,survTransdataSoil); constructSoil.setTransdataSoil(survTransdataSoil); constructSoil.setDeploy(deployMap.get(survTransdataSoilVo.getDeployCode())); - jsonArray.addAll(zhAdminFeignClient.constructSoil(constructSoil)); + waterData.addAll(zhAdminFeignClient.constructSoil(constructSoil)); //计算历史数据量 Integer dataCounts = hisdataSoilService.getHisDataCount(waterList); finalDataCounts=finalDataCounts+dataCounts; @@ -341,7 +348,7 @@ public class SurvStationInfoController { SurvTransdataStinkVo survTransdataStinkVo = survTransdataVocsService.getNewestDataWithStation(stinkList); ConstructStink constructStink = new ConstructStink(); constructStink.setTransdataStinkVo(survTransdataStinkVo); - jsonArray.addAll(zhAdminFeignClient.constructStink(constructStink)); + stinkData.addAll(zhAdminFeignClient.constructStink(constructStink)); //计算历史数据量 Integer dataCounts = survHisdataVocsService.getHisDataCount(stinkList); finalDataCounts=finalDataCounts+dataCounts; @@ -369,11 +376,15 @@ public class SurvStationInfoController { survList = zhAdminFeignClient.translateArrPollution(transSurvObjVo); } curStation.setSurvColorItems(survList); - jsonObject.put("stationInfo",curStation); - //TODO 实时监测数据 - jsonObject.put("liveSurvData",jsonArray); - //TODO 历史监测数据 + //实时数据 + jsonObject.put("airSurvData",airData);//空气 + jsonObject.put("soilSurvData",soilData);//土壤 + jsonObject.put("waterSurvData",waterData);//水五常 + jsonObject.put("orientSurvData",orientData);//面源 + jsonObject.put("liveSurvData",liveList);//畜禽 + jsonObject.put("stinkSurvData",stinkData);//恶臭 + //历史数据 JSONArray hisjsonArray = new JSONArray(); if(!orientList.isEmpty()) { List oriDataList = hisdataOrientwaterService.getResentData(orientList,5);