From 8896dd685f00d2012426e36f8bfefacde43118ef Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Fri, 8 May 2026 18:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A5=E5=8F=A3bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SurvStationInfoController.java | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 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 56cea0f..4c81868 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
@@ -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);
             //重新计算设备数