Browse Source

Merge branch 'huarun'

lixing 4 years ago
parent
commit
23360e6e18

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

@@ -25,7 +25,10 @@ public class JmsConfig {
 	private String exchange;
 
 	@Value("${persagy.dmp.alarm.routingKey}")
-	private String alarmRoutingKey;
+	private String dmpAlarmRoutingKey;
+
+	@Value("${alarm.obj.routingKey}")
+	private String alarmObjRoutingKey;
 
 	@Value("${persagy.dmp.rwd.routingKey}")
 	private String rwdRoutingKey;
@@ -33,6 +36,11 @@ public class JmsConfig {
 	@Value("${persagy.dmp.alarm.queue}")
 	private String alarmQueue;
 
+	/**
+	 * 报警对象队列
+	 */
+	private final String alarmObjQueue = "alarm-obj-queue";
+
 	@Autowired
 	private MessageProcesser messageProcesser;
 
@@ -48,7 +56,7 @@ public class JmsConfig {
 
 	@Bean
 	public Binding alarmBinding() {
-		return BindingBuilder.bind(alarmQueue()).to(exchange()).with(alarmRoutingKey);
+		return BindingBuilder.bind(alarmQueue()).to(exchange()).with(dmpAlarmRoutingKey);
 	}
 
 	@Bean
@@ -56,11 +64,26 @@ public class JmsConfig {
 		return BindingBuilder.bind(alarmQueue()).to(exchange()).with(rwdRoutingKey);
 	}
 
+	@Bean
+	public Queue alarmObjQueue() {
+		return new Queue(alarmObjQueue, true);
+	}
 
-	@RabbitListener(queues = "${persagy.dmp.alarm.queue}")    //监听器监听指定的Queue
+	@Bean
+	public Binding alarmObjBinding() {
+		return BindingBuilder.bind(alarmObjQueue()).to(exchange()).with(alarmObjRoutingKey);
+	}
+
+	@RabbitListener(queues = alarmObjQueue)    //监听器监听指定的Queue
 	public void process(String message, Channel channel, Message msg) {
 		log.info("============================== Receive:" + message);
 		DmpMessage dmpMessage = JacksonMapper.toObject(message, DmpMessage.class);
 		messageProcesser.listen(dmpMessage);
 	}
+
+	@RabbitListener(queues = "${persagy.dmp.alarm.queue}")    //监听器监听指定的Queue
+	public void process(DmpMessage message) {
+		log.info("============================== Receive:" + JacksonMapper.toSimpleJson(message));
+		messageProcesser.listen(message);
+	}
 }

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

@@ -35,7 +35,8 @@ public class MessageProcesser {
 
 	public void convertAndSend(DmpMessage message) {
 		log.info("向rabbitMQ发送消息,message:" + JacksonMapper.toSimpleJson(message));
-		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, JacksonMapper.toSimpleJson(message));
+//		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, JacksonMapper.toSimpleJson(message));
+		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, message);
 	}
 
 	private static final Set<String> beanNames = new HashSet<>();

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

@@ -240,7 +240,7 @@ public class AlarmRecordService extends AlarmBaseService {
         msg.setGroupCode(DmpParameterStorage.getGroupCode());
         msg.setProjectId(DmpParameterStorage.getProjectId());
         msg.setTargetId(alarmRecord.getId());
-        msg.add("obj", JSONObject.toJSONString(alarmRecord));
+        msg.add("obj", JacksonMapper.toSimpleJson(alarmRecord));
         msg.setAppId(DmpParameterStorage.getAppId());
         msg.setSendTime(DateUtils.format(new Date()));
         response.add(msg);

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

@@ -127,8 +127,10 @@ public class AlarmTargetService extends AlarmBaseService {
      * @version: V1.0
      */
     private boolean influenceConfigs(AlarmTargetModel param, AlarmTarget alarmTarget) {
-        boolean itemCodeChange = !StringUtils.isEmpty(param.getItemCode()) &&
-                !param.getItemCode().equals(alarmTarget.getItemCode());
+//        boolean itemCodeChange = !StringUtils.isEmpty(param.getItemCode()) &&
+//                !param.getItemCode().equals(alarmTarget.getItemCode());
+        boolean levelChange = !StringUtils.isEmpty(param.getLevel()) &&
+                !param.getLevel().equals(alarmTarget.getLevel());
         boolean classCodeChange = !StringUtils.isEmpty(param.getClassCode()) &&
                 !param.getClassCode().equals(alarmTarget.getClassCode());
         boolean concernChange = param.getConcern() != null &&
@@ -138,7 +140,7 @@ public class AlarmTargetService extends AlarmBaseService {
         boolean conditionChange = !StringUtils.isEmpty(param.getCondition()) &&
                 !param.getCondition().equals(alarmTarget.getCondition());
 
-        return itemCodeChange || classCodeChange || concernChange || openChange || conditionChange;
+        return levelChange || classCodeChange || concernChange || openChange || conditionChange;
     }
 
     @Transactional
@@ -159,8 +161,11 @@ public class AlarmTargetService extends AlarmBaseService {
         if (param.getItemCode() != null && !param.getItemCode().isEmpty()) {
             alarmTarget.setItemCode(param.getItemCode());
         }
-        if (param.getClassCode() != null && !param.getClassCode().isEmpty()) {
-            alarmTarget.setClassCode(param.getClassCode());
+//        if (param.getClassCode() != null && !param.getClassCode().isEmpty()) {
+//            alarmTarget.setClassCode(param.getClassCode());
+//        }
+        if (param.getLevel() != null && !param.getLevel().isEmpty()) {
+            alarmTarget.setLevel(param.getLevel());
         }
         if (param.getConcern() != null) {
             alarmTarget.setConcern(param.getConcern());