From 8a9985dd8b81161d79ab849a27a1c75bdcd5cdbe Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Sat, 6 Dec 2025 16:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B0=B4=E6=A0=B7=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SurvHisdataLivestockwater.java     | 10 ++
 .../SurvHisdataLivestockwaterError.java       | 94 ++++++++++---------
 .../lanhai/entity/SurvHisdataOrientwater.java | 57 +++++++----
 .../entity/SurvHisdataOrientwaterError.java   | 50 +++++++---
 .../entity/SurvTransdataLivestockwater.java   | 10 ++
 .../entity/SurvTransdataOrientwater.java      | 61 ++++++++----
 .../SurvHisdataLivestockwaterServiceImpl.java | 35 +++----
 .../SurvHisdataOrientwaterServiceImpl.java    | 37 ++++----
 ...urvTransdataLivestockwaterServiceImpl.java | 12 +--
 .../SurvTransdataOrientwaterServiceImpl.java  | 16 ++--
 10 files changed, 239 insertions(+), 143 deletions(-)

diff --git a/src/main/java/com/lanhai/entity/SurvHisdataLivestockwater.java b/src/main/java/com/lanhai/entity/SurvHisdataLivestockwater.java
index 43ae778..3bdfb9f 100644
--- a/src/main/java/com/lanhai/entity/SurvHisdataLivestockwater.java
+++ b/src/main/java/com/lanhai/entity/SurvHisdataLivestockwater.java
@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -62,6 +64,14 @@ public class SurvHisdataLivestockwater extends Model<SurvHisdataLivestockwater>
      */
     @TableField("DATA_WATER_NO")
     private String dataWaterNo;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_SY")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_LD")
+    private String dataWaterNoLd;
 
     /**
      * 氨氮
diff --git a/src/main/java/com/lanhai/entity/SurvHisdataLivestockwaterError.java b/src/main/java/com/lanhai/entity/SurvHisdataLivestockwaterError.java
index 410dea9..d6cda62 100644
--- a/src/main/java/com/lanhai/entity/SurvHisdataLivestockwaterError.java
+++ b/src/main/java/com/lanhai/entity/SurvHisdataLivestockwaterError.java
@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -42,30 +44,77 @@ public class SurvHisdataLivestockwaterError extends Model<SurvHisdataLivestockwa
      */
     @TableField("DATA_WATER_TP")
     private String dataWaterTp;
+    @TableField("DATA_WATER_TP_SY")
+    private String dataWaterTpSy;
+    @TableField("DATA_WATER_TP_LD")
+    private String dataWaterTpLd;
 
     /**
      * 总氮
      */
     @TableField("DATA_WATER_TN")
     private String dataWaterTn;
+    @TableField("DATA_WATER_TN_SY")
+    private String dataWaterTnSy;
+    @TableField("DATA_WATER_TN_LD")
+    private String dataWaterTnLd;
 
     /**
      * 硝态氮
      */
     @TableField("DATA_WATER_NO")
     private String dataWaterNo;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_SY")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_LD")
+    private String dataWaterNoLd;
 
     /**
      * 氨氮
      */
     @TableField("DATA_WATER_NH")
     private String dataWaterNh;
+    @TableField("DATA_WATER_NH_SY")
+    private String dataWaterNhSy;
+    @TableField("DATA_WATER_NH_LD")
+    private String dataWaterNhLd;
 
     /**
      * 化学需氧量
      */
     @TableField("DATA_WATER_COD")
     private String dataWaterCod;
+    @TableField("DATA_WATER_COD_SY")
+    private String dataWaterCodSy;
+    @TableField("DATA_WATER_COD_LD")
+    private String dataWaterCodLd;
+
+    @TableField("FLUID_LEVEL")
+    private String fluidLevel;//液位
+
+    @TableField("FIRST_VALVE_STATUS")
+    private String firstValveStatus;//1#球阀状态
+
+    @TableField("SECOND_VALVE_STATUS")
+    private String secondValveStatus;//2#球阀状态
+    /**
+     * 3#球阀状态
+     */
+    @TableField("THIRD_VALVE_STATUS")
+    private String thirdValveStatus;
+
+    @TableField("CRASH_STOP_STATUS")
+    private String crashStopStatus;//急停状态
+
+    @TableField("WATER_PUMP_STATUS")
+    private String waterPumpStatus;//水泵状态
+
+    @TableField("MAIN_SIDE_STATUS")
+    private String mainSideStatus;//主副泵状态
 
     /**
      * 数据更新时间
@@ -175,53 +224,8 @@ public class SurvHisdataLivestockwaterError extends Model<SurvHisdataLivestockwa
     @TableField("UPDATED_TIME")
     private Date updatedTime;
 
-    @TableField("DATA_WATER_TP_SY")
-    private String dataWaterTpSy;
 
-    @TableField("DATA_WATER_TP_LD")
-    private String dataWaterTpLd;
 
-    @TableField("DATA_WATER_TN_SY")
-    private String dataWaterTnSy;
-
-    @TableField("DATA_WATER_TN_LD")
-    private String dataWaterTnLd;
-
-    @TableField("DATA_WATER_NH_SY")
-    private String dataWaterNhSy;
-
-    @TableField("DATA_WATER_NH_LD")
-    private String dataWaterNhLd;
-
-    @TableField("DATA_WATER_COD_SY")
-    private String dataWaterCodSy;
-
-    @TableField("DATA_WATER_COD_LD")
-    private String dataWaterCodLd;
-
-    @TableField("FLUID_LEVEL")
-    private String fluidLevel;
-
-    @TableField("FIRST_VALVE_STATUS")
-    private String firstValveStatus;
-
-    @TableField("SECOND_VALVE_STATUS")
-    private String secondValveStatus;
-
-    /**
-     * 3#球阀状态
-     */
-    @TableField("THIRD_VALVE_STATUS")
-    private String thirdValveStatus;
-
-    @TableField("CRASH_STOP_STATUS")
-    private String crashStopStatus;
-
-    @TableField("WATER_PUMP_STATUS")
-    private String waterPumpStatus;
-
-    @TableField("MAIN_SIDE_STATUS")
-    private String mainSideStatus;
 
 
 
diff --git a/src/main/java/com/lanhai/entity/SurvHisdataOrientwater.java b/src/main/java/com/lanhai/entity/SurvHisdataOrientwater.java
index 4ff715b..67ebf4a 100644
--- a/src/main/java/com/lanhai/entity/SurvHisdataOrientwater.java
+++ b/src/main/java/com/lanhai/entity/SurvHisdataOrientwater.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -43,7 +44,6 @@ public class SurvHisdataOrientwater extends Model<SurvHisdataOrientwater> {
      */
     @TableField("DATA_WATER_TP")
     private String dataWaterTp;
-
     @TableField("DATA_WATER_TP_SY")
     private String dataWaterTpSy;
     @TableField("DATA_WATER_TP_LD")
@@ -54,12 +54,48 @@ public class SurvHisdataOrientwater extends Model<SurvHisdataOrientwater> {
      */
     @TableField("DATA_WATER_TN")
     private String dataWaterTn;
-
     @TableField("DATA_WATER_TN_SY")
     private String dataWaterTnSy;
     @TableField("DATA_WATER_TN_LD")
     private String dataWaterTnLd;
 
+    /**
+     * 硝态氮
+     */
+    @TableField("DATA_WATER_NO")
+    private String dataWaterNo;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_SY")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_LD")
+    private String dataWaterNoLd;
+
+    /**
+     * 氨氮
+     */
+    @TableField("DATA_WATER_NH")
+    private String dataWaterNh;
+    @TableField("DATA_WATER_NH_SY")
+    private String dataWaterNhSy;
+    @TableField("DATA_WATER_NH_LD")
+    private String dataWaterNhLd;
+
+    /**
+     * 化学需氧量
+     */
+    @TableField("DATA_WATER_COD")
+    private String dataWaterCod;
+    @TableField("DATA_WATER_COD_SY")
+    private String dataWaterCodSy;
+    @TableField("DATA_WATER_COD_LD")
+    private String dataWaterCodLd;
+
+
+
+
 
     @TableField("FLUID_LEVEL")
     private String fluidLevel;//液位
@@ -85,23 +121,6 @@ public class SurvHisdataOrientwater extends Model<SurvHisdataOrientwater> {
     private String mainSideStatus;//主副泵状态
 
 
-    /**
-     * 氨氮
-     */
-    @TableField("DATA_WATER_NH")
-    private String dataWaterNh;
-
-    /**
-     * 化学需氧量
-     */
-    @TableField("DATA_WATER_COD")
-    private String dataWaterCod;
-
-    /**
-     * 硝态氮
-     */
-    @TableField("DATA_WATER_NO")
-    private String dataWaterNo;
 
     /**
      * 数据更新时间
diff --git a/src/main/java/com/lanhai/entity/SurvHisdataOrientwaterError.java b/src/main/java/com/lanhai/entity/SurvHisdataOrientwaterError.java
index 1de2322..ff67e8f 100644
--- a/src/main/java/com/lanhai/entity/SurvHisdataOrientwaterError.java
+++ b/src/main/java/com/lanhai/entity/SurvHisdataOrientwaterError.java
@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -42,54 +44,74 @@ public class SurvHisdataOrientwaterError extends Model<SurvHisdataOrientwaterErr
      */
     @TableField("DATA_WATER_TP")
     private String dataWaterTp;
-
     /**
      * 总磷水样
      */
     @TableField("DATA_WATER_TP_SY")
     private String dataWaterTpSy;
-
     /**
      * 总磷零点
      */
     @TableField("DATA_WATER_TP_LD")
     private String dataWaterTpLd;
 
+
     /**
      * 总氮
      */
     @TableField("DATA_WATER_TN")
     private String dataWaterTn;
-
     /**
      * 总氮水样
      */
     @TableField("DATA_WATER_TN_SY")
     private String dataWaterTnSy;
-
     /**
      * 总氮零点
      */
     @TableField("DATA_WATER_TN_LD")
     private String dataWaterTnLd;
 
-    /**
-     * 氨氮
-     */
-    @TableField("DATA_WATER_NH")
-    private String dataWaterNh;
 
-    /**
-     * 化学需氧量
-     */
-    @TableField("DATA_WATER_COD")
-    private String dataWaterCod;
+
 
     /**
      * 硝态氮
      */
     @TableField("DATA_WATER_NO")
     private String dataWaterNo;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_SY")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_LD")
+    private String dataWaterNoLd;
+
+
+
+    /**
+     * 氨氮
+     */
+    @TableField("DATA_WATER_NH")
+    private String dataWaterNh;
+    @TableField("DATA_WATER_NH_SY")
+    private String dataWaterNhSy;
+    @TableField("DATA_WATER_NH_LD")
+    private String dataWaterNhLd;
+
+
+    /**
+     * 化学需氧量
+     */
+    @TableField("DATA_WATER_COD")
+    private String dataWaterCod;
+    @TableField("DATA_WATER_COD_SY")
+    private String dataWaterCodSy;
+    @TableField("DATA_WATER_COD_LD")
+    private String dataWaterCodLd;
+
 
     /**
      * 液位
diff --git a/src/main/java/com/lanhai/entity/SurvTransdataLivestockwater.java b/src/main/java/com/lanhai/entity/SurvTransdataLivestockwater.java
index a691ae7..0672013 100644
--- a/src/main/java/com/lanhai/entity/SurvTransdataLivestockwater.java
+++ b/src/main/java/com/lanhai/entity/SurvTransdataLivestockwater.java
@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -63,6 +65,14 @@ public class SurvTransdataLivestockwater extends Model<SurvTransdataLivestockwat
      */
     @TableField("DATA_WATER_NO")
     private String dataWaterNo;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_SY")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_LD")
+    private String dataWaterNoLd;
 
     /**
      * 氨氮
diff --git a/src/main/java/com/lanhai/entity/SurvTransdataOrientwater.java b/src/main/java/com/lanhai/entity/SurvTransdataOrientwater.java
index 1c81817..35d9a40 100644
--- a/src/main/java/com/lanhai/entity/SurvTransdataOrientwater.java
+++ b/src/main/java/com/lanhai/entity/SurvTransdataOrientwater.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -43,13 +44,13 @@ public class SurvTransdataOrientwater extends Model<SurvTransdataOrientwater> {
      */
     @TableField("DATA_WATER_TP")
     private String dataWaterTp;
-
-
     @TableField("DATA_WATER_TP_SY")
     private String dataWaterTpSy;
     @TableField("DATA_WATER_TP_LD")
     private String dataWaterTpLd;
 
+
+
     /**
      * 总氮
      */
@@ -61,6 +62,46 @@ public class SurvTransdataOrientwater extends Model<SurvTransdataOrientwater> {
     @TableField("DATA_WATER_TN_LD")
     private String dataWaterTnLd;
 
+
+    /**
+     * 硝态氮
+     */
+    @TableField("DATA_WATER_NO")
+    private String dataWaterNo;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_SY")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @ApiModelProperty(value = "硝态氮")
+    @TableField("DATA_WATER_NO_LD")
+    private String dataWaterNoLd;
+
+
+
+    /**
+     * 氨氮
+     */
+    @TableField("DATA_WATER_NH")
+    private String dataWaterNh;
+    @TableField("DATA_WATER_NH_SY")
+    private String dataWaterNhSy;
+    @TableField("DATA_WATER_NH_LD")
+    private String dataWaterNhLd;
+
+    /**
+     * 化学需氧量
+     */
+    @TableField("DATA_WATER_COD")
+    private String dataWaterCod;
+    @TableField("DATA_WATER_COD_SY")
+    private String dataWaterCodSy;
+    @TableField("DATA_WATER_COD_LD")
+    private String dataWaterCodLd;
+
+
+
+
     @TableField("FLUID_LEVEL")
     private String fluidLevel;//液位
 
@@ -86,23 +127,7 @@ public class SurvTransdataOrientwater extends Model<SurvTransdataOrientwater> {
     private String mainSideStatus;//主副泵状态
 
 
-    /**
-     * 氨氮
-     */
-    @TableField("DATA_WATER_NH")
-    private String dataWaterNh;
 
-    /**
-     * 化学需氧量
-     */
-    @TableField("DATA_WATER_COD")
-    private String dataWaterCod;
-
-    /**
-     * 硝态氮   硝碳氮
-     */
-    @TableField("DATA_WATER_NO")
-    private String dataWaterNo;
 
     /**
      * 数据更新时间
diff --git a/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
index d8f1bf6..e32ae2f 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
@@ -70,18 +70,18 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
               orgId = newestData.getId();
               boolean isNegative = false;
              //检查有没有负数
-              if(StringUtils.isNotBlank(newestData.getDataWaterTp())){//跳过负数
-                  if(newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length()>10){
+              if(StringUtils.isNotBlank(newestData.getDataWaterTpSy())){//跳过负数
+                  if(newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length()>10){
                       isNegative = true;
                   }
               }
-              else if(StringUtils.isNotBlank(newestData.getDataWaterTn())){//跳过负数
-                  if(newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length()>10){
+              else if(StringUtils.isNotBlank(newestData.getDataWaterTnSy())){//跳过负数
+                  if(newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length()>10){
                       isNegative = true;
                   }
               }
-              else if(StringUtils.isNotBlank(newestData.getDataWaterNo())){//跳过负数
-                  if(newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length()>10){
+              else if(StringUtils.isNotBlank(newestData.getDataWaterNoSy())){//跳过负数
+                  if(newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length()>10){
                       isNegative = true;
                   }
               }
@@ -135,8 +135,8 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
           hisdataLivestockwater.setDataDateTime(nowTime);
           hisdataLivestockwater.setDataGatherType(IotConstants.MARK_GENDATA);
 
-//          hisdataLivestockwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTp()), fixedRange, scale));
-//          hisdataLivestockwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTn()), fixedRange, scale));
+//          hisdataLivestockwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTpSy()), fixedRange, scale));
+//          hisdataLivestockwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTnSy()), fixedRange, scale));
 //          hisdataLivestockwater.setDataWaterNh(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNh()), fixedRange, scale));
 //          hisdataLivestockwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale));
 
@@ -199,23 +199,23 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
                         orgId = newestData.getId();
                         boolean isNegative = false;
                         //检查有没有负数
-                        if (StringUtils.isNotBlank(newestData.getDataWaterTp())) {//跳过负数
-                            if (newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length() > 10) {
+                        if (StringUtils.isNotBlank(newestData.getDataWaterTpSy())) {//跳过负数
+                            if (newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterTn())) {//跳过负数
-                            if (newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length() > 10) {
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterTnSy())) {//跳过负数
+                            if (newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNo())) {//跳过负数
-                            if (newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length() > 10) {
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNoSy())) {//跳过负数
+                            if (newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNh())) {//跳过负数
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNhSy())) {//跳过负数
                             if (newestData.getDataWaterNh().contains("-") || newestData.getDataWaterNh().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterCod())) {//跳过负数
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterCodSy())) {//跳过负数
                             if (newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length() > 10) {
                                 isNegative = true;
                             }
@@ -306,6 +306,9 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
                             BigDecimal fixedRange = new BigDecimal(rule.getFactor());
                             int scale = rule.getScale();//小数位
                             String correctVal = BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(vals), fixedRange, scale);
+                            if(correctVal.contains("-") || "0".equals(correctVal)){//如果是负数或0用原来的值
+                                correctVal = vals;
+                            }
                             TUtil.setFieldValue(hisdataLivestockwater, rule.getFields(), correctVal);
                         } else {
                             log.error("==========设备:{}，编号:{}指标：{}配置错误==============，跳过", deploy.getDeployDes(), deploy.getDeployCode(), rule.getFields());
diff --git a/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
index fa1000d..57dfa88 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
@@ -75,18 +75,18 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
                 orgId = newestData.getId();
                 boolean isNegative = false;
                 //检查有没有负数
-                if(StringUtils.isNotBlank(newestData.getDataWaterTp())){//跳过负数
-                    if(newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length()>10){
+                if(StringUtils.isNotBlank(newestData.getDataWaterTpSy())){//跳过负数
+                    if(newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length()>10){
                         isNegative = true;
                     }
                 }
-                else if(StringUtils.isNotBlank(newestData.getDataWaterTn())){//跳过负数
-                    if(newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length()>10){
+                else if(StringUtils.isNotBlank(newestData.getDataWaterTnSy())){//跳过负数
+                    if(newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length()>10){
                         isNegative = true;
                     }
                 }
-                else if(StringUtils.isNotBlank(newestData.getDataWaterNo())){//跳过负数
-                    if(newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length()>10){
+                else if(StringUtils.isNotBlank(newestData.getDataWaterNoSy())){//跳过负数
+                    if(newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length()>10){
                         isNegative = true;
                     }
                 }
@@ -150,9 +150,9 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
             hisdataOrientwater.setDataDateTime(nowTime);
             hisdataOrientwater.setDataGatherType(IotConstants.MARK_GENDATA);
 
-//            hisdataOrientwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTp()), fixedRange, scale));
-//            hisdataOrientwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTn()), fixedRange, scale));
-//            hisdataOrientwater.setDataWaterNo(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNo()), fixedRange, scale));
+//            hisdataOrientwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTpSy()), fixedRange, scale));
+//            hisdataOrientwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTnSy()), fixedRange, scale));
+//            hisdataOrientwater.setDataWaterNo(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNoSy()), fixedRange, scale));
 //            hisdataOrientwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale));
 
             for (ScEquZhibiao zhibiao : zhibiaos) {
@@ -218,23 +218,23 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
                         orgId = newestData.getId();
                         boolean isNegative = false;
                         //检查有没有负数
-                        if (StringUtils.isNotBlank(newestData.getDataWaterTp())) {//跳过负数
-                            if (newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length() > 10) {
+                        if (StringUtils.isNotBlank(newestData.getDataWaterTpSy())) {//跳过负数
+                            if (newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterTn())) {//跳过负数
-                            if (newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length() > 10) {
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterTnSy())) {//跳过负数
+                            if (newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNo())) {//跳过负数
-                            if (newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length() > 10) {
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNoSy())) {//跳过负数
+                            if (newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNh())) {//跳过负数
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterNhSy())) {//跳过负数
                             if (newestData.getDataWaterNh().contains("-") || newestData.getDataWaterNh().length() > 10) {
                                 isNegative = true;
                             }
-                        } else if (StringUtils.isNotBlank(newestData.getDataWaterCod())) {//跳过负数
+                        } else if (StringUtils.isNotBlank(newestData.getDataWaterCodSy())) {//跳过负数
                             if (newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length() > 10) {
                                 isNegative = true;
                             }
@@ -327,6 +327,9 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
                             BigDecimal fixedRange = new BigDecimal(rule.getFactor());
                             int scale = rule.getScale();//小数位
                             String correctVal = BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(vals), fixedRange, scale);
+                            if(correctVal.contains("-") || "0".equals(correctVal)){//如果是负数或0用原来的值
+                                correctVal = vals;
+                            }
                             TUtil.setFieldValue(hisdataOrientwater, rule.getFields(), correctVal);
                         } else {
                             log.error("==========设备:{}，编号:{}指标：{}配置错误==============，跳过", deploy.getDeployDes(), deploy.getDeployCode(), rule.getFields());
diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
index 85acdc4..f73e25b 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
@@ -85,22 +85,22 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
 
             //舍弃为空、负数、无意义的长串类数据
             boolean isok = true;
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTp())){
-                if(transdataLivestockwater.getDataWaterTp().contains("-") || transdataLivestockwater.getDataWaterTp().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTp())){
+            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTpSy())){
+                if(transdataLivestockwater.getDataWaterTpSy().contains("-") || transdataLivestockwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTpSy())){
                     isok =false;
                 }
             }else{
                 isok =false;
             }
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTn())){
-                if(transdataLivestockwater.getDataWaterTn().contains("-") || transdataLivestockwater.getDataWaterTn().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTn())){
+            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTnSy())){
+                if(transdataLivestockwater.getDataWaterTnSy().contains("-") || transdataLivestockwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTnSy())){
                     isok =false;
                 }
             }else{
                 isok =false;
             }
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNo())){
-                if(transdataLivestockwater.getDataWaterNo().contains("-") || transdataLivestockwater.getDataWaterNo().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNo())){
+            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNoSy())){
+                if(transdataLivestockwater.getDataWaterNoSy().contains("-") || transdataLivestockwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNoSy())){
                     isok =false;
                 }
             }else{
diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
index 2e1fdb2..670dd2e 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
@@ -82,29 +82,29 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
 
             //舍弃为空、负数、无意义的长串类数据
             boolean isok = true;
-            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTp())){
-                if(transdataOrientwater.getDataWaterTp().contains("-") || transdataOrientwater.getDataWaterTp().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTp()) ){
+            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTpSy())){
+                if(transdataOrientwater.getDataWaterTpSy().contains("-") || transdataOrientwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTpSy()) ){
                     isok =false;
                 }
             }else{
                 isok =false;
             }
-            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTn())){
-                if(transdataOrientwater.getDataWaterTn().contains("-") || transdataOrientwater.getDataWaterTn().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTn())){
+            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTnSy())){
+                if(transdataOrientwater.getDataWaterTnSy().contains("-") || transdataOrientwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTnSy())){
                     isok =false;
                 }
             }else{
                 isok =false;
             }
-            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNo())){
-                if(transdataOrientwater.getDataWaterNo().contains("-") || transdataOrientwater.getDataWaterNo().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNo())){
+            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNoSy())){
+                if(transdataOrientwater.getDataWaterNoSy().contains("-") || transdataOrientwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNoSy())){
                     isok =false;
                 }
             }else{
                 isok =false;
             }
 
-            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNh())){
+            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())){
                 if(transdataOrientwater.getDataWaterNh().contains("-") || transdataOrientwater.getDataWaterNh().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNh()) ){
                     isok =false;
                 }
@@ -112,7 +112,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
                 isok =false;
             }
 
-            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCod())){
+            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())){
                 if(transdataOrientwater.getDataWaterCod().contains("-") || transdataOrientwater.getDataWaterCod().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCod()) ){
                     isok =false;
                 }