From 9f26dbb992e53d27e499e1ff8f08bde8640076f8 Mon Sep 17 00:00:00 2001
From: zouyiqing <854938661@qq.com>
Date: Sun, 28 Jan 2024 16:59:44 +0800
Subject: [PATCH] =?UTF-8?q?win=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/RadarStatusController.java         | 20 ++++++++++++++++---
 .../controller/system/SysRadarController.java |  2 +-
 .../src/main/resources/application-druid.yml  |  4 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java
index 0ed393a..6287b86 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java
@@ -29,6 +29,7 @@ import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 /**
@@ -171,13 +172,23 @@ public class RadarStatusController implements InitializingBean {
                     @Override
                     public void run() {
                         while (true) {
+//                            long start = System.currentTimeMillis();
                             task(radar, socket);
+
+                            System.out.println("雷达ip ： =====" + radar.getRadarIp());
+                            try {
+                                Thread.sleep(3000);
+                            } catch (InterruptedException e) {
+                                throw new RuntimeException(e);
+                            }
+//                            System.out.println("耗时时间： " + (System.currentTimeMillis() - start) );
                         }
                     }
 
                 };
-//                timer.schedule(timerTask,0);
-                timerTask.run();
+                CompletableFuture.runAsync(() -> {
+                    timerTask.run();
+                });
             } catch (Exception e) {
 
                 e.printStackTrace();
@@ -186,8 +197,11 @@ public class RadarStatusController implements InitializingBean {
     }
 
     private void task(SysRadar radar, Socket socket) {
+
         try {
+            long start = System.currentTimeMillis();
             List<SysDiscern> discernList = new ArrayList<>();
+
             // socket连接成功返回数据
             DataResponse data = SocketUtil.getData(socket, radar.getRadarLocation(), radar.getRadarIp());
             // 天线号字符串转集合
@@ -263,7 +277,7 @@ public class RadarStatusController implements InitializingBean {
             } else {
 
             }
-
+            System.out.println("耗时时间： " + (System.currentTimeMillis() - start) );
         } catch (Exception e) {
         }
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRadarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRadarController.java
index 9e8fcbb..0ee73da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRadarController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRadarController.java
@@ -74,7 +74,7 @@ public class SysRadarController extends BaseController {
         radar.setCreateBy(getLoginName());
         int result = radarService.insertRadar(radar);
         List<SysRadar> sysRadars = radarService.selectRadarList(new SysRadar());
-        RadarStatusController.addRadar(sysRadars);
+
         return toAjax(result);
     }
 
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 6d3a469..2d13b8d 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://39.104.15.118:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 12345678
+                password: Orderfood@2022
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭