From 63b435a23e412404ac115ba79a54554387b41e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com>
Date: Wed, 21 Feb 2024 17:36:42 +0800
Subject: [PATCH] 111

---
 .../service/impl/RadarRealTimeDataServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 9c7a1dc..c72137d 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
@@ -130,7 +130,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                         // todo:存数据
                         if (CollectionUtils.isNotEmpty(map.get(getMapKey(radar,data.getData().get(11))))) {
                             if (readCount > 1) {
-                                saveData(radar, map, readCount, timeMap.get("noDataStart"), current);
+                                saveData(radar, map, readCount, timeMap.get("noDataStart"), current , data.getData().get(11));
                                 timeMap.put("noDataStart", System.currentTimeMillis());
                                 readCount = 1;
                             }
@@ -198,7 +198,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                                         + "此次雷达ip为：====" + primaryRadarData.getRadarIp() + "上次雷达ip为 =====" + dataList.get(dataList.size() - 1).getRadarIp()
                                         + "此次雷达标签号为：====" + modbusResponse.getTagId() + "此次雷达标签号为：====" + dataList.get(dataList.size() - 1).getTagId()
                                         + data.getTime() + "结束时间为：" + currentTimeMillis);
-                                saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis);
+                                saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis, modbusResponse.getNumber());
                                 dataList.clear();
                                 timeMap.put("noDataStart", System.currentTimeMillis());
                                 map.remove(getMapKey(radar,modbusResponse.getNumber()));
@@ -218,7 +218,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                                         + "此次雷达ip为：====" + primaryRadarData.getRadarIp() + "上次雷达ip为 =====" + dataList.get(dataList.size() - 1).getRadarIp()
                                         + "此次雷达标签号为：====" + modbusResponse.getTagId() + "此次雷达标签号为：====" + dataList.get(dataList.size() - 1).getTagId()
                                         + data.getTime() + "结束时间为：" + currentTimeMillis);
-                                saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis);
+                                saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis , modbusResponse.getNumber());
                                 dataList.clear();
                                 timeMap.put("noDataStart", System.currentTimeMillis());
                                 map.remove(getMapKey(radar,modbusResponse.getNumber()));
@@ -233,7 +233,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                             Long dataStart = timeMap.get("noDataStart");
 
                             System.out.println("突然读到另一个雷达id： " + "开始存储........" + "开始时间为：" + dataStart + "结束时间为：" + end);
-                            saveData(radar, map, readCount, data.getTime(), end);
+                            saveData(radar, map, readCount, data.getTime(), end , modbusResponse.getNumber());
                             dataList.clear();
                             timeMap.put("noDataStart", System.currentTimeMillis());
                             map.remove(getMapKey(radar,modbusResponse.getNumber()));
@@ -250,7 +250,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
                         // todo：存数据
 
 //                        System.out.println("连续10次读取标签号为0：开始存储........" + radar + map + readCount + "开始时间为：" + timeMap.get("zero") + "结束时间为：" + noDataStart);
-                       saveData(radar, map, readCount, timeMap.get("zero"), noDataStart);
+                       saveData(radar, map, readCount, timeMap.get("zero"), noDataStart , modbusResponse.getNumber());
                         readCount = 1;
                         map.remove(getMapKey(radar,modbusResponse.getNumber()));
                         timeMap.put("noDataStart", System.currentTimeMillis());
@@ -271,7 +271,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
         }
     }
 
-    private void saveData(SysRadar radar, Map<String, List<PrimaryRadarData>> map, int count, long noStartTime, long endTime) {
+    private void saveData(SysRadar radar, Map<String, List<PrimaryRadarData>> map, int count, long noStartTime, long endTime , Integer number) {
         Date start = new Date(noStartTime);
         Date end = new Date(endTime);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -279,7 +279,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
         String sqlEnd = sdf.format(end);
         try {
 
-            List<PrimaryRadarData> primaryRadarDataList = map.get(getMapKey(radar));
+            List<PrimaryRadarData> primaryRadarDataList = map.get(getMapKey(radar,number));
             if (CollectionUtils.isNotEmpty(primaryRadarDataList)) {
                 PrimaryRadarData maxData = primaryRadarDataList.stream().max(Comparator.comparingInt(PrimaryRadarData::getValue4)).get();