From fd5f1d86f334e814ccb8c2d679373fa7e373cb5e Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 04 Mar 2025 15:05:21 +0800
Subject: [PATCH] 优化

---
 ard-work/src/main/java/com/ard/tianyu/netty/TyNettyTcpClient.java |   56 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/tianyu/netty/TyNettyTcpClient.java b/ard-work/src/main/java/com/ard/tianyu/netty/TyNettyTcpClient.java
index 02f2fa7..85b6b8c 100644
--- a/ard-work/src/main/java/com/ard/tianyu/netty/TyNettyTcpClient.java
+++ b/ard-work/src/main/java/com/ard/tianyu/netty/TyNettyTcpClient.java
@@ -1,5 +1,7 @@
 package com.ard.tianyu.netty;
 
+import com.ard.tianyu.config.TyConfiguration;
+import com.ard.tianyu.domain.cache.TyTcpServerCache;
 import com.ard.tianyu.netty.handler.ClientHandler;
 import com.ard.tianyu.netty.handler.MessageProtocolDecoder;
 import com.ard.tianyu.netty.handler.MessageProtocolEncoder;
@@ -11,11 +13,9 @@
 import io.netty.handler.timeout.IdleStateHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import java.net.InetSocketAddress;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -28,17 +28,16 @@
     EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
 
     @Resource
+    private TyConfiguration tyConfiguration;
+    @Resource
     ClientHandler clientHandler;
 
     /**
      * 初始化Bootstrap
      */
-    public Bootstrap getBootstrap(EventLoopGroup group) {
-        if (null == group) {
-            group = eventLoopGroup;
-        }
+    private Bootstrap getBootstrap() {
         Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(group)
+        bootstrap.group(eventLoopGroup)
                 .channel(NioSocketChannel.class)
                 .option(ChannelOption.TCP_NODELAY, true)
                 .option(ChannelOption.SO_KEEPALIVE, true)
@@ -55,46 +54,49 @@
         return bootstrap;
     }
 
-    //   获取所有连接
-    public void initAllChannel(List<Map<String, Object>> portHosts) {
-        for (Map<String, Object> map : portHosts) {
-            String host = (String) map.get("IP");
-            Integer port = (Integer) map.get("PORT");
-            initOneConnection(host, port);
-        }
-    }
-
-    public void initOneConnection(String host, Integer port) {
+    /**
+     * 初始化连接
+     */
+    public void initConnection(String host, Integer port) {
 
         log.info("初始化连接天宇tcp服务器【{}:{}】", host, port);
-        //判断该账号下,是否有盒子被控制
-        //当前正在被控制的盒子
         String currentBoxSn = "";
+        //判断是否已经存在连接,如果存在则关闭之前的连接
         if (channels.containsKey(host + ":" + port)) {
             currentBoxSn = channels.get(host + ":" + port).getSubBoxSn();
-            channels.get(host + ":" + port).getFuture().channel().close();
+            channels.get(host + ":" + port).getChannelFuture().channel().close();
         }
 
         //异步连接tcp服务端
-        Bootstrap bootstrap = getBootstrap(null);
+        Bootstrap bootstrap = getBootstrap();
         ChannelFuture future = bootstrap.connect(host, port).addListener((ChannelFuture futureListener) -> {
             if (futureListener.isSuccess()) {
                 log.info("连接天宇TCP服务器成功【{}:{}】", host, port);
+                TyTcpServerCache.putTcpServerCache(host + ":" + port, true);
             } else {
                 final EventLoop eventLoop = futureListener.channel().eventLoop();
                 eventLoop.schedule(() -> {
                     log.info("连接天宇TCP服务器失败【{}:{}】,正尝试重连...", host, port);
+                    TyTcpServerCache.putTcpServerCache(host + ":" + port, false);
                     try {
-                        initOneConnection(host, port);
+                        initConnection(host, port);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-                }, 5, TimeUnit.SECONDS);
+                }, 10, TimeUnit.SECONDS);
             }
         });
+        //将连接存入集合
+        channels.put(host + ":" + port, TyBoxSession.builder().subBoxSn(currentBoxSn).channelFuture(future).isReConnect(!currentBoxSn.equals("")).build());
+    }
 
-        //判断是否有盒子被订阅
-        channels.put(host + ":" + port, TyBoxSession.builder().subBoxSn(currentBoxSn).future(future)
-                .isReConnect(!currentBoxSn.equals("")).build());
+    //创建天宇连接
+    @PostConstruct
+    public void createTyConnect() {
+        try {
+            initConnection(tyConfiguration.getTcpserver(), tyConfiguration.getTcpport());
+        } catch (Exception e) {
+            log.error("创建TCP连接异常:{}", e.getMessage());
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3