wyh
/
dianci
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

detached2
王宇航 2024-02-21 17:31:53 +08:00
parent ad8f487866
commit 90926b5651
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RadarRealTimeDataServiceImpl.java
View File

@ -128,14 +128,14 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
// 连续2秒没读到数据，结束 // 连续2秒没读到数据，结束
if (current - noDataStart >= 2000) { if (current - noDataStart >= 2000) {
// todo:存数据 // todo:存数据
if (CollectionUtils.isNotEmpty(map.get(getMapKey(radar)))) { if (CollectionUtils.isNotEmpty(map.get(getMapKey(radar,data.getData().get(11))))) {
if (readCount > 1) { if (readCount > 1) {
saveData(radar, map, readCount, timeMap.get("noDataStart"), current); saveData(radar, map, readCount, timeMap.get("noDataStart"), current);
timeMap.put("noDataStart", System.currentTimeMillis()); timeMap.put("noDataStart", System.currentTimeMillis());
readCount = 1; readCount = 1;
} }
} }
map.remove(getMapKey(radar)); map.remove(getMapKey(radar,data.getData().get(11)));
noDataStart = current; noDataStart = current;
} }
continue; continue;
@ -154,7 +154,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
primaryRadarData.setRadarId(data.getData().get(0)); primaryRadarData.setRadarId(data.getData().get(0));
primaryRadarData.setRadarLocation(radar.getRadarLocation()); primaryRadarData.setRadarLocation(radar.getRadarLocation());
List<PrimaryRadarData> dataList = map.get(getMapKey(radar)); List<PrimaryRadarData> dataList = map.get(getMapKey(radar, modbusResponse.getNumber()));
//判断读取数据中是否携带标签 //判断读取数据中是否携带标签
if (!"0".equals(modbusResponse.getTagId())) { if (!"0".equals(modbusResponse.getTagId())) {
consecutiveZeros = 0; consecutiveZeros = 0;
@ -170,7 +170,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
if (CollectionUtils.isEmpty(dataList)) { if (CollectionUtils.isEmpty(dataList)) {
dataList = new ArrayList<>(); dataList = new ArrayList<>();
dataList.add(primaryRadarData); dataList.add(primaryRadarData);
map.put(getMapKey(radar), dataList); map.put(getMapKey(radar,modbusResponse.getNumber()), dataList);
} }
// if (StringUtils.equals(modbusResponse.getTagId(), dataList.get(dataList.size() - 1).getTagId()) && Objects.equals(primaryRadarData.getRadarId(), dataList.get(dataList.size() - 1).getRadarId()) && Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())) { // if (StringUtils.equals(modbusResponse.getTagId(), dataList.get(dataList.size() - 1).getTagId()) && Objects.equals(primaryRadarData.getRadarId(), dataList.get(dataList.size() - 1).getRadarId()) && Objects.equals(primaryRadarData.getRadarIp(), dataList.get(dataList.size() - 1).getRadarIp())) {
// if (current - start >= 20000) { // if (current - start >= 20000) {
@ -201,7 +201,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis); saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis);
dataList.clear(); dataList.clear();
timeMap.put("noDataStart", System.currentTimeMillis()); timeMap.put("noDataStart", System.currentTimeMillis());
map.remove(getMapKey(radar)); map.remove(getMapKey(radar,modbusResponse.getNumber()));
dataList.add(primaryRadarData); dataList.add(primaryRadarData);
readCount = 1; readCount = 1;
} }
@ -221,7 +221,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis); saveData(radar, map, readCount, timeMap.get("noDataStart"), currentTimeMillis);
dataList.clear(); dataList.clear();
timeMap.put("noDataStart", System.currentTimeMillis()); timeMap.put("noDataStart", System.currentTimeMillis());
map.remove(getMapKey(radar)); map.remove(getMapKey(radar,modbusResponse.getNumber()));
dataList.add(primaryRadarData); dataList.add(primaryRadarData);
readCount = 1; readCount = 1;
} }
@ -236,7 +236,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
saveData(radar, map, readCount, data.getTime(), end); saveData(radar, map, readCount, data.getTime(), end);
dataList.clear(); dataList.clear();
timeMap.put("noDataStart", System.currentTimeMillis()); timeMap.put("noDataStart", System.currentTimeMillis());
map.remove(getMapKey(radar)); map.remove(getMapKey(radar,modbusResponse.getNumber()));
dataList.add(primaryRadarData); dataList.add(primaryRadarData);
readCount = 1; readCount = 1;
} }
@ -252,7 +252,7 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
// System.out.println("连续10次读取标签号为0：开始存储........" + radar + map + readCount + "开始时间为：" + timeMap.get("zero") + "结束时间为：" + noDataStart); // 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);
readCount = 1; readCount = 1;
map.remove(getMapKey(radar)); map.remove(getMapKey(radar,modbusResponse.getNumber()));
timeMap.put("noDataStart", System.currentTimeMillis()); timeMap.put("noDataStart", System.currentTimeMillis());
dataList.clear(); dataList.clear();
consecutiveZeros = 0; consecutiveZeros = 0;
@ -312,8 +312,8 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I
} }
private String getMapKey(SysRadar radar) { private String getMapKey(SysRadar radar,Integer number) {
return radar.getRadarIp() + "-" + radar.getRadarNum() + "-" + radar.getId(); return radar.getRadarIp() + "-" + number + "-" + radar.getId();
} }
@Override @Override