From 78baf3be4f153f395495961075d4c0668a9f752b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM>
Date: Mon, 26 Jan 2026 13:17:07 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E7=9C=8B=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TwoFloorAgvStatusService.java        | 54 ++++++++++---------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/service/impl/TwoFloorAgvStatusService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/service/impl/TwoFloorAgvStatusService.java
index 25f8fe4f8..9b13738a2 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/service/impl/TwoFloorAgvStatusService.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/service/impl/TwoFloorAgvStatusService.java
@@ -1,5 +1,6 @@
 package org.nl.acs.agv.service.impl;
 
+import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.agv.domain.TwoFloorAgvStatus;
 import org.nl.acs.device_driver.agv.utils.TwoAgvPhase;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * 二楼AGV状态管理服务
  * 负责管理和更新AGV状态，通过HTTP接口提供状态查询
  */
+@Slf4j
 @Service
 public class TwoFloorAgvStatusService {
 
@@ -110,31 +112,35 @@ public class TwoFloorAgvStatusService {
      * 清除AGV错误信息
      */
     public void clearAgvError(int carno) {
-        String vehicleCode = String.format("AGV%02d", carno);
-        TwoFloorAgvStatus agvStatus = agvStatusMap.get(vehicleCode);
-        if (agvStatus != null) {
-            agvStatus.setIs_error(false);
-            agvStatus.setError_code(null);
-            agvStatus.setError_message(null);
-            agvStatus.setError_action(null);
-            agvStatus.setError_mode(null);
-            // 设置错误信息
-            agvStatus.setDriver(null);
-            agvStatus.setIs_error(false);
-            agvStatus.setError_message(null);
-            agvStatus.setDevice_code(null);
-            agvStatus.setError_action(null);
-            agvStatus.setError_mode(null);
-            agvStatus.setError_move(null);
-            agvStatus.setError_error(null);
-            agvStatus.setExp_action(null);
-            agvStatus.setExp_mode(null);
-            agvStatus.setExp_move(null);
-            agvStatus.setExp_error(null);
-            if ("error".equals(agvStatus.getStatus())) {
-                agvStatus.setStatus("idle");
-                agvStatus.setStatus_text("空闲");
+        try {
+            String vehicleCode = String.format("AGV%02d", carno);
+            TwoFloorAgvStatus agvStatus = agvStatusMap.get(vehicleCode);
+            if (agvStatus != null) {
+                agvStatus.setIs_error(false);
+                agvStatus.setError_code(null);
+                agvStatus.setError_message(null);
+                agvStatus.setError_action(null);
+                agvStatus.setError_mode(null);
+                // 设置错误信息
+                agvStatus.setDriver(null);
+                agvStatus.setIs_error(false);
+                agvStatus.setError_message(null);
+                agvStatus.setDevice_code(null);
+                agvStatus.setError_action(null);
+                agvStatus.setError_mode(null);
+                agvStatus.setError_move(null);
+                agvStatus.setError_error(null);
+                agvStatus.setExp_action(null);
+                agvStatus.setExp_mode(null);
+                agvStatus.setExp_move(null);
+                agvStatus.setExp_error(null);
+                if ("error".equals(agvStatus.getStatus())) {
+                    agvStatus.setStatus("idle");
+                    agvStatus.setStatus_text("空闲");
+                }
             }
+        } catch (Exception e){
+            log.error("清空agv异常状态有异常，异常原因={}",e.getMessage());
         }
     }
 }