fix

src/main/java/com/cn/esermis/CodeMatch.java

@@ -0,0 +1,6 @@
+package com.cn.esermis;
+
+public interface CodeMatch extends CodePattern {
+
+    boolean match(String code);
+}

src/main/java/com/cn/esermis/CodeMean.java

@@ -0,0 +1,7 @@
+package com.cn.esermis;
+
+public interface CodeMean {
+
+    String code();
+    String mean();
+}

src/main/java/com/cn/esermis/CodePattern.java

@@ -0,0 +1,8 @@
+package com.cn.esermis;
+
+public interface CodePattern extends CodeMean {
+
+    String pattern();
+
+    int order();
+}

src/main/java/com/cn/esermis/coding/PollutionCode.java

@@ -0,0 +1,145 @@
+package com.cn.esermis.coding;
+
+
+import com.cn.esermis.CodeMean;
+
+/**
+ * Created by xiaoyao9184 on 2018/3/26.
+ */
+public enum PollutionCode implements CodeMean {
+
+    _B03("噪声","噪声","dB", "N3.1"),
+    _L10("累计百分声级L10","噪声","dB","N3.1"),
+    _L5("累计百分声级L5","噪声","dB","N3.1"),
+    _L50("累计百分声级L50","噪声","dB","N3.1"),
+    _L90("累计百分声计L90","噪声","dB","N3.1"),
+    _L95("累计百分声级L95","噪声","dB","N3.1"),
+    _Ld("夜间等效声级Ld","噪声","dB","N3.1"),
+    _Ldn("昼夜等效声级Ldn","噪声","dB","N3.1"),
+    _Leq("30秒等效声级Leq","噪声","dB","N3.1"),
+    _LMn("最小的瞬时声级","噪声","dB","N3.1"),
+    _LMx("最大的瞬时声级","噪声","dB","N3.1"),
+    _Ln("昼间等效声级Ln","噪声","dB","N3.1"),
+    _S01("O2 含量","废气","％","N3.1"),
+    _S02("烟气流速","废气","m3/h","N5.2"),
+    _S03("烟气温度","废气","℃","N3.1"),
+    _S04("烟气动压","废气","MPa","N4.2"),
+    _S05("烟气湿度","废气","%","N3.1"),
+    _S06("制冷温度","废气","℃","N3.1"),
+    _S07("烟道截面积","废气","M2","N4.2"),
+    _S08("烟气压力","废气","MPa","N4.2"),
+    _B02("废气"),
+    _01("烟尘","废气","mg/m3","N5.2"),
+    _02("二氧化硫","废气","mg/m3","N5.2"),
+    _03("氮氧化物","废气","mg/m3","N5.3"),
+    _04("一氧化碳","废气","mg/m3","N2.3"),
+    _05("硫化氢","废气","mg/m3","N3.2"),
+    _06("氟化物","废气","mg/m3","N2.3"),
+    _07("氰化物(含氰化氢)","废气","mg/m3","N3.3"),
+    _08("氯化氢","废气","mg/m3","N4.3"),
+    _09("沥青烟","废气","mg/m3","N4.3"),
+    _10("氨","废气","mg/m3","N4.3"),
+    _11("氯气","废气","mg/m3","N4.3"),
+    _12("二硫化碳","废气","mg/m3","N4.3"),
+    _13("硫醇","废气","mg/m3","N4.3"),
+    _14("硫酸雾","废气","mg/m3","N4.3"),
+    _15("铬酸雾","废气","mg/m3","N2.4"),
+    _16("苯系物","废气","mg/m3","N4.2"),
+    _17("甲苯","废气","mg/m3","N4.2"),
+    _18("二甲苯","废气","mg/m3","N4.2"),
+    _19("甲醛","废气","mg/m3","N3.3"),
+    _20("苯并(a)芘","废气","mg/m3","N3.6"),
+    _21("苯胺类","废气","mg/m3","N4.3"),
+    _22("硝基苯类","废气","mg/m3","N3.4"),
+    _23("氯苯类","废气","mg/m3","N4.3"),
+    _24("光气","废气","mg/m3","N3.3"),
+    _25("碳氢化合物(含非甲烷总烃)","废气","mg/m3","N5.2"),
+    _26("乙醛","废气","mg/m3","N3.4"),
+    _27("酚类","废气","mg/m3","N3.3"),
+    _28("甲醇","废气","mg/m3","N5.2"),
+    _29("氯乙烯","废气","mg/m3","N4.3"),
+    _30("二氧化碳","废气","mg/m3","N4.3"),
+    _31("汞及其化合物","废气","mg/m3","N4.4"),
+    _32("铅及其化合物","废气","mg/m3","N2.4"),
+    _33("镉及其化合物","废气","mg/m3","N3.4"),
+    _34("锡及其化合物","废气","mg/m3","N4.3"),
+    _35("镍及其化合物","废气","mg/m3","N3.3"),
+    _36("铍及其化合物","废气","mg/m3","N4.4"),
+    _37("林格曼黑度","废气","N1",""),
+    _99("其他气污染物","废气","",""),
+    _B01("污水","污水","",""),
+    _001("pH","值","污水","N2.1"),
+    _002("色度","污水","色度单位","N5.1"),
+    _003("悬浮物","污水","mg/l","N5.1"),
+    _010("生化需氧量（BOD5）","污水","mg/l","N5.1"),
+    _011("化学需氧量（CODcr）","污水","mg/l","N6.1"),
+    _015("总有机碳","污水","mg/l","N3.2"),
+    _020("总汞","污水","mg/l","N2.3"),
+    _021("烷基汞","污水","mg/l","N2.1"),
+    _022("总镉","污水","mg/l","N2.2"),
+    _023("总铬","污水","mg/l","N3.2"),
+    _024("六价铬","污水","mg/l","N2.2"),
+    _025("三价铬","污水","mg/l","N3.2"),
+    _026("总砷","污水","mg/l","N2.2"),
+    _027("总铅","污水","mg/l","N3.2"),
+    _028("总镍","污水","mg/l","N3.2"),
+    _029("总铜","污水","mg/l","N3.2"),
+    _030("总锌","污水","mg/l","N3.2"),
+    _031("总锰","污水","mg/l","N3.2"),
+    _032("总铁","污水","mg/l","N3.2"),
+    _033("总银","污水","mg/l","N2.2"),
+    _034("总铍","污水","mg/l","N2.3"),
+    _035("总硒","污水","mg/l","N2.2"),
+    _036("锡","污水","mg/l","N3.6"),
+    _037("硼","污水","mg/l","N3.6"),
+    _038("钼","污水","mg/l","N3.6"),
+    _039("钡","污水","mg/l","N3.6"),
+    _040("钴","污水","mg/l","N3.6"),
+    _041("铊","污水","mg/l","N3.6"),
+    _060("氨氮","污水","mg/l","N2.3"),
+    _061("有机氮","污水","mg/l","N3.2"),
+    _065("总氮","污水","mg/l","N3.2"),
+    _080("石油类","污水","mg/l","N3.2"),
+    _101("总磷","污水","mg/l","N3.2")
+    ;
+
+    private String code;
+    private String meaning;
+    private String scope;
+    private String unit;
+    private String type;
+
+    PollutionCode(String meaning){
+        this.code = name().substring(1);
+        this.meaning = meaning;
+    }
+
+    PollutionCode(String meaning, String scope, String unit, String type){
+        this.code = name().substring(1);
+        this.meaning = meaning;
+        this.scope = scope;
+        this.unit = unit;
+        this.type = type;
+    }
+
+    @Override
+    public String code() {
+        return code;
+    }
+
+    @Override
+    public String mean() {
+        return meaning;
+    }
+
+    public String scope() {
+        return scope;
+    }
+
+    public String unit() {
+        return unit;
+    }
+    public String type() {
+        return type;
+    }
+}

src/main/java/com/cn/esermis/coding/PollutionGas.java

@@ -0,0 +1,186 @@
+package com.cn.esermis.coding;
+
+
+import com.cn.esermis.CodeMean;
+
+/**
+ * Created by xiaoyao9184 on 2018/3/26.
+ */
+public enum PollutionGas implements CodeMean {
+
+    a00000("废气","B02","立方米/秒","立方米","N6.1"),
+    a01001("温度","--","摄氏度","N3.1"),
+    a01002("湿度","--","%","N3.1"),
+    a01006("气压","--","千帕","N5.3"),
+    a01007("风速","--","米/秒","N4.1"),
+    a01008("风向","--","[角]度","N4"),
+    a01010("林格曼黑度","37","无量纲","N1"),
+    a01011("烟气流速","S02","米/秒","N5.2"),
+    a01012("烟气温度","S03","摄氏度","N3.1"),
+    a01013("烟气压力","S08","千帕","N5.3"),
+    a01014("烟气湿度","S05","%","N3.1"),
+    a01015("制冷温度","S06","摄氏度","N3.1"),
+    a01016("烟道截面积","S07","平方米","N4.2"),
+    a01017("烟气动压","S04","千帕","N5.3"),
+    a01901("垃圾焚烧炉膛内焚","烧平均温度","--","摄氏度","N4.1"),
+    a01902("垃圾焚烧炉膛内DCS","温度","--","摄氏度","N4.1"),
+    a05001("二氧化碳","30","毫克/立方米","千克","N3.3"),
+    a05002("甲烷","--","纳克/立方米","克","N4.1"),
+    a05008("三氯一氟甲烷","--","毫克/立方米","千克","N7.3"),
+    a05009("二氯二氟甲烷","--","毫克/立方米","千克","N7.3"),
+    a05013("三氯三氟乙烷","--","毫克/立方米","千克","N7.3"),
+    a19001("氧气含量","S01","%","N3.1"),
+    a20007("砷","--","纳克/立方米","克","N1.6"),
+    a20016("铍及其化合物","36","毫克/立方米","千克","N4.4"),
+    a20025("镉及其化合物","33","毫克/立方米","千克","N3.4"),
+    a20026("镉","--","纳克/立方米","克","N3.3"),
+    a20043("铅及其化合物","32","毫克/立方米","千克","N2.4"),
+    a20044("铅","--","纳克/立方米","克","N3.3"),
+    a20057("汞及其化合物","31","毫克/立方米","千克","N4.4"),
+    a20058("汞","--","纳克/立方米","克","N3.2"),
+    a20063("镍及其化合物","35","毫克/立方米","千克","N3.3"),
+    a20091("锡及其化合物","34","毫克/立方米","千克","N4.3"),
+    a21001("氨（氨气）","10","纳克/立方米","克","N4.3"),
+    a21002("氮氧化物","03","毫克/立方米","千克","N5.1"),
+    a21003("一氧化氮","--","毫克/立方米","千克","N4.1"),
+    a21004("二氧化氮","--","毫克/立方米","千克","N4.1"),
+    a21005("一氧化碳","04","毫克/立方米","千克","N3.3"),
+    a21017("氰化物","07","毫克/立方米","千克","N3.3"),
+    a21018("氟化物","06","毫克/立方米","千克","N2.3"),
+    a21022("氯气","11","毫克/立方米","千克","N4.3"),
+    a21024("氯化氢","08","毫克/立方米","千克","N4.3"),
+    a21026("二氧化硫","02","毫克/立方米","千克","N5.2"),
+    a21028("硫化氢","05","毫克/立方米","千克","N3.2"),
+    a23001("酚类","27","毫克/立方米","千克","N3.3"),
+    a24003("二氯甲烷","--","毫克/立方米","千克","N7.3"),
+    a24004("三氯甲烷","--","毫克/立方米","千克","N7.3"),
+    a24005("四氯甲烷","--","毫克/立方米","千克","N7.3"),
+    a24006("二溴一氯甲烷","--","毫克/立方米","千克","N7.3"),
+    a24007("一溴二氯甲烷","--","毫克/立方米","千克","N7.3"),
+    a24008("溴甲烷","--","毫克/立方米","千克","N7.3"),
+    a24009("三溴甲烷","--","毫克/立方米","千克","N7.3"),
+    a24015("氯乙烷","--","毫克/立方米","千克","N7.3"),
+    a24016("1,1-二氯乙烷","--","毫克/立方米","千克","N7.3"),
+    a24017("1,2-二氯乙烷","--","毫克/立方米","千克","N7.3"),
+    a24018("1,1,1-三氯乙烷","--","毫克/立方米","千克","N7.3"),
+    a24019("1,1,2-三氯乙烷","--","毫克/立方米","千克","N7.3"),
+    a24020("1,1,2,2-四氯乙烷","--","毫克/立方米","千克","N7.3"),
+    a24027("1,2-二氯丙烷","--","毫克/立方米","千克","N7.3"),
+    a24034("1,2-二溴乙烷","--","毫克/立方米","千克","N7.3"),
+    a24036("环己烷","--","毫克/立方米","千克","N7.3"),
+    a24042("正己烷","--","毫克/立方米","千克","N7.3"),
+    a24043("正庚烷","--","毫克/立方米","千克","N7.3"),
+    a24046("氯乙烯","29","毫克/立方米","千克","N4.3"),
+    a24047("1,1-二氯乙烯","--","毫克/立方米","千克","N7.3"),
+    a24049("三氯乙烯","--","毫克/立方米","千克","N7.3"),
+    a24050("四氯乙烯","--","毫克/立方米","千克","N7.3"),
+    a24053("丙烯","--","毫克/立方米","千克","N7.3"),
+    a24054("1,3-二氯丙烯","--","毫克/立方米","千克","N7.3"),
+    a24072("1,4-二恶烷","--","毫克/立方米","千克","N7.3"),
+    a24078("1,3-丁二烯","--","毫克/立方米","千克","N7.3"),
+    a24087("碳氢化合物","25","毫克/立方米","千克","N5.2"),
+    a24088("非甲烷总烃","--","毫克/立方米","千克","N7.3"),
+    a24099("氯甲烷","--","毫克/立方米","千克","N7.3"),
+    a24110("反式-1,2-二氯乙烯","--","毫克/立方米","千克","N7.3"),
+    a24111("顺式-1,2-二氯乙烯","--","毫克/立方米","千克","N7.3"),
+    a24112("反式-1,3-二氯丙烯","--","毫克/立方米","千克","N7.3"),
+    a24113("六氯-1,3-丁二烯","--","毫克/立方米","千克","N7.3"),
+    a25002("苯","--","毫克/立方米","千克","N7.3"),
+    a25003("甲苯","17","毫克/立方米","千克","N4.2"),
+    a25004("乙苯","--","毫克/立方米","千克","N7.3"),
+    a25005("二甲苯","18","毫克/立方米","千克","N4.2"),
+    a25006("1,2-二甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25007("1,3-二甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25008("1,4-二甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25010("氯苯","23","毫克/立方米","千克","N4.3"),
+    a25011("1,2-二氯苯","--","毫克/立方米","千克","N7.3"),
+    a25012("1,3-二氯苯","--","毫克/立方米","千克","N7.3"),
+    a25013("1,4-二氯苯","--","毫克/立方米","千克","N7.3"),
+    a25014("1-乙基-4-甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25015("1,2,4-三氯苯","--","毫克/立方米","千克","N7.3"),
+    a25019("1,2,4-三甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25020("1,2,3-三甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25021("1,3,5-三甲基苯","--","毫克/立方米","千克","N7.3"),
+    a25023("硝基苯","22","毫克/立方米","千克","N3.4"),
+    a25038("乙烯基苯","--","毫克/立方米","千克","N7.3"),
+    a25044("苯并[a]芘","20","毫克/立方米","千克","N4.3"),
+    a25072("四氢呋喃","--","毫克/立方米","千克","N7.3"),
+    a26001("苯胺类","21","毫克/立方米","千克","N4.3"),
+    a29017("乙酸乙酯","--","毫克/立方米","千克","N7.3"),
+    a29026("乙酸乙烯酯","--","毫克/立方米","千克","N7.3"),
+    a30001("甲醇","28","毫克/立方米","千克","N4.3"),
+    a30008("异丙醇","--","毫克/立方米","千克","N7.3"),
+    a30022("硫醇","13","毫克/立方米","千克","N4.3"),
+    a31001("甲醛","19","毫克/立方米","千克","N3.3"),
+    a31002("乙醛","26","毫克/立方米","千克","N3.4"),
+    a31024("丙酮","--","毫克/立方米","千克","N7.3"),
+    a31025("2-丁酮","--","毫克/立方米","千克","N7.3"),
+    a31030("甲基异丁基甲酮","--","毫克/立方米","千克","N7.3"),
+    a34001("总悬浮颗粒物TSP","--","纳克/立方米","克","N4.3"),
+    a34002("可吸入颗粒物PM10","--","纳克/立方米","克","N3.3"),
+    a34004("细微颗粒物PM2.5","--","纳克/立方米","克","N3.3"),
+    a34005("亚微米颗粒物PM1.0","--","纳克/立方米","克","N3.3"),
+    a34011("降尘","--","吨/平方千米•月","",""),
+    a34013("烟尘","01","毫克/立方米","千克","N4"),
+    a34017("炭黑尘","--","毫克/立方米","千克","N4"),
+    a34038("沥青烟","09","毫克/立方米","千克","N4.3"),
+    a34039("硫酸雾","14","毫克/立方米","千克","N4.3"),
+    a34040("铬酸雾","15","毫克/立方米","千克","N2.3"),
+    a99010("丙烯腈","--","毫克/立方米","千克","N7.3"),
+    a99049("光气","24","毫克/立方米","千克","N3.3"),
+    a99051("二硫化碳","12","毫克/立方米","千克","N4.3")
+
+    ;
+
+    private String code;
+    private String meaning;
+    private String oldCode;
+    private String chromaUnit;
+    private String amountUnit;
+    private String type;
+
+    PollutionGas(String meaning, String oldCode, String amountUnit, String type){
+        this.code = name();
+        this.meaning = meaning;
+        this.oldCode = oldCode;
+        this.amountUnit = amountUnit;
+        this.type = type;
+    }
+
+    PollutionGas(String meaning, String oldCode, String chromaUnit, String amountUnit, String type){
+        this.code = name();
+        this.meaning = meaning;
+        this.oldCode = oldCode;
+        this.chromaUnit = chromaUnit;
+        this.amountUnit = amountUnit;
+        this.type = type;
+    }
+
+    @Override
+    public String code() {
+        return code;
+    }
+
+    @Override
+    public String mean() {
+        return meaning;
+    }
+
+
+    public String oldCode() {
+        return oldCode;
+    }
+    public String chromaUnit() {
+        return chromaUnit;
+    }
+    public String amountUnit() {
+        return amountUnit;
+    }
+
+    public String unit() {
+        return chromaUnit + " " + amountUnit;
+    }
+    public String type() {
+        return type;
+    }
+}

src/main/java/com/cn/esermis/dpld/business/MonitorBusiness.java

@@ -103,7 +103,7 @@ public class MonitorBusiness {
                             throw new RuntimeException(e);
                         }
                         try {
-                            airMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+                            airMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():0));
                             airMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
@@ -113,6 +113,7 @@ public class MonitorBusiness {
                                 saveExcepLog(x, airMonitorMinuteRecord);
                             }
                         } catch (Exception e) {
+//                            throw  new RuntimeException(e);
                             log.error("调用 ExceptionDataDispose1 方法异常{} 当前参数为:{}",e,airMonitorMinuteRecord);
                         }
                         listData.add(airMonitorMinuteRecord);
@@ -147,7 +148,7 @@ public class MonitorBusiness {
 //                            throw new RuntimeException(e);
 //                        }
 //                        try {
-//                            airMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+//                            airMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():0));
 //                            airMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
 //                                    x.getMin()!=null?x.getMin().doubleValue():0,
 //                                    x.getAvg()!=null?x.getAvg().doubleValue():0));
@@ -193,7 +194,7 @@ public class MonitorBusiness {
                             throw new RuntimeException(e);
                         }
                         try {
-                            airMonitorHourRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+                            airMonitorHourRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():0));
                             airMonitorHourRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
@@ -238,7 +239,7 @@ public class MonitorBusiness {
                             throw new RuntimeException(e);
                         }
                         try {
-                            waterMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+                            waterMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():0));
                             waterMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
@@ -279,7 +280,7 @@ public class MonitorBusiness {
 //                            throw new RuntimeException(e);
 //                        }
 //                        try {
-//                            waterMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+//                            waterMonitorMinuteRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():0));
 //                            waterMonitorMinuteRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
 //                                    x.getMin()!=null?x.getMin().doubleValue():0,
 //                                    x.getAvg()!=null?x.getAvg().doubleValue():0));
@@ -324,7 +325,7 @@ public class MonitorBusiness {
                             throw new RuntimeException(e);
                         }
                         try {
-                            waterMonitorHourRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():x.getRtd().doubleValue()));
+                            waterMonitorHourRecord.setIsExceed(exceptionDataDispose.ExceedData(factorModel.getMN(), x.getFactor(), x.getAvg()!=null?x.getAvg().doubleValue():0));
                             waterMonitorHourRecord.setIsLose(exceptionDataDispose.LoseData(x.getMax()!=null?x.getMax().doubleValue():0,
                                     x.getMin()!=null?x.getMin().doubleValue():0,
                                     x.getAvg()!=null?x.getAvg().doubleValue():0));
@@ -344,7 +345,7 @@ public class MonitorBusiness {
             }
         } catch (Exception e) {
 //            throw new RuntimeException(e);
-//            log.error("插入数据库异常："+e);
+            log.error("插入数据库异常："+e);
         }
     }
 

src/main/java/com/cn/esermis/netty/BootNettyChannelInboundHandlerAdapter.java

@@ -202,6 +202,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler
                     eventType = "设备超时";
             }
             log.warn(ctx.channel().id() + " : " + eventType + "---> 关闭该设备");
+            dataMap.remove(ctx.channel().id().toString());
             ctx.channel().close();
         }
     }

src/main/java/com/cn/esermis/utils/HJ212MsgUtils.java

@@ -79,7 +79,14 @@ public class HJ212MsgUtils {
                 // 如果是时间信息，则直接放到外层
                 if (paramStr.contains("DataTime")) {
                     data.putAll(JSONObject.parseObject("{\"" + paramStr + "\"}"));
-                } else {
+                } else if (paramStr.contains("PNUM")){
+                    data.putAll(JSONObject.parseObject("{\"" + paramStr + "\"}"));
+                }
+                else if(paramStr.contains("PNO"))
+                {  //PNO
+                    data.putAll(JSONObject.parseObject("{\"" + paramStr + "\"}"));
+                }
+                else {
                     String[] ele = getPollutionSource(paramStr);
                     JSONObject jsonObject = JSONObject.parseObject("{\"" + ele[1] + "\"}");
                     jsonObject.put("factor",ele[0]);

src/main/resources/application.yml

@@ -21,8 +21,10 @@ spring:
       datasource:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://39.105.121.97:13306/scy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+#          url: jdbc:mysql://39.105.121.97:13306/scy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+          url: jdbc:mysql://192.168.3.19:13306/scy?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
           username: root
+#          password: Eitc@gnhz702
           password: Eitc@gnhz702
 
   # Redis 配置
@@ -39,7 +41,7 @@ spring:
 #    port: ${REDIS_PORT:6379}
     port: 16379
 #    database: ${REDIS_DB:0}
-    database: 5
+    database: 15
 #    password: ${REDIS_PWD:}
 
 mybatis-plus: