From ab64c802fcec42a44e2bcd002864049cf63c208c Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Wed, 26 Nov 2025 19:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=91=E6=B5=8B=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8D=95=E4=B8=AA=E8=AE=BE=E5=A4=87=E6=9C=80=E8=BF=91?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BigScreenController.java        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
index 50435ec..817430a 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
@@ -584,7 +584,9 @@ public class BigScreenController {
         List<String> deployTypes = new ArrayList<>();
         deployTypes.add(PollutionConstants.SOIL_SURV);
         deployTypes.add(PollutionConstants.AIR_SURV);
-        List<SurvDeviceDeploy> deploys =  deployService.getDeviceListByStation(null,deployTypes);
+        deployTypes.add(PollutionConstants.WATER_QULITY);
+        List<SurvDeviceDeploy> deploys =  deployService.getDeviceListByStation(stationCode,deployTypes);
+        List<String> waterIds  = new ArrayList<>();
         List<String> soilIds  = new ArrayList<>();
         List<String> airIds  = new ArrayList<>();
         if(!deploys.isEmpty()){
@@ -593,6 +595,8 @@ public class BigScreenController {
                     soilIds.add(deploy.getId());
                 }else if(PollutionConstants.AIR_SURV.equals(deploy.getDeployType())){//气象设备
                     airIds.add(deploy.getId());
+                }else if(PollutionConstants.WATER_QULITY.equals(deploy.getDeployType())){//水设备
+                    waterIds.add(deploy.getId());
                 }
             }
         }
@@ -621,6 +625,18 @@ public class BigScreenController {
         }
         jsonObject.put("airHisSurvData", airDataTrans);
 
+        List<CommonDataTrans> waterDataTrans = new ArrayList<>();
+        if(!waterIds.isEmpty()){
+            List<SurvTransdataSoil> waterData = transdataSoilService.lambdaQuery()
+                    .in(SurvTransdataSoil::getDeployId,waterIds)
+                    .list();
+
+            for (SurvTransdataSoil datas : waterData) {
+                List<CommonDataTrans> trans =  CommonUtils.constructSoil(datas);
+                waterDataTrans.addAll(trans);
+            }
+        }
+        jsonObject.put("waterHisSurvData", waterDataTrans);
         return Result.ok(jsonObject);
     }