From 745d5b90be7d8cdb8873b18d18b286fdc4b6913b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 05 十二月 2023 10:13:57 +0800
Subject: [PATCH] 配置文件全部更改为配置类 优化包路径
---
src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 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 a8243d9..33fd6dd 100644
--- a/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
+++ b/src/main/java/com/ard/alarm/tube/service/TubeAlarmService.java
@@ -1,15 +1,19 @@
package com.ard.alarm.tube.service;
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 com.ard.utils.netty.config.NettyUdpConfiguration;
+import com.ard.utils.util.DateUtils;
+import com.ard.utils.mqtt.MqttProducer;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioDatagramChannel;
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;
-
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -25,22 +29,6 @@
@Service
@Slf4j(topic = "tube")
public class TubeAlarmService {
- @Resource
- NettyUdpServer nettyUdpServer;
-
- @Value("${spring.netty.udp.port}")
- private Integer udpPort;
- @Value("${spring.netty.udp.enabled}")
- private String UdpServerEnable;
-
- @PostConstruct
- public void init() {
- if (UdpServerEnable.equals("false")) {
- return;
- }
- nettyUdpServer.init(udpPort);
- log.info("UDP鏈嶅姟宸插惎鍔�");
- }
@Async("alarm")
public void alarmHandler(String message) {
@@ -50,7 +38,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];
@@ -63,15 +51,15 @@
map.put("alarmType", start);
map.put("position", position);
map.put("watcher", watcher);
- log.info("寮�濮嬭В鏋�" + start);
- log.info("涓绘満锛�" + host);
- log.info("绠＄嚎缂栧彿锛�" + tubeId);
- log.info("鎶ヨ鏃堕棿锛�" + alarmTime);
- log.info("鎶ヨ绫诲瀷锛�" + type);
- log.info("浣嶇疆锛�" + position);
- log.info("鍊肩彮浜猴細" + watcher);
- log.info("缁撴潫瑙ｆ瀽" + stop);
- MqttConsumer.publish(2, false, "tube", JSON.toJSONString(map));
+ log.debug("寮�濮嬭В鏋�" + start);
+ log.debug("涓绘満锛�" + host);
+ log.debug("绠＄嚎缂栧彿锛�" + tubeId);
+ log.debug("鎶ヨ鏃堕棿锛�" + alarmTime);
+ log.debug("鎶ヨ绫诲瀷锛�" + type);
+ log.debug("浣嶇疆锛�" + position);
+ log.debug("鍊肩彮浜猴細" + watcher);
+ log.debug("缁撴潫瑙ｆ瀽" + stop);
+ MqttProducer.publish(2, false, "tube", JSON.toJSONString(map));
} else {
log.error("鏁版嵁寮傚父");
}
@@ -79,4 +67,5 @@
log.error("tube鎶ヨ鏁版嵁鎺ㄩ�佸紓甯革細" + ex.getMessage());
}
}
+
}
--
Gitblit v1.9.3