From d42701c6ed4959189e8f276b8ff673d136439e28 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Thu, 27 Nov 2025 19:51:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BigScreenController.java       | 44 +++++++++++++------
 .../SurvTransdataOrientwaterServiceImpl.java  |  1 +
 .../common/vo/SurvTransdataOrientwaterVo.java |  6 +--
 3 files changed, 35 insertions(+), 16 deletions(-)

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 90b8fd3..d741c21 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
@@ -440,6 +440,7 @@ public class BigScreenController {
                                 List<CommonDataTrans> tpList = new ArrayList<>();
                                 List<CommonDataTrans> tnList = new ArrayList<>();
                                 List<CommonDataTrans> noList = new ArrayList<>();
+                                List<CommonDataTrans> codList = new ArrayList<>();
 //                                for (SurvHisdataOrientwater survHisdataOrientwater : oriDataList) {
 
                                 CommonDataTrans tpent = new CommonDataTrans();
@@ -462,15 +463,27 @@ public class BigScreenController {
                                 tnent.setStationCode(survStationInfo.getStationCode());
                                 tnent.setSurvItem(PollutionEnum.dataWaterTn.getCode());
 
-                                CommonDataTrans noent = new CommonDataTrans();
-                                noent.setName(PollutionEnum.dataWaterNo.getDescription());
-                                noent.setUnit(PollutionEnum.dataWaterNo.getUnit());
-                                noent.setColor(PollutionEnum.dataWaterNo.getColor());
-                                noent.setStationName(survStationInfo.getStationName());
-                                noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
-                                noent.setStationType(survStationInfo.getStationType());
-                                noent.setStationCode(survStationInfo.getStationCode());
-                                noent.setSurvItem(PollutionEnum.dataWaterNo.getCode());
+//                                CommonDataTrans noent = new CommonDataTrans();
+//                                noent.setName(PollutionEnum.dataWaterNo.getDescription());
+//                                noent.setUnit(PollutionEnum.dataWaterNo.getUnit());
+//                                noent.setColor(PollutionEnum.dataWaterNo.getColor());
+//                                noent.setStationName(survStationInfo.getStationName());
+//                                noent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
+//                                noent.setStationType(survStationInfo.getStationType());
+//                                noent.setStationCode(survStationInfo.getStationCode());
+//                                noent.setSurvItem(PollutionEnum.dataWaterNo.getCode());
+
+                                CommonDataTrans codent = new CommonDataTrans();
+                                codent.setName(PollutionEnum.dataWaterCod.getDescription());
+                                codent.setUnit(PollutionEnum.dataWaterCod.getUnit());
+                                codent.setColor(PollutionEnum.dataWaterCod.getColor());
+                                codent.setStationName(survStationInfo.getStationName());
+                                codent.setDataDateTime(transdataOrientwaterVo.getDataDateTime());
+                                codent.setStationType(survStationInfo.getStationType());
+                                codent.setStationCode(survStationInfo.getStationCode());
+                                codent.setSurvItem(PollutionEnum.dataWaterCod.getCode());
+
+
 
                                 String deployId = deployMap.get(transdataOrientwaterVo.getDeployCode()).getId();
 
@@ -478,16 +491,21 @@ public class BigScreenController {
                                 tpent.setDeployId(deployId);
                                 tnent.setValue(transdataOrientwaterVo.getDataWaterTn());
                                 tnent.setDeployId(deployId);
-                                noent.setValue(transdataOrientwaterVo.getDataWaterNo());
-                                noent.setDeployId(deployId);
+//                                noent.setValue(transdataOrientwaterVo.getDataWaterNo());
+//                                noent.setDeployId(deployId);
+                                codent.setValue(transdataOrientwaterVo.getDataWaterCod());
+                                codent.setDeployId(deployId);
+
                                 tpList.add(tpent);
                                 tnList.add(tnent);
-                                noList.add(noent);
+//                                noList.add(noent);
+                                codList.add(codent);
 //                                }
 
                                 listFinal.addAll(tnList);
                                 listFinal.addAll(tpList);
-                                listFinal.addAll(noList);
+//                                listFinal.addAll(noList);
+                                listFinal.addAll(codList);
 
 
 //                                returnArrs.add(JSONObject.parseObject(JSON.toJSONString(transdataOrientwaterVo)));
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataOrientwaterServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataOrientwaterServiceImpl.java
index d245e28..ba54c16 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataOrientwaterServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataOrientwaterServiceImpl.java
@@ -48,6 +48,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
             survTransdataOrientwaterVo.setDataWaterNo("3.7629");
             survTransdataOrientwaterVo.setDataWaterTp("1.0061");
             survTransdataOrientwaterVo.setDataWaterTn("2.0000");
+            survTransdataOrientwaterVo.setDataWaterCod("501.5000");
             survTransdataOrientwaterVo.setDataDateTime(LocalDateTime.now());
             survTransdataOrientwaterVo.setDeployCode(orientList.get(0));
         }
diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java
index fba12ff..c1e8e6f 100644
--- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java
+++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java
@@ -46,9 +46,9 @@ public class SurvTransdataOrientwaterVo implements Serializable {
 //    @ApiModelProperty(value = "氨氮")
 //    private String dataWaterNh;
 //	/**化学需氧量*/
-//	@Excel(name = "化学需氧量", width = 15)
-//    @ApiModelProperty(value = "化学需氧量")
-//    private String dataWaterCod;
+	@Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCod;
 	/**硝态氮*/
 	@Excel(name = "硝态氮", width = 15)
     @ApiModelProperty(value = "硝态氮")