Bläddra i källkod

增加处理设备删除同步删除设备报警定义的方法

lixing 3 år sedan
förälder
incheckning
7a4022c1a2

+ 3 - 3
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/feign/client/DicClient.java

@@ -1,11 +1,11 @@
 package com.persagy.apm.energyalarmstarter.alarmdata.feign.client;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.energyalarmstarter.alarmdata.constant.RequestUrlConstant;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.UrlParamDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
+import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.UrlParamDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.fallback.DicClientFallbackFactory;
-import org.springframework.boot.configurationprocessor.json.JSONArray;
-import org.springframework.boot.configurationprocessor.json.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.PostMapping;

+ 39 - 0
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/mq/InstanceObjMessageSender.java

@@ -0,0 +1,39 @@
+package com.persagy.apm.energyalarmstarter.alarmdata.mq;
+
+import com.persagy.apm.energyalarmstarter.alarmdata.mq.model.DmpMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @description: 将消息放入mq
+ * @author: lixing
+ * @company: Persagy Technology Co.,Ltd
+ * @since: 2020/12/10 9:45 上午
+ * @version: V1.0
+ **/
+@Slf4j
+@Component
+public class InstanceObjMessageSender extends MessageSender {
+    @Value("${alarm.obj.routingKey}")
+    private String routingKey;
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    /**
+     * @description: 发送消息
+     * @param: message
+     * @return: void
+     * @exception:
+     * @author: lixing
+     * @company: Persagy Technology Co.,Ltd
+     * @since: 2020/12/10 9:48 上午
+     * @version: V1.0
+     */
+    public void sendMessage(DmpMessage message) {
+        super.sendMessage(message, routingKey);
+    }
+}

+ 40 - 0
AlarmDataStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmdata/mq/MessageSender.java

@@ -0,0 +1,40 @@
+package com.persagy.apm.energyalarmstarter.alarmdata.mq;
+
+import com.alibaba.fastjson.JSONObject;
+import com.persagy.apm.energyalarmstarter.alarmdata.mq.model.DmpMessage;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+
+/**
+ * @description: 将消息放入mq
+ * @author: lixing
+ * @company: Persagy Technology Co.,Ltd
+ * @since: 2020/12/10 9:45 上午
+ * @version: V1.0
+ **/
+@Slf4j
+public abstract class MessageSender {
+    @Value("${dmp.alarm.exchange}")
+    private String exchange;
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    /**
+     * @description: 发送消息
+     * @param: message
+     * @param: routingKey
+     * @return: void
+     * @exception:
+     * @author: lixing
+     * @company: Persagy Technology Co.,Ltd
+     * @since: 2020/12/10 9:48 上午
+     * @version: V1.0
+     */
+    public void sendMessage(DmpMessage message, String routingKey) {
+        log.info("向rabbitMQ发送消息,message:" + JSONObject.toJSON(message).toString());
+        rabbitTemplate.convertAndSend(exchange, routingKey, JSONObject.toJSON(message).toString());
+    }
+}

+ 1 - 1
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/model/DmpMessage.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energyalarmstarter.alarmengine.jms.model;
+package com.persagy.apm.energyalarmstarter.alarmdata.mq.model;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.Data;

+ 1 - 1
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/AlarmEngineMsgHandler.java

@@ -2,8 +2,8 @@ package com.persagy.apm.energyalarmstarter.alarmengine.jms;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.persagy.apm.energyalarmstarter.alarmdata.mq.model.DmpMessage;
 import com.persagy.apm.energyalarmstarter.alarmengine.feign.AlarmCondition;
-import com.persagy.apm.energyalarmstarter.alarmengine.jms.model.DmpMessage;
 import com.persagy.apm.energyalarmstarter.alarmengine.service.AlarmRecordMsgHandler;
 import io.netty.channel.ChannelHandler;
 import lombok.SneakyThrows;

+ 1 - 2
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/jms/JmsConfig.java

@@ -2,8 +2,7 @@ package com.persagy.apm.energyalarmstarter.alarmengine.jms;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Sets;
-import com.persagy.apm.energyalarmstarter.alarmengine.jms.model.DmpMessage;
-import com.persagy.apm.energyalarmstarter.alarmengine.service.AlarmRecordMsgHandler;
+import com.persagy.apm.energyalarmstarter.alarmdata.mq.model.DmpMessage;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

+ 1 - 2
AlarmEngineStarter/src/main/java/com/persagy/apm/energyalarmstarter/alarmengine/service/AlarmRecordMsgHandler.java

@@ -5,13 +5,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.AlarmUrlParam;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.alarmitem.QueryAlarmItemDTO;
-import com.persagy.apm.energyalarmstarter.alarmdata.model.dto.common.UrlParamDTO;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.DmpResult;
 import com.persagy.apm.energyalarmstarter.alarmdata.feign.client.AlarmClient;
 import com.persagy.apm.energyalarmstarter.alarmdata.model.vo.AlarmItem;
+import com.persagy.apm.energyalarmstarter.alarmdata.mq.model.DmpMessage;
 import com.persagy.apm.energyalarmstarter.alarmdata.service.AlarmItemServiceImpl;
 import com.persagy.apm.energyalarmstarter.alarmdata.utils.DmpResultUtil;
-import com.persagy.apm.energyalarmstarter.alarmengine.jms.model.DmpMessage;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;