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/astart/MapDataDispatcher.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
index 5bcba6d..c0bf873 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
@@ -18,6 +18,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 java.util.*;
@@ -229,7 +230,7 @@
}
public synchronized DynamicNode[][] initDynamicMatrix(Integer lev) {
- log.info("There is initializing Dynamic Matrix......");
+ News.info("There is initializing Dynamic Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -252,7 +253,7 @@
}
public synchronized String[][] initCdaMatrix(Integer lev) {
- log.info("There is initializing Cda Matrix......");
+ News.info("There is initializing Cda Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
if (Cools.isEmpty(xIdxList, yIdxList)) {
@@ -288,7 +289,7 @@
}
public synchronized int[][] initTurnMatrix(Integer lev) {
- log.info("There is initializing Turn Matrix......");
+ News.info("There is initializing Turn Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -337,7 +338,7 @@
public synchronized int[][] initMapMatrix(Integer lev) {
- log.info("There is initializing Map Matrix......");
+ News.info("There is initializing Map Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -370,7 +371,7 @@
}
public synchronized void initRouteMap(Integer lev) {
- log.info("There is initializing Route Map......");
+ News.info("There is initializing Route Map......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
Set<String> routeKeys = redis.getMapKeys(RedisConstant.AGV_MAP_ROUTE_HASH_FLAG);
Set<String> routeCdaKeys = redis.getMapKeys(RedisConstant.AGV_MAP_ROUTE_CDA_HASH_FLAG);
@@ -404,7 +405,7 @@
}
public synchronized String[][] initCodeMatrix(Integer lev) {
- log.info("There is initializing Code Matrix......");
+ News.info("There is initializing Code Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>()
.eq(Code::getStatus, 1)
@@ -574,4 +575,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1