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 f551e4a..9bc8078 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 @@ -77,46 +77,26 @@ public class RadarStatusController Timer timer = new Timer(); TimerTask task = new TimerTask() { @Override - public void run() {try { + public void run() { + try { for (SysRadar radar : radarList) { - ModbusResponse modbusResponse = new ModbusResponse(); ModbusMaster master = ModbusUtils.getSlave(radar.getRadarIp(), 23); System.out.println(radar.getRadarIp()); - try { + modbusResponse = ModbusUtils.holdingRegister(); System.out.println(modbusResponse); - } catch (ModbusTransportException e) { - throw new RuntimeException(e); - } catch (ErrorResponseException e) { - throw new RuntimeException(e); - } } - } catch (Exception e) { System.err.println("从串口读取失败:" + e.getMessage()); } } }; - timer.scheduleAtFixedRate(task, 1, 40); + timer.scheduleAtFixedRate(task, 1, 20); return responses; }); -// try { -// Thread.sleep(1000); // 睡眠1秒钟 -// } catch (InterruptedException e) { -// e.printStackTrace(); -// } -// listCompletableFuture.thenAccept(modbusResponses -> { -// for (ModbusResponse modbusResponse : modbusResponses) { -// System.out.println(modbusResponse); -// -// PrimaryRadarData primaryRadarData = new PrimaryRadarData(); -// BeanUtils.copyProperties(modbusResponse, primaryRadarData); -// primaryRadarDataService.insertPrimaryRadarData(primaryRadarData); -// } -// }); PageDomain pageDomain = TableSupport.buildPageRequest(); if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) {