From 9aa66699aaa610be66f5bd0c22e90cae114311f9 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 07 七月 2023 17:15:16 +0800
Subject: [PATCH] 优化外联设备报警解析并上传mqtt
---
src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
index bb9cbdb..ce6bd9c 100644
--- a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
+++ b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
@@ -3,9 +3,13 @@
import com.alibaba.fastjson2.JSON;
import com.ard.utils.DateUtils;
import com.ard.utils.mqtt.MqttConsumer;
+import com.ard.utils.tcp.NettyTcpClient;
import com.ard.utils.udp.NettyUdpServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -13,8 +17,6 @@
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* @Description: 绠＄嚎娉勬紡鎶ヨ鏈嶅姟
@@ -25,22 +27,24 @@
**/
@Service
@Slf4j(topic = "tube")
-public class TubeAlarmService {
+@Order(3)
+public class TubeAlarmService implements ApplicationRunner {
@Resource
NettyUdpServer nettyUdpServer;
- @Value("${spring.netty.port}")
- private Integer udpPort;
- @Value("${spring.netty.enabled}")
- private String UdpServerEnable;
- @PostConstruct
- public void init() {
+ @Value("${spring.netty.udp.port}")
+ private Integer udpPort;
+ @Value("${spring.netty.udp.enabled}")
+ private String UdpServerEnable;
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
if (UdpServerEnable.equals("false")) {
return;
}
nettyUdpServer.init(udpPort);
- log.info("UDP鏈嶅姟宸茬粡鍚姩");
+ log.info("绠＄嚎娉勯湶UDP鏈嶅姟宸插惎鍔�");
}
+
@Async("alarm")
public void alarmHandler(String message) {
@@ -50,7 +54,7 @@
String start = messages[0];
String host = messages[1];
String tubeId = messages[2];
- String alarmTime = DateUtils.convertDate(messages[3]);
+ String alarmTime = DateUtils.convertDate(messages[3],"yyyy/M/d H:m:s");
String position = messages[4];
String type = messages[5];
String watcher = messages[6];
@@ -79,4 +83,6 @@
log.error("tube鎶ヨ鏁版嵁鎺ㄩ�佸紓甯革細" + ex.getMessage());
}
}
+
+
}
--
Gitblit v1.9.3