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 2146fe7..9d6470d 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 @@ -24,6 +24,8 @@ public class SocketUtil { System.out.println("雷达:" + radarIp + "===" + radarLocation + ": 连接异常:{}" + connected); dataResponse.setStatus(0); dataResponse.setData(null); + }else { + } InputStream inputStream = socket.getInputStream(); // 获取输入流 @@ -31,7 +33,7 @@ public class SocketUtil { byte[] buffer = new byte[available]; inputStream.read(buffer, 0, available); String hex = new BigInteger(1, buffer).toString(16); - dataResponse.setStatus(1); + RadarStatusWebSocket.sendToAll(JSON.toJSONString(dataResponse)); if (!"0".equals(hex)) { hex = "0" + hex; @@ -41,8 +43,8 @@ public class SocketUtil { int s = BitUtils.covert(string); decimal.add(s); } + dataResponse.setStatus(1); dataResponse.setData(decimal); - return dataResponse; } 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 e6a1e1d..3e44a1e 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 @@ -75,13 +75,9 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I private void task(SysRadar radar, Socket socket) { try { -// long start = System.currentTimeMillis(); Map> pulse4Number = new HashMap<>(); int count = 0; int consecutiveZeros = 0; -// long start = System.currentTimeMillis(); - List discernList = new ArrayList<>(); - // socket连接成功返回数据 DataResponse data = SocketUtil.getData(socket, radar.getRadarLocation(), radar.getRadarIp()); // 天线号字符串转集合 @@ -96,7 +92,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I if (consecutiveZeros >= 10) { // 10个0连续,说明该天线没有数据 从pulse4Number中删除该天线 pulse4Number.remove(number); - // 数据记录结束,计算最大pulse4值 double maxPulse4 = pulse4Values.stream().mapToDouble(Integer::doubleValue).max().orElse(0); System.out.println("天线 " + number + " 的最大pulse4值为: " + maxPulse4); @@ -110,13 +105,10 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I pulse4Values.add(data.getData().get(7)); } } - SysDiscern sysDiscern = copyDataToDiscern(data); - System.out.println(radar.getRadarIp() + ": " + data); // 雷达数据返回封装类赋值 ModbusResponse modbusResponse = getModbusResponse(data); - String tag = modbusResponse.getTagId(); // 雷达原始数据对象 PrimaryRadarData primaryRadarData = new PrimaryRadarData(); @@ -135,7 +127,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber()); primaryRadarData.setRadarLocation(radar.getRadarLocation()); primaryRadarData.setRadarIp(radar.getRadarIp()); - if (modbusResponse.getValue4() != 0) { // 给雷达识别报表赋值 sysDiscern.setType(sysIdentifier.getType()); @@ -155,8 +146,6 @@ public class RadarRealTimeDataServiceImpl implements RadarRealTimeDataService, I primaryRadarDataService.insertPrimaryRadarData(primaryRadarData); }); } -// System.out.println("耗时时间: " + (System.currentTimeMillis() - start)); - } catch (Exception e) { } }