From 606d7388589829e6a7108a48898d4e4126312d73 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 01 十一月 2023 16:38:11 +0800
Subject: [PATCH] 增加雷达角度引导信息反馈
---
src/main/java/com/ard/utils/tcp/ClientInitialize.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientInitialize.java b/src/main/java/com/ard/utils/tcp/ClientInitialize.java
index 0fa3d9e..dfc0ca8 100644
--- a/src/main/java/com/ard/utils/tcp/ClientInitialize.java
+++ b/src/main/java/com/ard/utils/tcp/ClientInitialize.java
@@ -17,6 +17,9 @@
import io.netty.channel.socket.nio.NioSocketChannel;
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.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -34,7 +37,8 @@
*/
@Component
@Slf4j(topic = "netty")
-public class ClientInitialize {
+@Order(2)
+public class ClientInitialize implements ApplicationRunner {
@Resource
IArdEquipRadarService ardEquipRadarService;
@@ -45,7 +49,7 @@
private Bootstrap bootstrap;
public static CopyOnWriteArraySet<ArdEquipRadar> falseConnectSet = new CopyOnWriteArraySet();
public static ConcurrentHashMap<ChannelId, ArdEquipRadar> tureConnectMap = new ConcurrentHashMap();
-
+ public static ConcurrentHashMap<String, Object> SuccessConnectMap = new ConcurrentHashMap();
/**
* Netty鍒濆鍖栭厤缃�
*/
@@ -78,7 +82,7 @@
}
});
}
- Thread.sleep(3000);
+ Thread.sleep(10000);
} catch (Exception e) {
log.error("Netty鍒濆鍖栭厤缃洃鍚湴鍧�鍑虹幇寮傚父");
e.printStackTrace();
@@ -100,18 +104,20 @@
// 寮傛杩炴帴tcp鏈嶅姟绔�
bootstrap.remoteAddress(host, port).connect().addListener((ChannelFuture futureListener) -> {
if (!futureListener.isSuccess()) {
- log.error(host + ":" + port + "闆疯揪TCP鏈嶅姟绔繛鎺ュけ璐�");
+ log.debug("闆疯揪銆�" + host + ":" + port + "銆戣繛鎺ュけ璐�");
futureListener.channel().close();
// 杩炴帴澶辫触淇℃伅鎻掑叆Set
falseConnectSet.add(ardEquipRadar);
// 杩炴帴澶辫触淇℃伅浠巑ap绉婚櫎
tureConnectMap.remove(futureListener.channel().id());
+ SuccessConnectMap.remove(ardEquipRadar.getId());
} else {
- log.info(host + ":" + port + "闆疯揪TCP鏈嶅姟绔繛鎺ユ垚鍔�");
+ log.debug("闆疯揪銆�" + host + ":" + port + "銆戣繛鎺ユ垚鍔�");
// 杩炴帴鎴愬姛淇℃伅浠嶴et鎷旈櫎
falseConnectSet.remove(ardEquipRadar);
// 杩炴帴鎴愬姛淇℃伅鍐欏叆map
tureConnectMap.put(futureListener.channel().id(), ardEquipRadar);
+ SuccessConnectMap.put(ardEquipRadar.getId(),futureListener.channel());
}
});
}
@@ -119,8 +125,8 @@
/**
* 鍒濆鍖栨柟娉�
*/
- @PostConstruct
- public void initialize() {
+ @Override
+ public void run(ApplicationArguments args) {
if (!tcpClientEnable) {
return;
}
@@ -129,7 +135,7 @@
for (ArdEquipRadar ardEquipRadar : ardEquipRadars) {
String host = ardEquipRadar.getIp();
Integer port = Integer.valueOf(ardEquipRadar.getPort());
- log.info("TCP瀹㈡埛绔皾璇曡繛鎺ワ細" + host + ":" + port);
+ log.debug("TCP瀹㈡埛绔皾璇曡繛鎺ワ細" + host + ":" + port);
connectServer(ardEquipRadar);//杩炴帴姣忎竴涓浄杈炬湇鍔�
}
}
--
Gitblit v1.9.3