瀏覽代碼

config batch-update send message 2 mq

lixing 4 年之前
父節點
當前提交
ead64fa94c

+ 0 - 2
dmp-alarm/src/main/java/com/persagy/dmp/alarm/model/AlarmRecordModels.java

@@ -1,10 +1,8 @@
 package com.persagy.dmp.alarm.model;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
 import java.util.List;
 
 /**

+ 29 - 3
dmp-alarm/src/main/java/com/persagy/dmp/alarm/service/AlarmConfigService.java

@@ -474,18 +474,39 @@ public class AlarmConfigService extends AlarmBaseService {
         alarmConfigRepository.save(alarmConfig);
         response.add("id", alarmConfig.getId());
         // 报警定义发生变化,向mq推送消息
+        DmpMessage msg = getUpdateConfigsDmpMessage(Lists.newArrayList(alarmConfig));
+        if (msg != null) {
+            response.add(msg);
+        }
+        return response;
+    }
+
+    /**
+     * 获取更新报警定义消息
+     *
+     * @param alarmConfigList 更新的报警定义id
+     * @return 更新消息
+     * @author lixing
+     * @version V1.0 2021/3/27 3:30 下午
+     */
+    private DmpMessage getUpdateConfigsDmpMessage(List<AlarmConfig> alarmConfigList) {
+        if (CollectionUtils.isEmpty(alarmConfigList)) {
+            return null;
+        }
         DmpMessage msg = new DmpMessage();
         msg.setMid(UUID.randomUUID().toString());
         msg.setType(EnumAlarmMessageType.ALARM_CONFIGS_CHANGE.getValue());
         msg.setGroupCode(DmpParameterStorage.getGroupCode());
         msg.setProjectId(DmpParameterStorage.getProjectId());
-        msg.add("updatedConfigUniques", Lists.newArrayList(alarmConfig.getAlarmConfigUnique()));
+        List<AlarmConfig.AlarmConfigUnique> alarmConfigUniqueList = alarmConfigList.stream().
+                map(AlarmConfig::getAlarmConfigUnique).collect(Collectors.toList());
+        msg.add("updatedConfigUniques", alarmConfigUniqueList);
         msg.setAppId(DmpParameterStorage.getAppId());
         msg.setSendTime(DateUtils.format(new Date()));
-        response.add(msg);
-        return response;
+        return msg;
     }
 
+
     /**
      * @description: 根据更新条件更新实体
      * @param: param
@@ -634,6 +655,8 @@ public class AlarmConfigService extends AlarmBaseService {
             configs.add(alarmConfig);
         }
         alarmConfigRepository.saveAll(configs);
+        DmpMessage updateConfigsDmpMessage = getUpdateConfigsDmpMessage(configs);
+        messageProcesser.convertAndSend(updateConfigsDmpMessage);
         Date date1 = new Date();
         System.out.println("执行时间:" + (date1.getTime() - date.getTime()));
         return response;
@@ -660,6 +683,9 @@ public class AlarmConfigService extends AlarmBaseService {
             return response;
         }
         alarmConfigRepository.save(entity);
+        // 发送报警定义创建消息
+        DmpMessage msg = generateMessage(Lists.newArrayList(entity), null);
+        messageProcesser.convertAndSend(msg);
         response.add("id", entity.getId());
         return response;
     }

+ 4 - 2
dmp-alarm/src/main/resources/bootstrap.yml

@@ -5,8 +5,10 @@ spring:
     active: log-dev
   cloud:
     config:
-      profile: dev2
-      uri: http://192.168.64.18:9932
+      profile: dev
+      uri: http://192.168.100.107:9932
+      #      profile: dev2
+#      uri: http://192.168.64.18:9932
 persagy:
   log:
     path: ../logs/dmp-alarm/