Explorar o código

接收并处理设备删除消息

lixing %!s(int64=4) %!d(string=hai) anos
pai
achega
409b632705

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

@@ -17,7 +17,8 @@ public enum EnumAlarmMessageType {
     ALARM_ITEM_UPDATE("alarmItemUpdate", "报警条目更新"),
     ALARM_ITEM_DELETE("alarmItemDelete", "删除报警条目"),
     ALARM_RECORD_CREATE("alarmRecordCreate", "新增报警"),
-    ALARM_RECORD_UPDATE("alarmRecordUpdate", "报警更新");
+    ALARM_RECORD_UPDATE("alarmRecordUpdate", "报警更新"),
+    INSTANCE_OBJ_DELETE("instanceObjDelete", "设备删除");
 
     @Getter
     private String value;

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

@@ -2,11 +2,9 @@ package com.persagy.dmp.alarm.jms;
 
 import com.persagy.common.json.JacksonMapper;
 import com.persagy.dmp.rwd.model.DmpMessage;
+import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.BindingBuilder;
-import org.springframework.amqp.core.Queue;
-import org.springframework.amqp.core.TopicExchange;
+import org.springframework.amqp.core.*;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -58,9 +56,11 @@ public class JmsConfig {
 		return BindingBuilder.bind(alarmQueue()).to(exchange()).with(rwdRoutingKey);
 	}
 
+
 	@RabbitListener(queues = "${persagy.dmp.alarm.queue}")    //监听器监听指定的Queue
-	public void process(DmpMessage message) {
-		log.info("============================== Receive:" + JacksonMapper.toSimpleJson(message));
-		messageProcesser.listen(message);
+	public void process(String message, Channel channel, Message msg) {
+		log.info("============================== Receive:" + message);
+		DmpMessage dmpMessage = JacksonMapper.toObject(message, DmpMessage.class);
+		messageProcesser.listen(dmpMessage);
 	}
 }

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

@@ -35,7 +35,7 @@ public class MessageProcesser {
 
 	public void convertAndSend(DmpMessage message) {
 		log.info("向rabbitMQ发送消息,message:" + JacksonMapper.toSimpleJson(message));
-		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, message);
+		rabbitTemplate.convertAndSend(exchange, rwdRoutingKey, JacksonMapper.toSimpleJson(message));
 	}
 
 	private static final Set<String> beanNames = new HashSet<>();
@@ -44,6 +44,7 @@ public class MessageProcesser {
 		beanNames.add(EnumAlarmMessageType.ALARM_TARGET_CREATE.getValue());
 		beanNames.add(EnumAlarmMessageType.ALARM_TARGET_UPDATE.getValue());
 		beanNames.add(EnumAlarmMessageType.ALARM_ITEM_UPDATE.getValue());
+		beanNames.add(EnumAlarmMessageType.INSTANCE_OBJ_DELETE.getValue());
 //		由其他服务消费
 //		beanNames.add(RabbitMQConstants.ALARM_CONFIG_CREATE);
 //		beanNames.add(RabbitMQConstants.ALARM_CONFIG_DELETE);

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

@@ -7,4 +7,4 @@ spring:
   cloud:
     config:
       profile: dev
-      uri: http://localhost:9932
+      uri: http://192.168.100.107:9932

+ 16 - 16
dmp-alarm/src/main/resources/logback-spring.xml

@@ -30,26 +30,26 @@
     <logger name="com.netflix" level="WARN"/>
     <logger name="org.apache.http" level="INFO"/>
 
-    <springProfile name="log-dev">
+<!--    <springProfile name="log-dev">-->
         <logger name="org.hibernate.SQL" level="DEBUG"/>
         <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
         <root level="info">
             <appender-ref ref="stdout"/>
         </root>
-    </springProfile>
-
-    <springProfile name="log-test">
-        <logger name="org.hibernate.SQL" level="DEBUG"/>
-        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>
-        <root level="info">
-            <appender-ref ref="file"/>
-        </root>
-    </springProfile>
-
-    <springProfile name="log-prod">
-        <root level="info">
-            <appender-ref ref="file"/>
-        </root>
-    </springProfile>
+<!--    </springProfile>-->
+
+<!--    <springProfile name="log-test">-->
+<!--        <logger name="org.hibernate.SQL" level="DEBUG"/>-->
+<!--        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE"/>-->
+<!--        <root level="info">-->
+<!--            <appender-ref ref="file"/>-->
+<!--        </root>-->
+<!--    </springProfile>-->
+
+<!--    <springProfile name="log-prod">-->
+<!--        <root level="info">-->
+<!--            <appender-ref ref="file"/>-->
+<!--        </root>-->
+<!--    </springProfile>-->
 
 </configuration>