From 362424a4fcba5ecca8b449eb568606302fadb568 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 08 八月 2023 09:53:36 +0800
Subject: [PATCH] 优化
---
src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 3106e6a..f524b99 100644
--- a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
+++ b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
@@ -1,12 +1,12 @@
package com.ard.alarm.tube.service;
import com.alibaba.fastjson2.JSON;
-import com.ard.utils.DateUtils;
+import com.ard.utils.other.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.core.annotation.Order;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
@@ -14,8 +14,6 @@
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/**
* @Description: 绠＄嚎娉勬紡鎶ヨ鏈嶅姟
@@ -26,14 +24,14 @@
**/
@Service
@Slf4j(topic = "tube")
+@Order(3)
public class TubeAlarmService {
@Resource
NettyUdpServer nettyUdpServer;
- @Resource
- NettyTcpClient nettyTcpClient;
- @Value("${spring.netty.port}")
+
+ @Value("${spring.netty.udp.port}")
private Integer udpPort;
- @Value("${spring.netty.enabled}")
+ @Value("${spring.netty.udp.enabled}")
private String UdpServerEnable;
@PostConstruct
@@ -42,10 +40,9 @@
return;
}
nettyUdpServer.init(udpPort);
- log.info("UDP鏈嶅姟宸插惎鍔�");
- nettyTcpClient.init("127.0.0.1",1200);
- log.info("TCP瀹㈡埛绔凡鍚姩");
+ log.info("绠＄嚎娉勯湶UDP鏈嶅姟宸插惎鍔�");
}
+
@Async("alarm")
public void alarmHandler(String message) {
@@ -55,7 +52,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];
@@ -84,4 +81,6 @@
log.error("tube鎶ヨ鏁版嵁鎺ㄩ�佸紓甯革細" + ex.getMessage());
}
}
+
+
}
--
Gitblit v1.9.3