Merge branch 'refs/heads/master' into fb

# Conflicts:
#	src/main/java/com/cn/esermis/netty/BootNettyChannelInboundHandlerAdapter.java
#	src/main/resources/application.yml

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

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

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

@@ -345,7 +345,7 @@ public class MonitorBusiness {
                 }
             }
         } catch (Exception e) {
-//            throw new RuntimeException(e);
+            throw new RuntimeException(e);
 //            log.error("插入数据库异常："+e);
         }
     }

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

@@ -23,7 +23,6 @@ import java.net.InetSocketAddress;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 @Log4j2
 @Component
@@ -96,7 +95,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler
                             String MN = jsonObject.getString("MN");
                             String dataTime = jsonObject.getString("DataTime");
                             if (!adapter.redisQueueService.isElementExist(MN +":"+ CN +":"+ dataTime, dataTime)){
-                                adapter.redisQueueService.addElementWithExpire(MN +":"+ CN +":"+ dataTime, dataTime, 1, TimeUnit.HOURS);
+                                adapter.redisQueueService.addElementWithExpire(MN +":"+ CN +":"+ dataTime, dataTime, 2, TimeUnit.HOURS);
                                 adapter.redisQueueService.sendMessage(Constant.SERVER, jsonObject);
                             }
                         }
@@ -113,7 +112,7 @@ public class BootNettyChannelInboundHandlerAdapter extends ChannelInboundHandler
                                 String MN = jsonObject.getString("MN");
                                 String dataTime = jsonObject.getString("DataTime");
                                 if (!adapter.redisQueueService.isElementExist(MN +":"+ CN +":"+ dataTime, dataTime)){
-                                    adapter.redisQueueService.addElementWithExpire(MN +":"+ CN +":"+ dataTime, dataTime, 1, TimeUnit.HOURS);
+                                    adapter.redisQueueService.addElementWithExpire(MN +":"+ CN +":"+ dataTime, dataTime, 2, TimeUnit.HOURS);
                                     adapter.redisQueueService.sendMessage(Constant.SERVER, jsonObject);
                                 }
                             }

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

@@ -5,9 +5,8 @@ import com.cn.esermis.coding.PollutionGas;
 import com.cn.esermis.constant.Constant;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author DaHuaJia
@@ -61,6 +60,9 @@ public class HJ212MsgUtils {
      * @return json
      */
     public static JSONObject dealMsg2(String msg) {
+        if (msg.contains("CN=2011")){
+            return null;
+        }
         JSONObject data = new JSONObject();
         try {
             // 拆分消息
@@ -103,7 +105,23 @@ public class HJ212MsgUtils {
                     cp.add(jsonObject);
                 }
             }
-            data.put("CP", cp);
+            // 处理有相同因子 值不同的数据
+            Set<JSONObject> cpNew = new HashSet<>();
+            for (JSONObject jsonObject : cp) {
+                JSONObject cpd = new JSONObject();
+                List<JSONObject> collect = cp.stream().filter(d -> d.getString("factor").equals(jsonObject.getString("factor"))).collect(Collectors.toList());
+//                System.out.println(collect);
+                for (JSONObject object : collect) {
+                    cpd.putAll(object);
+                }
+                cpNew.add(cpd);
+            }
+
+
+
+            data.put("CP", cpNew);
+
+
             // 保存消息尾数据，主要是CRC校验和包结束符
             data.put("End", subMsg[2]);