hj212 2005

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.coding.PollutionGas;
 import com.cn.esermis.constant.Constant;
 import lombok.extern.slf4j.Slf4j;
 
@@ -22,6 +23,8 @@ public class HJ212MsgUtils {
      * @param msg hj212
      * @return json
      */
+
+
     public static JSONObject dealMsg1(String msg) {
         JSONObject data = new JSONObject();
         try {
@@ -67,7 +70,7 @@ 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"))){
+            if (!Constant.COMMAND.contains(data.getString("CN"))) {
                 return null;
             }
             // 清洗数据体基本数据
@@ -79,17 +82,24 @@ public class HJ212MsgUtils {
                 // 如果是时间信息，则直接放到外层
                 if (paramStr.contains("DataTime")) {
                     data.putAll(JSONObject.parseObject("{\"" + paramStr + "\"}"));
-                } else if (paramStr.contains("PNUM")){
+                } else if (paramStr.contains("PNUM")) {
                     data.putAll(JSONObject.parseObject("{\"" + paramStr + "\"}"));
-                }
-                else if(paramStr.contains("PNO"))
-                {  //PNO
+                } else if (paramStr.contains("PNO")) {  //PNO
                     data.putAll(JSONObject.parseObject("{\"" + paramStr + "\"}"));
-                }
-                else {
+                } else {
                     String[] ele = getPollutionSource(paramStr);
                     JSONObject jsonObject = JSONObject.parseObject("{\"" + ele[1] + "\"}");
-                    jsonObject.put("factor",ele[0]);
+//                    PollutionGas pollutionGas = PollutionGas.valueOf(ele[0]);
+                    PollutionGas[] values = PollutionGas.values();
+                    jsonObject.put("factor", ele[0]);
+                    if (ele[0].length() < 6){
+                        for (PollutionGas value : values) {
+                            if (value.oldCode().equals(ele[0])) {
+                                jsonObject.put("factor", value.code());
+                                break;
+                            }
+                        }
+                    }
                     cp.add(jsonObject);
                 }
             }
@@ -110,7 +120,7 @@ public class HJ212MsgUtils {
      * 解析污染源数据，获取污染源编号
      */
     private static String[] getPollutionSource(String data) {
-        if (data.contains("-")){
+        if (data.contains("-")) {
             String key = data.substring(0, data.indexOf("-"));
             data = data.replaceAll(key + "-", "");
 
@@ -118,8 +128,8 @@ public class HJ212MsgUtils {
             result[0] = key;
             result[1] = data;
             return result;
-        }else {
-            if (data.contains(":")){
+        } else {
+            if (data.contains(":")) {
                 String[] split = data.split(":");
                 return split;
             }