From 06dbac737b78fbd6bdafaa222fdb1327314094eb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 02 三月 2024 16:51:46 +0800
Subject: [PATCH] 修复监控雷达连接状态定时任务报错问题

---
 src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java b/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
index e66e3e8..6961415 100644
--- a/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
+++ b/src/main/java/com/ard/utils/netty/tcp/ClientInitialize.java
@@ -139,17 +139,14 @@
     public void monitorConnectStatus() {
         log.debug("瀹氭椂鐩戞祴闆疯揪杩炴帴鐘舵��");
         List<ArdEquipRadar> ardEquipRadars = ardEquipRadarService.selectArdEquipRadarList(new ArdEquipRadar());
-        ardEquipRadars.stream().forEach(ardEquipRadar ->{
-            if(trueConnectMap.contains(ardEquipRadar.getIp()+"_"+ardEquipRadar.getPort()))
-            {
-                if(!ardEquipRadar.getState().equals("1")) {
+        ardEquipRadars.stream().forEach(ardEquipRadar -> {
+            if (trueConnectMap.contains(ardEquipRadar.getIp() + "_" + ardEquipRadar.getPort())) {
+                if (ardEquipRadar.getState() != null && !ardEquipRadar.getState().equals("1")) {
                     ardEquipRadar.setState("1");
                     ardEquipRadarService.updateArdEquipRadar(ardEquipRadar);
                 }
-            }
-            else
-            {
-                if(!ardEquipRadar.getState().equals("0")) {
+            } else {
+                if (ardEquipRadar.getState() == null || (ardEquipRadar.getState() != null && !ardEquipRadar.getState().equals("0"))) {
                     ardEquipRadar.setState("0");
                     ardEquipRadarService.updateArdEquipRadar(ardEquipRadar);
                 }

--
Gitblit v1.9.3