事前标记

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

@@ -25,7 +25,7 @@ public class EsermisApplication  implements CommandLineRunner {
         /**
          * 使用异步注解方式启动netty服务端服务
          */
-        new BootNettyServer().bind(8088);
+        new BootNettyServer().bind(19900);
     }
 
 }

src/main/java/com/cn/esermis/constant/Constant.java

@@ -1,5 +1,9 @@
 package com.cn.esermis.constant;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class Constant {
 
         public static final  String ST_AIR = "31"; //大气环境污染源
@@ -13,4 +17,6 @@ public class Constant {
         public static final  String CN = "CN"; //大气环境污染源
         public static final  String SERVER = "server"; //大气环境污染源
 
+        public static final List<String> COMMAND = new ArrayList<>(Arrays.asList(HOUR, MINUTE, REAL)); // 解析数据编码
+
 }

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

@@ -397,7 +397,7 @@ public class MonitorBusiness {
         if (o != null){
             PreMarking preMarking = JSON.parseObject(o.toString(), PreMarking.class);
             Date date = formatter.parse(time);
-            if (preMarking.getStartTime().getTime() >= date.getTime()){
+            if (preMarking.getStartTime().getTime() <= date.getTime()){
                 return preMarking.getWorkingCondition();
             }
         }

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

@@ -1,6 +1,7 @@
 package com.cn.esermis.utils;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.cn.esermis.constant.Constant;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.LinkedList;
@@ -66,7 +67,9 @@ public class HJ212MsgUtils {
                     .replace(",", "\",\"").replace(";", "\",\"");
             data.put("SIZE", headStr.substring(0, 4));
             data.putAll(JSONObject.parseObject("{\"" + headStr.substring(4) + "\"}"));
-
+            if (!Constant.COMMAND.contains(data.getString("CN"))){
+                return data;
+            }
             // 清洗数据体基本数据
             String[] monitors = subMsg[1].split(";");
             List<JSONObject> cp = new LinkedList<>();
@@ -100,13 +103,23 @@ public class HJ212MsgUtils {
      * 解析污染源数据，获取污染源编号
      */
     private static String[] getPollutionSource(String data) {
-        String key = data.substring(0, data.indexOf("-"));
-        data = data.replaceAll(key + "-", "");
+        if (data.contains("-")){
+            String key = data.substring(0, data.indexOf("-"));
+            data = data.replaceAll(key + "-", "");
+
+            String[] result = new String[2];
+            result[0] = key;
+            result[1] = data;
+            return result;
+        }else {
+            if (data.contains(":")){
+                String[] split = data.split(":");
+                return split;
+            }
+
+            return new String[]{data};
+        }
 
-        String[] result = new String[2];
-        result[0] = key;
-        result[1] = data;
-        return result;
     }