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 43f4746..05f30c3 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 @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysRadar; import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableSupport; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.bean.ModbusResponse; import com.ruoyi.common.utils.modbus.ModbusUtils; @@ -84,19 +85,25 @@ public class RadarStatusController ModbusResponse modbusResponse = ModbusUtils.holdingRegister(); System.out.println(modbusResponse); String tag = modbusResponse.getTagId(); - SysIdentifier sysIdentifier = identifierService.selectIdentifierByTag(tag); PrimaryRadarData primaryRadarData = new PrimaryRadarData(); + if (!"0".equals(modbusResponse.getTagId())) { + SysIdentifier sysIdentifier = identifierService.selectIdentifierByTag(tag); + primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber()); + } BeanUtils.copyProperties(modbusResponse,primaryRadarData); primaryRadarData.setRadarLocation(radar.getRadarLocation()); primaryRadarData.setRadarIp(radar.getRadarIp()); - primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber()); - primaryRadarDataService.insertPrimaryRadarData(primaryRadarData); + + if (modbusResponse.getValue4()!=null && !"0".equals(modbusResponse.getValue4())) { + primaryRadarDataService.insertPrimaryRadarData(primaryRadarData); + } RadarStatusWebSocket.sendToAll(modbusResponse.toString()); } } catch (Exception e) { if (e.equals("java.net.SocketTimeoutException: connect timed out")) { System.err.println("从串口读取失败:" + "连接超时"); } + e.printStackTrace(); } } };