lixing 4 gadi atpakaļ
vecāks
revīzija
05ce7e029f

+ 1 - 1
pom.xml

@@ -11,7 +11,7 @@
     <groupId>com.persagy.dmp.starter</groupId>
     <artifactId>dmp-alarm-starter</artifactId>
 <!--    <version>4.0.0-SNAPSHOT</version>-->
-    <version>4.0.7</version>
+    <version>4.0.9</version>
     <name>dmp-alarm-starter</name>
     <description>dmp_alarm_starter</description>
 

+ 17 - 12
src/main/java/com/persagy/dmp/starter/alarm/communication/mq/JmsConfig.java

@@ -1,7 +1,7 @@
 package com.persagy.dmp.starter.alarm.communication.mq;
 
-import com.persagy.dmp.alarm.jms.model.OrderStateMessage;
 import com.persagy.dmp.starter.alarm.communication.mq.model.DmpMessage;
+import com.persagy.dmp.starter.alarm.communication.mq.model.OrderStateMessage;
 import com.persagy.dmp.starter.alarm.communication.netty.NettyAlarmMsgBaseHandler;
 import com.persagy.dmp.starter.alarm.service.OrderStateChangeService;
 import com.persagy.dmp.starter.alarm.util.StringUtil;
@@ -120,18 +120,23 @@ public class JmsConfig {
 
     @RabbitHandler
     @RabbitListener(queues = "${dmp.alarm.queue}")
-    public void planQueues(String msg, Channel channel, Message message) throws Exception {
-        log.info("============================== Receive:" + msg);
-        DmpMessage dmpMessage = StringUtil.transferItemToDTO(msg, DmpMessage.class);
-        //报警定义变化
-        if (ALARM_CONFIGS_CHANGE.equals(dmpMessage.getType())) {
-            log.info("================收到一条报警定义变化通知==============");
-            log.info(msg.toString());
-            try {
-                msgHandler.incrementSyncAlarmConfig(dmpMessage);
-            } catch (Exception e) {
-                log.error("error", e);
+    public void planQueues(String msg, Channel channel, Message message) {
+        try {
+            log.info("============================== Receive:" + msg);
+            DmpMessage dmpMessage = StringUtil.transferItemToDTO(msg, DmpMessage.class);
+            //报警定义变化
+            if (ALARM_CONFIGS_CHANGE.equals(dmpMessage.getType())) {
+                log.info("================收到一条报警定义变化通知==============");
+                log.info(msg);
+                try {
+                    msgHandler.incrementSyncAlarmConfig(dmpMessage);
+                } catch (Exception e) {
+                    log.error("error", e);
+                }
             }
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
+        } catch (Exception e) {
+            log.error("消息消费失败,{}", e.getMessage());
         }
     }
 }

+ 1 - 1
src/main/java/com/persagy/dmp/starter/alarm/communication/mq/model/OrderStateMessage.java

@@ -1,4 +1,4 @@
-package com.persagy.dmp.alarm.jms.model;
+package com.persagy.dmp.starter.alarm.communication.mq.model;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -2,7 +2,7 @@ package com.persagy.dmp.starter.alarm.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.persagy.dmp.alarm.jms.model.OrderStateMessage;
+import com.persagy.dmp.starter.alarm.communication.mq.model.OrderStateMessage;
 import com.persagy.dmp.starter.alarm.feign.DmpResult;
 import com.persagy.dmp.starter.alarm.feign.client.AlarmClient;
 import org.springframework.beans.factory.annotation.Autowired;