From 692e34d4db9994af7347029ddf1a17d3d13b4b40 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Sat, 6 Dec 2025 15:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BigScreenController.java       |  2 +-
 .../iot/common/VOSurvIntegrateLiveDetail.java | 22 +++++++++++++++++++
 .../common/VOSurvIntegrateOrientDetail.java   | 21 ++++++++++++++++++
 3 files changed, 44 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 9d2fd26..4952355 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
@@ -843,7 +843,7 @@ public class BigScreenController {
                                 if(transdataSoil!=null) {
                                     transdataSoil.setStationName(survStationInfo.getStationName());
                                     List<CommonDataTrans> trans =  CommonUtils.constructSoil(transdataSoil);
-                                    returnSoilArrs.addAll(trans);
+                                    returnWaterArrs.addAll(trans);
                                 }
                             }else if(PollutionConstants.STINK.equals(survDeviceDeploy.getDeployType())) {//恶臭
                                      SurvTransdataStinkVo  survTransdataAirVo = transdataVocsService.getNewestData(survDeviceDeploy.getDeployCode());
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java
index 5b1deb6..71d700f 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java
@@ -44,6 +44,14 @@ public class VOSurvIntegrateLiveDetail {
     @ApiModelProperty(value = "硝态氮(mg/L)")
     private String dataWaterNo;
 
+
+    /**
+     * 氨氮
+     */
+    @Excel(name = "氨氮水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "氨氮水样(mg/L)")
+    private String dataWaterNoSy;
+
     /**
      * 氨氮
      */
@@ -51,6 +59,13 @@ public class VOSurvIntegrateLiveDetail {
     @ApiModelProperty(value = "氨氮(mg/L)")
     private String dataWaterNh;
 
+    /**
+     * 氨氮
+     */
+    @Excel(name = "氨氮水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "氨氮水样(mg/L)")
+    private String dataWaterNhSy;
+
 
     /**
      * 化学需氧量
@@ -59,6 +74,13 @@ public class VOSurvIntegrateLiveDetail {
     @ApiModelProperty(value = "化学需氧量(mg/L)")
     private String dataWaterCod;
 
+    /**
+     * 总氮
+     */
+    @Excel(name = "化学需氧量水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "化学需氧量水样(mg/L)")
+    private String dataWaterCodSy;
+
 
 
 }
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java
index f6f09de..6ff2e88 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java
@@ -44,6 +44,13 @@ public class VOSurvIntegrateOrientDetail {
     @ApiModelProperty(value = "硝态氮(mg/L)")
     private String dataWaterNo;
 
+    /**
+     * 氨氮
+     */
+    @Excel(name = "氨氮水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "氨氮水样(mg/L)")
+    private String dataWaterNoSy;
+
     /**
      * 氨氮
      */
@@ -51,6 +58,13 @@ public class VOSurvIntegrateOrientDetail {
     @ApiModelProperty(value = "氨氮(mg/L)")
     private String dataWaterNh;
 
+    /**
+     * 氨氮
+     */
+    @Excel(name = "氨氮水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "氨氮水样(mg/L)")
+    private String dataWaterNhSy;
+
     /**
      * 化学需氧量
      */
@@ -58,5 +72,12 @@ public class VOSurvIntegrateOrientDetail {
     @ApiModelProperty(value = "化学需氧量(mg/L)")
     private String dataWaterCod;
 
+    /**
+     * 总氮
+     */
+    @Excel(name = "化学需氧量水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "化学需氧量水样(mg/L)")
+    private String dataWaterCodSy;
+
 
 }