From cd5d9b4206b5ee61e6247bb912aa876fc0dcd169 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Thu, 27 Nov 2025 19:30:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E6=BA=90=E5=8F=AA=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=B8=89=E7=A7=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/SurvHisdataOrientwaterServiceImpl.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
index 1184272..24ed8d3 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
@@ -62,8 +62,13 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
                         isNegative = true;
                     }
                 }
-                else if(StringUtils.isNotBlank(newestData.getDataWaterNo())){//跳过负数
-                    if(newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length()>10){
+//                else if(StringUtils.isNotBlank(newestData.getDataWaterNo())){//跳过负数
+//                    if(newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length()>10){
+//                        isNegative = true;
+//                    }
+//                }
+                else if(StringUtils.isNotBlank(newestData.getDataWaterCod())){//跳过负数
+                    if(newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length()>10){
                         isNegative = true;
                     }
                 }
@@ -84,6 +89,7 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
                 newestData.setDataWaterTp("1.0063");
                 newestData.setDataWaterTn("2.1114");
                 newestData.setDataWaterNo("3.8037");
+                newestData.setDataWaterCod("501.5000");
                 if ("xzp-water-02".equals(deployCode)) {
                     newestData.setDataWaterNo("16.3254");
                 }
@@ -114,7 +120,8 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
             hisdataOrientwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTn()), fixedRange, scale));
             hisdataOrientwater.setDataDateTime(nowTime);
             hisdataOrientwater.setDataGatherType("realTime");
-            hisdataOrientwater.setDataWaterNo(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNo()), fixedRange, scale));
+//            hisdataOrientwater.setDataWaterNo(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNo()), fixedRange, scale));
+            hisdataOrientwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale));
             hisdataOrientwater.setDeployCode(deployCode);
             hisdataOrientwater.setDataWaterTpSy(waterTpSy[values]);
             hisdataOrientwater.setDataWaterTpLd(waterTpLd[values]);