소스 검색

修改查询报警定义的bug

lixing 3 년 전
부모
커밋
b899efbcc0

+ 6 - 1
src/main/java/com/persagy/dmp/starter/alarm/communication/netty/NettyAlarmMsgBaseHandler.java

@@ -118,6 +118,11 @@ public class NettyAlarmMsgBaseHandler extends ChannelInboundHandlerAdapter {
         }
     }
 
+    public static void main(String[] args) {
+        String[] split = "Pj3101170001".split(",");
+        System.out.println(split);
+    }
+
     /**
      * @description: 发送全部报警定义到边缘端
      * @param: nettyMessage
@@ -159,10 +164,10 @@ public class NettyAlarmMsgBaseHandler extends ChannelInboundHandlerAdapter {
             data.remove("onlyCount");
             alarmConfigs = nettyAlarmService.queryAlarmConfig(data);
         }
-        log.info("===========>报警定义信息获取完成!共{}条!", alarmConfigs.size());
         if (alarmConfigs == null || alarmConfigs.size() <= 0) {
             return;
         }
+        log.info("===========>报警定义信息获取完成!共{}条!", alarmConfigs.size());
         // 查询到的报警定义按项目id分组,发送到对应的边缘端
         Map<String, List<Object>> groups = alarmConfigs.stream().collect(
                 Collectors.groupingBy(alarmConfig ->

+ 2 - 0
src/main/java/com/persagy/dmp/starter/alarm/service/BaseService.java

@@ -57,6 +57,8 @@ public class BaseService {
             String[] projectIds = projectId.split(",");
             if (projectIds.length > 1) {
                 obj.put("projectId", "0");
+            } else {
+                projectId = projectIds[0];
             }
         }
         this.checkRequestParam(obj);