Selaa lähdekoodia

报警条件变化发送消息采用新的routingKey

lixing 3 vuotta sitten
vanhempi
commit
2a75ec1c63

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

@@ -10,7 +10,7 @@ import lombok.Getter;
  * @version: V1.0
  **/
 public enum EnumAlarmMessageType {
-    ALARM_CONFIGS_CHANGE("alarmConfigsChange", "报警定义变动"),
+    ALARM_CONFIGS_CHANGE("alarm_configs_change", "报警定义变动"),
     ALARM_TARGET_UPDATE("alarmTargetUpdate", "报警匹配条件更新"),
     ALARM_TARGET_CREATE("alarmTargetCreate", "新增报警匹配条件"),
     ALARM_TARGET_DELETE("alarmTargetDelete", "删除报警匹配条件"),

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

@@ -2,7 +2,6 @@ package com.persagy.dmp.alarm.jms;
 
 import com.persagy.common.json.JacksonMapper;
 import com.persagy.dmp.alarm.enumeration.EnumAlarmMessageType;
-import com.persagy.dmp.alarm.jms.executor.AlarmTargetUpdateExecutor;
 import com.persagy.dmp.common.SpringUtils;
 import com.persagy.dmp.config.DmpParameterStorage;
 import com.persagy.dmp.rwd.model.DmpMessage;
@@ -28,15 +27,24 @@ public class MessageProcesser {
 	private String exchange;
 
 	@Value("${persagy.dmp.alarm.routingKey}")
-	private String rwdRoutingKey;
+	private String dmpAlarmRoutingKey;
+
+	/**
+	 * 报警定义的routingKey
+	 */
+	private static final String alarmConfigRoutingKey = "alarm-config-routing-key";
 
 	@Autowired
 	private RabbitTemplate rabbitTemplate;
 
 	public void convertAndSend(DmpMessage message) {
 		log.info("向rabbitMQ发送消息,message:" + JacksonMapper.toSimpleJson(message));
-//		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, JacksonMapper.toSimpleJson(message));
-		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, message);
+		// 如果是报警定义的变化,通过报警定义的routingKey发送,否则用报警公用的routingKey发送
+		if (EnumAlarmMessageType.ALARM_CONFIGS_CHANGE.getValue().equals(message.getType())) {
+			rabbitTemplate.convertAndSend(exchange, alarmConfigRoutingKey, message);
+		} else {
+			rabbitTemplate.convertAndSend(exchange, dmpAlarmRoutingKey, message);
+		}
 	}
 
 	private static final Set<String> beanNames = new HashSet<>();