From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
index 1c9c942..a3fab57 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java
@@ -19,6 +19,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.zy.acs.common.utils.News;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -135,7 +136,7 @@
                 }
                 break;
             default:
-                log.warn("AGV {}: 鏈煡闃舵: {}", agvNo, jobType);
+                News.warn("AGV {}: 鏈煡闃舵: {}", agvNo, jobType);
                 break;
         }
         if (Cools.isEmpty(destinationCodeData)) {
@@ -143,7 +144,7 @@
         }
 
         if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
-            log.info( "{}寮�濮嬩綔涓氭紨绀�...", agvNo);
+            News.info( "{}寮�濮嬩綔涓氭紨绀�...", agvNo);
 
             CoreCache.AGV_MOCK_STEP_CACHE.put(agvId, CodeStepDto.build(destinationCodeData, jobType));
         }
@@ -183,6 +184,7 @@
     }
 
     private void patrolOfMove(String agvNo) {
+        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
         Long agvId = agvService.getAgvId(agvNo);
         if (0 < travelService.count(new LambdaQueryWrapper<Travel>()
                 .eq(Travel::getAgvId, agvId)
@@ -198,7 +200,7 @@
             return;
         }
         if (mainLockWrapService.buildMinorTask(agvId, TaskTypeType.MOVE, destinationCodeData, null)) {
-            log.info( "{}寮�濮嬭蛋琛屾紨绀�...", agvNo);
+            News.info( "AGV[{}] 寮�鍚嚜鍔ㄥ贰閫�...", agvNo);
         }
     }
 
@@ -265,14 +267,14 @@
                 executePatrolLogic(agvNo);
 //                executeUShapeConveyor(agvNo);
             } catch (Exception e) {
-                log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�", agvNo, e);
+                News.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�", agvNo, e);
             }
         };
 
         ScheduledFuture<?> scheduledFuture = scheduler.scheduleAtFixedRate(patrolTask, 0, SCHEDULE_TIME_INTERVAL, TimeUnit.MILLISECONDS);
 
         AGV_PATROL_MAP.put(agvNo, scheduledFuture);
-        log.info("宸插惎鍔ˋGV{}鐨勮窇搴撲换鍔°��", agvNo);
+        News.info("宸插惎鍔ˋGV{}鐨勮窇搴撲换鍔°��", agvNo);
         return R.ok();
     }
 
@@ -290,10 +292,10 @@
             CoreCache.AGV_BACKPACK_USED_CACHE.remove(agvId);
             CoreCache.AGV_MOCK_STEP_CACHE.remove(agvId);
             CoreCache.AGV_MOCK_JOB_CACHE.remove(agvNo);
-            log.info("宸插仠姝GV {} 鐨勮窇搴撲换鍔°��", agvNo);
+            News.info("宸插仠姝GV {} 鐨勮窇搴撲换鍔°��", agvNo);
             return R.ok("宸插仠姝GV " + agvNo + " 鐨勮窇搴撲换鍔°��");
         } else {
-            log.error("鏈兘鎴愬姛鍋滄AGV " + agvNo + " 鐨勮窇搴撲换鍔°��");
+            News.error("鏈兘鎴愬姛鍋滄AGV " + agvNo + " 鐨勮窇搴撲换鍔°��");
             return R.error("鏈兘鎴愬姛鍋滄AGV " + agvNo + " 鐨勮窇搴撲换鍔°��");
         }
     }
@@ -309,4 +311,4 @@
         }
     }
 
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1