增加最大/小水量属性配置

src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimTapWaterBizFun.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.global.base.log.LogLevelFlag;
 import com.global.base.log.LogPrintMgr;
 import com.global.base.tools.FastJsonUtil;
+import com.shkpr.service.aimodelpower.SpringContextUtil;
+import com.shkpr.service.aimodelpower.commproperties.CollectProperties;
 import com.shkpr.service.aimodelpower.commtools.TimeTool;
 import com.shkpr.service.aimodelpower.dbdao.DBMgrProxy;
 import com.shkpr.service.aimodelpower.dbdao.shizilaishuiDataSource.service.intef.WaterCollecationService;
@@ -38,6 +40,7 @@ public class KprAimTapWaterBizFun {
     private static final String MSG_FAILED = "failed.";
     private static final String mStrClassName = "KprAimTapWaterBizFun";
     private static final String EMPTY_NULL = "NULL";
+    private static final CollectProperties collectProperties = SpringContextUtil.getBean(CollectProperties.class);
 
     public static WaterTapWaterService getWaterTapWaterApi(){
         return DBMgrProxy.getInstance().applyWaterTapWaterService();
@@ -690,17 +693,14 @@ public class KprAimTapWaterBizFun {
                                         }
 //                                    }
                                 }
-
                                 //数据异常值判断,如大于3万,使用上一条数据
-                                if (value!=null && value > 30000) {
+                                if (value!=null && (value > collectProperties.getMaxWater() || value < collectProperties.getMinWater())) {
                                    Double dbLastValue  = getWaterTapWaterApi().getLastValue(
                                             (String) recordAllEntity.get("org_name"),
                                             (String) recordAllEntity.get("time"),
                                             (String) recordAllEntity.get("value_tag"),
-                                            30000.0,-30000.0);
-                                    if (dbLastValue != null) {
-                                        value = dbLastValue;
-                                    }
+                                           collectProperties.getMaxWater(),collectProperties.getMinWater());
+                                    if (dbLastValue != null) value = dbLastValue;
                                 }
 
                                 recordAllEntity.put("value", value);
@@ -852,15 +852,13 @@ public class KprAimTapWaterBizFun {
                                 }
 
                                 //数据异常值判断,如大于3万,使用上一条数据
-                                if (value!=null && value > 30000) {
+                                if (value!=null && (value > collectProperties.getMaxWater() || value < collectProperties.getMinWater())) {
                                     Double dbLastValue  = getWaterTapWaterApi().getLastValue(
                                             (String) recordAllEntity.get("org_name"),
                                             (String) recordAllEntity.get("time"),
                                             (String) recordAllEntity.get("value_tag"),
-                                            30000.0,-30000.0);
-                                    if (dbLastValue != null) {
-                                        value = dbLastValue;
-                                    }
+                                            collectProperties.getMaxWater(),collectProperties.getMinWater());
+                                    if (dbLastValue != null) value = dbLastValue;
                                 }
 
                                 recordAllEntity.put("value", value);
@@ -1211,16 +1209,13 @@ public class KprAimTapWaterBizFun {
                                                     }
 
                                                     //数据异常值判断,如大于3万,使用上一条数据
-                                                    if (value!=null && value > 30000) {
-
+                                                    if (value!=null && (value > collectProperties.getMaxWater() || value < collectProperties.getMinWater())) {
                                                         Double dbLastValue  = getWaterTapWaterApi().getLastValue(
                                                                 (String) recordAllEntity.get("org_name"),
                                                                 (String) recordAllEntity.get("time"),
                                                                 (String) recordAllEntity.get("value_tag"),
-                                                                30000.0,-30000.0);
-                                                        if (dbLastValue != null) {
-                                                            value = dbLastValue;
-                                                        }
+                                                                collectProperties.getMaxWater(),collectProperties.getMinWater());
+                                                        if (dbLastValue != null) value = dbLastValue;
                                                     }
 
                                                     recordAllEntity.put("value", value);

src/main/java/com/shkpr/service/aimodelpower/commproperties/CollectProperties.java

@@ -0,0 +1,29 @@
+package com.shkpr.service.aimodelpower.commproperties;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 采集属性
+ *
+ * @author 欧阳劲驰
+ * @since 1.0.3
+ */
+@ConfigurationProperties("collect")
+@Configuration
+@Getter
+@Setter
+@ToString
+public class CollectProperties {
+    /**
+     * 最大水量
+     */
+    private Double maxWater = 20000d;
+    /**
+     * 最小水量
+     */
+    private Double minWater = -20000d;
+}

src/main/resources/application.properties

@@ -185,4 +185,8 @@ waterbusiness.selfconfess:沙坪坝营业所{SPB.SSWD.total_flow1,SPB.SSWD.total
 #供入
 waterbusiness.supplyin:沙坪坝营业所{JLPYGS_LHXQ.IFC050.DN700_LJLL1,JLPYGS_LHXQ.IFC050.DN600_LJLL1},九龙坡营业所{JLPYGS_DYQGZ_DN500.IFC050.ZLJLL,SPBYGS_BMD.LLJ.LJLL,JLPYGS_RL_DN700.IFC050.ZLJLL,JLPYGS_HYSZ_DN700.IFC050.ZLJLL},大渡口营业所{JLPYGS_HYSZ_DN700.IFC050.ZLJLL,SPBYGS_HYL_DN700.IFC050.ZLJLL,SPBYGS_XZFZL_DN400.050.ZLJLL,JLPYGS_LQL_DN400.IFC050.ZLJLL,JLPYGS_DYQGZ_DN500.IFC050.ZLJLL},渝中区水厂{JLPYGS_EL_NEW.EL.F12:0,YZQSC.HSXEJ.LJLL,YZSC_LZB_LLJ.YZSC_LZB_LLJ.LJLL}
 #供出
-waterbusiness.confess:沙坪坝营业所{SPBYGS_BMD.LLJ.LJLL,SPBYGS_XZFZL_DN400.050.ZLJLL,SPBYGS_HYL_DN700.IFC050.ZLJLL,YZSC_LZB_LLJ.YZSC_LZB_LLJ.LJLL},九龙坡营业所{JLPYGS_LQL_DN400.IFC050.ZLJLL,YZQSC.HSXEJ.LJLL,JLPYGS_EL_NEW.EL.F12:0,JLPYGS_LHXQ.IFC050.DN700_LJLL1},大渡口营业所{JLPYGS_LHXQ.IFC050.DN600_LJLL1,JLPYGS_RL_DN700.IFC050.ZLJLL}
+waterbusiness.confess:沙坪坝营业所{SPBYGS_BMD.LLJ.LJLL,SPBYGS_XZFZL_DN400.050.ZLJLL,SPBYGS_HYL_DN700.IFC050.ZLJLL,YZSC_LZB_LLJ.YZSC_LZB_LLJ.LJLL},九龙坡营业所{JLPYGS_LQL_DN400.IFC050.ZLJLL,YZQSC.HSXEJ.LJLL,JLPYGS_EL_NEW.EL.F12:0,JLPYGS_LHXQ.IFC050.DN700_LJLL1},大渡口营业所{JLPYGS_LHXQ.IFC050.DN600_LJLL1,JLPYGS_RL_DN700.IFC050.ZLJLL}
+#最大水量
+collect.max-water=30000.0
+#最小水量
+collect.min-water=-30000.0