From 1ff58c939e9371becb3e45a83642afb710e0078a Mon Sep 17 00:00:00 2001
From: zouyiqing <854938661@qq.com>
Date: Tue, 9 Jan 2024 10:30:52 +0800
Subject: [PATCH] =?UTF-8?q?win=E4=BB=A3=E7=A0=81=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/RadarStatusController.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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();
                 }
                 }
             };