Merge remote-tracking branch 'origin/master'

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

@@ -109,15 +109,17 @@ public class AlarmConfig {
 	public class AlarmConfigUnique {
 		private String itemCode;
 		private String objId;
+		private String targetId;
 
-		AlarmConfigUnique(String itemCode, String objId) {
+		AlarmConfigUnique(String itemCode, String objId, String targetId) {
 			this.itemCode = itemCode;
 			this.objId = objId;
+			this.targetId = targetId;
 		}
 	}
 
 	public AlarmConfigUnique getAlarmConfigUnique() {
-		return new AlarmConfigUnique(this.itemCode, this.objId);
+		return new AlarmConfigUnique(this.itemCode, this.objId, this.targetId);
 	}
 
 }

dmp-alarm/src/main/java/com/persagy/dmp/alarm/enumeration/EnumAlarmMessageType.java

@@ -13,6 +13,7 @@ public enum EnumAlarmMessageType {
     ALARM_CONFIGS_CHANGE("alarmConfigsChange", "报警定义变动"),
     ALARM_TARGET_UPDATE("alarmTargetUpdate", "报警匹配条件更新"),
     ALARM_TARGET_CREATE("alarmTargetCreate", "新增报警匹配条件"),
+    ALARM_TARGET_DELETE("alarmTargetDelete", "删除报警匹配条件"),
     ALARM_ITEM_CREATE("alarmItemCreate", "新增报警条目"),
     ALARM_ITEM_UPDATE("alarmItemUpdate", "报警条目更新"),
     ALARM_ITEM_DELETE("alarmItemDelete", "删除报警条目"),

dmp-alarm/src/main/java/com/persagy/dmp/alarm/jms/JmsConfig.java

@@ -76,7 +76,7 @@ public class JmsConfig {
 		return BindingBuilder.bind(alarmObjQueue()).to(exchange()).with(alarmObjRoutingKey);
 	}
 
-	@RabbitListener(queues = {alarmObjQueue, "${persagy.dmp.alarm.queue}"})    //监听器监听指定的Queue
+	@RabbitListener(queues = {alarmObjQueue})    //监听器监听指定的Queue
 	public void process(String message, Channel channel, Message msg) {
 		log.info("============================== Receive:" + message);
 		DmpMessage dmpMessage = JacksonMapper.toObject(message, DmpMessage.class);
@@ -89,10 +89,16 @@ public class JmsConfig {
 		}
 	}
 
-//	@RabbitListener(queues = "${persagy.dmp.alarm.queue}")    //监听器监听指定的Queue
-//	public void process(DmpMessage message) {
-//		log.info("============================== Receive:" + JacksonMapper.toSimpleJson(message));
-//		messageProcesser.listen(message);
-//	}
+	@RabbitListener(queues = "${persagy.dmp.alarm.queue}")    //监听器监听指定的Queue
+	public void process(DmpMessage message, Channel channel, Message msg) {
+		log.info("============================== Receive:" + JacksonMapper.toSimpleJson(message));
+		messageProcesser.listen(message);
+		// 手动确认消息已消费
+		try {
+			channel.basicAck(msg.getMessageProperties().getDeliveryTag(),false);
+		} catch (IOException e) {
+			log.error("消息消费反馈失败", e);
+		}
+	}
 
 }

dmp-alarm/src/main/java/com/persagy/dmp/alarm/jms/MessageProcesser.java

@@ -46,6 +46,7 @@ public class MessageProcesser {
 		beanNames.add(EnumAlarmMessageType.ALARM_TARGET_UPDATE.getValue());
 		beanNames.add(EnumAlarmMessageType.ALARM_ITEM_UPDATE.getValue());
 		beanNames.add(EnumAlarmMessageType.INSTANCE_OBJ_DELETE.getValue());
+		beanNames.add(EnumAlarmMessageType.ALARM_TARGET_DELETE.getValue());
 //		由其他服务消费
 //		beanNames.add(RabbitMQConstants.ALARM_CONFIG_CREATE);
 //		beanNames.add(RabbitMQConstants.ALARM_CONFIG_DELETE);

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

@@ -209,7 +209,7 @@ public class AlarmTargetService extends AlarmBaseService {
         /* 拼装需要推送至消息队列的消息 */
         DmpMessage msg = new DmpMessage();
         msg.setMid(UUID.randomUUID().toString());
-        msg.setType(EnumAlarmMessageType.ALARM_ITEM_DELETE.getValue());
+        msg.setType(EnumAlarmMessageType.ALARM_TARGET_DELETE.getValue());
         msg.setGroupCode(DmpParameterStorage.getGroupCode());
         msg.setProjectId(DmpParameterStorage.getProjectId());
         msg.setTargetId(param.getId());

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

@@ -5,8 +5,9 @@ spring:
     active: log-dev
   cloud:
     config:
-      profile: dev
-      uri: http://192.168.100.107:9932
+      profile: dev2
+#      uri: http://192.168.100.107:9932
+      uri: http://192.168.64.18:9932
       #      profile: dev2
 #      uri: http://192.168.64.18:9932
 persagy: