From 2eb74912e942b6e5922defeb9931bf6c033233e7 Mon Sep 17 00:00:00 2001
From: zouyiqing <854938661@qq.com>
Date: Mon, 29 Jan 2024 10:23:45 +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

---
 .../src/main/resources/application-druid.yml    |  4 ++--
 .../java/com/ruoyi/common/utils/SocketUtil.java |  3 ++-
 .../impl/RadarRealTimeDataServiceImpl.java      | 17 ++++++-----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 2d13b8d..6d3a469 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://39.104.15.118:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: Orderfood@2022
+                password: 12345678
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketUtil.java
index b9aab00..913f3b9 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SocketUtil.java
@@ -42,9 +42,10 @@ public class SocketUtil {
                 }
                 dataResponse.setData(decimal);
                 dataResponse.setStatus(1);
-                RadarStatusWebSocket.sendToAll(JSON.toJSONString(dataResponse));
                 return dataResponse;
             }
+            dataResponse.setStatus(1);
+            RadarStatusWebSocket.sendToAll(JSON.toJSONString(dataResponse));
         } catch (Exception e) {
             System.out.println("读取数据异常：" + radarIp);
         }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RadarRealTimeDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RadarRealTimeDataServiceImpl.java
index d4f0b45..c5a2238 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RadarRealTimeDataServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RadarRealTimeDataServiceImpl.java
@@ -38,7 +38,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
 
     private Integer consecutiveZeros = 0;
 
-    private Map<String, List<Integer>> pulse4Number = new HashMap<>();
 
     private Map<Long,String> radarDelMap = new HashMap<>();
 
@@ -60,16 +59,8 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
 
                 CompletableFuture.runAsync(() -> {
                     while (StringUtils.equals("0",radarDelMap.get(radar.getId()))) {
-//                            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) );
                     }
                 });
             } catch (Exception e) {
@@ -82,6 +73,11 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
     private void task(SysRadar radar, Socket socket) {
 
         try {
+
+
+           Map<String, List<Integer>> pulse4Number = new HashMap<>();
+           int count = 0 ;
+           int consecutiveZeros = 0;
             long start = System.currentTimeMillis();
             List<SysDiscern> discernList = new ArrayList<>();
 
@@ -99,7 +95,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                     if (consecutiveZeros >= 10) {
                         // 10个0连续，说明该天线没有数据 从pulse4Number中删除该天线
                         pulse4Number.remove(number);
-                        // 从radarList中删除该天线
 
                         // 数据记录结束，计算最大pulse4值
                         double maxPulse4 = pulse4Values.stream().mapToDouble(Integer::doubleValue).max().orElse(0);
@@ -156,7 +151,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                 primaryRadarData.setRadarIp(radar.getRadarIp());
             }
             if (modbusResponse.getValue4() != null && modbusResponse.getValue4() != 0) {
-//                primaryRadarDataService.insertPrimaryRadarData(primaryRadarData);
+                primaryRadarDataService.insertPrimaryRadarData(primaryRadarData);
             } else {
 
             }