diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
index a88a09c..c614740 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lanhai.entity.*;
+import com.lanhai.enums.PollutionEnum;
 import com.lanhai.mapper.SurvTransdataLivestockwaterMapper;
 import com.lanhai.o.iot.pbs.WaterCommonTransVo;
 import com.lanhai.service.ISurvAlertRecordService;
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,6 +46,8 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
     private SurvHisdataLivestockwaterErrorServiceImpl hisdataLivestockwaterErrorService;
     @Autowired
     private SurvStationInfoServiceImpl survStationInfoService;
+    @Autowired
+    private ScEquZhibiaoServiceImpl zhibiaoService;
 
     @Override
     public SurvTransdataLivestockwater getOneByDeviceCode(String deviceCode) {
@@ -90,44 +94,66 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
               }
             }
 
+            List<ScEquZhibiao> zhibiaoList = zhibiaoService.getListByEquid(deploy.getId());
+
+            //根据指标情况，判断无效数据
+            Map<String,ScEquZhibiao> zhibiaoMap = new HashMap<>();
+            for(ScEquZhibiao zhibiao : zhibiaoList){
+                zhibiaoMap.put(zhibiao.getEntityField(),zhibiao);
+            }
+
 
             //舍弃为空、负数、无意义的长串类数据
             boolean isok = true;
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTpSy())){
-                if(transdataLivestockwater.getDataWaterTpSy().contains("-") || transdataLivestockwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTpSy())){
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTpSy.getCode())){
+                if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTpSy())){
+                    if(transdataLivestockwater.getDataWaterTpSy().contains("-") || transdataLivestockwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTpSy()) ){
+                        isok =false;
+                    }
+                }else{
                     isok =false;
                 }
-            }else{
-                isok =false;
             }
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTnSy())){
-                if(transdataLivestockwater.getDataWaterTnSy().contains("-") || transdataLivestockwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTnSy())){
-                    isok =false;
+
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTnSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTnSy())) {
+                    if (transdataLivestockwater.getDataWaterTnSy().contains("-") || transdataLivestockwater.getDataWaterTnSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterTnSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
                 }
-            }else{
-                isok =false;
             }
-//            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNoSy())){
-//                if(transdataLivestockwater.getDataWaterNoSy().contains("-") || transdataLivestockwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNoSy())){
-//                    isok =false;
-//                }
-//            }else{
-//                isok =false;
-//            }
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNhSy())){
-                if(transdataLivestockwater.getDataWaterNhSy().contains("-") || transdataLivestockwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNhSy()) ){
-                    isok =false;
+
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNoSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNoSy())) {
+                    if (transdataLivestockwater.getDataWaterNoSy().contains("-") || transdataLivestockwater.getDataWaterNoSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterNoSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
                 }
-            }else{
-                isok =false;
             }
-            if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCodSy())){
-                if(transdataLivestockwater.getDataWaterCodSy().contains("-") || transdataLivestockwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterCodSy()) ){
-                    isok =false;
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNhSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNhSy())) {
+                    if (transdataLivestockwater.getDataWaterNhSy().contains("-") || transdataLivestockwater.getDataWaterNhSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterNhSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
                 }
-            }else{
-                isok =false;
             }
+
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterCodSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCodSy())) {
+                    if (transdataLivestockwater.getDataWaterCodSy().contains("-") || transdataLivestockwater.getDataWaterCodSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterCodSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
+                }
+            }
+
             if(isok) {
 
                 saveOrUpdate(transdataLivestockwater);
diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
index fee4ff5..fb8f6a1 100644
--- a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
+++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lanhai.entity.*;
+import com.lanhai.enums.PollutionEnum;
 import com.lanhai.mapper.SurvTransdataOrientwaterMapper;
 import com.lanhai.o.iot.pbs.WaterCommonTransVo;
 import com.lanhai.service.ISurvAlertRecordService;
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -44,6 +46,8 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
     private SurvHisdataOrientwaterErrorServiceImpl hisdataOrientwaterErrorService;
     @Autowired
     private SurvStationInfoServiceImpl survStationInfoService;
+    @Autowired
+    private ScEquZhibiaoServiceImpl zhibiaoService;
 
     @Override
     public SurvTransdataOrientwater getOneByDeviceCode(String deviceCode) {
@@ -88,45 +92,64 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
                 }
             }
 
+            List<ScEquZhibiao> zhibiaoList = zhibiaoService.getListByEquid(deploy.getId());
+
+            //根据指标情况，判断无效数据
+            Map<String,ScEquZhibiao> zhibiaoMap = new HashMap<>();
+            for(ScEquZhibiao zhibiao : zhibiaoList){
+                zhibiaoMap.put(zhibiao.getEntityField(),zhibiao);
+            }
+
             //舍弃为空、负数、无意义的长串类数据
             boolean isok = true;
-            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTpSy())){
-                if(transdataOrientwater.getDataWaterTpSy().contains("-") || transdataOrientwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTpSy()) ){
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTpSy.getCode())){
+                if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTpSy())){
+                    if(transdataOrientwater.getDataWaterTpSy().contains("-") || transdataOrientwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTpSy()) ){
+                        isok =false;
+                    }
+                }else{
                     isok =false;
                 }
-            }else{
-                isok =false;
-            }
-            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.getDataWaterNoSy())){
-                if(transdataOrientwater.getDataWaterNoSy().contains("-") || transdataOrientwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNoSy())){
-                    isok =false;
-                }
-            }else{
-                isok =false;
             }
 
-//            if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())){
-//                if(transdataOrientwater.getDataWaterNhSy().contains("-") || transdataOrientwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNhSy()) ){
-//                    isok =false;
-//                }
-//            }else{
-//                isok =false;
-//            }
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTnSy.getCode())) {
+                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.getDataWaterCodSy())){
-//                if(transdataOrientwater.getDataWaterCodSy().contains("-") || transdataOrientwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCodSy()) ){
-//                    isok =false;
-//                }
-//            }else{
-//                isok =false;
-//            }
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNoSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterNoSy())) {
+                    if (transdataOrientwater.getDataWaterNoSy().contains("-") || transdataOrientwater.getDataWaterNoSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterNoSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
+                }
+            }
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNhSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())) {
+                    if (transdataOrientwater.getDataWaterNhSy().contains("-") || transdataOrientwater.getDataWaterNhSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterNhSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
+                }
+            }
+
+            if(zhibiaoMap.containsKey(PollutionEnum.dataWaterCodSy.getCode())) {
+                if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())) {
+                    if (transdataOrientwater.getDataWaterCodSy().contains("-") || transdataOrientwater.getDataWaterCodSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterCodSy())) {
+                        isok = false;
+                    }
+                } else {
+                    isok = false;
+                }
+            }
             if(isok) {
                 saveOrUpdate(transdataOrientwater);
                 //保存历史表