回复消息 bug修改

src/main/java/com/cn/esermis/server/Consumer.java

@@ -38,7 +38,10 @@ public class Consumer {
             Object message = redisQueueService.receiveMessage(Constant.SERVER);
             if (message==null || message.equals("")){
 //                System.out.println("消息队列为空");
-                Thread.sleep(1000*5);
+                try {
+                    Thread.sleep(1000*5);
+                } catch (InterruptedException e) {
+                }
             }else{
                 tolot++;
                 int finalTolot = tolot;

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

@@ -90,7 +90,6 @@ public class HJ212MsgUtils {
                 } else {
                     String[] ele = getPollutionSource(paramStr);
                     JSONObject jsonObject = JSONObject.parseObject("{\"" + ele[1] + "\"}");
-//                    PollutionGas pollutionGas = PollutionGas.valueOf(ele[0]);
                     PollutionGas[] values = PollutionGas.values();
                     jsonObject.put("factor", ele[0]);
                     if (ele[0].length() < 6){
@@ -105,7 +104,6 @@ public class HJ212MsgUtils {
                 }
             }
             data.put("CP", cp);
-
             // 保存消息尾数据，主要是CRC校验和包结束符
             data.put("End", subMsg[2]);
 
@@ -119,6 +117,7 @@ public class HJ212MsgUtils {
 
     /**
      * 接收数据后做数据格式化，回复数据是否接收成功
+     * 消息回复
      */
     public static String reply(String msg) {
         StringBuilder result = new StringBuilder();
@@ -133,14 +132,18 @@ public class HJ212MsgUtils {
             data.put("SIZE", headStr.substring(0, 4));
             data.putAll(JSONObject.parseObject("{\"" + headStr.substring(4) + "\"}"));
             for (Map.Entry<String, Object> stringObjectEntry : data.entrySet()) {
+                if (stringObjectEntry.getKey().equals("SIZE"))
+                    continue;
                 if (stringObjectEntry.getKey().equals("CN")){
                     result.append(stringObjectEntry.getKey()).append("=").append("9014").append(";");
-                }
+                }else
                 if (stringObjectEntry.getKey().equals("ST")){
                     result.append(stringObjectEntry.getKey()).append("=").append("91").append(";");
-                }
+                }else
                 if (stringObjectEntry.getKey().equals("Flag")){
                     result.append(stringObjectEntry.getKey()).append("=").append("4").append(";");
+                }else{
+                    result.append(stringObjectEntry.getKey()).append("=").append(stringObjectEntry.getValue()).append(";");
                 }
             }
         } catch (Exception e) {