修复批量更新报警发送mq消息的bug

dmp-alarm/src/main/java/com/persagy/dmp/alarm/entity/AlarmRecord.java

@@ -1,6 +1,7 @@
 package com.persagy.dmp.alarm.entity;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Maps;
 import com.vladmihalcea.hibernate.type.json.JsonStringType;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,6 +13,8 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.*;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Setter
 @Getter
@@ -78,6 +81,7 @@ public class AlarmRecord {
 		entity.setName(model.getName());
 		entity.setCategory(model.getCategory());
 		entity.setConcern(model.getConcern());
+		//
 		entity.setState(model.getState());
 		entity.setEffectStartTime(model.getEffectStartTime());
 		entity.setEffectEndTime(model.getEffectEndTime());

dmp-alarm/src/main/java/com/persagy/dmp/alarm/service/AlarmRecordService.java

@@ -273,7 +273,12 @@ public class AlarmRecordService extends AlarmBaseService {
             return response;
         }
 
-        alarmRecordModelList.forEach(this::update);
+        List<DmpMessage> msgList = new ArrayList<>();
+        alarmRecordModelList.forEach(alarmRecordModel -> {
+            MapResponse updateResponse = update(alarmRecordModel);
+            msgList.addAll(updateResponse.getMessageList());
+        });
+        response.add(msgList);
         return response;
     }
 

dmp-alarm/src/main/resources/bootstrap.yml

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

dmp-common/src/main/java/com/persagy/common/web/BaseResponse.java

@@ -61,4 +61,11 @@ public class BaseResponse<T> {
 		}
 		messageList.add(msg);
 	}
+
+	public void add(List<DmpMessage> msgs){
+		if (messageList == null) {
+			messageList = new LinkedList<>();
+		}
+		messageList.addAll(msgs);
+	}
 }