From d3d3857cda8b4307d8f03bf15ec9fb2c98c34b64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十二月 2024 09:58:39 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 9 +++++++--
.gitignore | 4 +++-
zy-acs-manager/src/main/resources/application.yml | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java | 3 ++-
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java | 2 +-
6 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 621e9ce..028d7dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,6 @@
LOG_PATH_IS_UNDEFINED
.DS_Store
-**/.DS_Store
\ No newline at end of file
+**/.DS_Store
+
+stock
\ No newline at end of file
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
index 405b339..ed017d2 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
@@ -151,7 +151,8 @@
int exitCode = process.waitFor();
if (exitCode != 0) {
- System.out.println("Python script exited with error code: " + exitCode);
+ log.error("Python script exited with error code: {}", exitCode);
+ log.error("python error:{}", builder.toString());
return;
}
reader.close();
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java
index 0ca23d9..1999867 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/LaneService.java
@@ -83,7 +83,7 @@
redis.setValue(RedisConstant.MAP_LANE_DATA, String.valueOf(lev), GsonUtils.toJson(this.lanes));
}
- System.out.println(GsonUtils.toJson(this.lanes));
+// System.out.println(GsonUtils.toJson(this.lanes));
}
private void initLaneData() {
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 d047a74..1f21be5 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
@@ -37,7 +37,7 @@
private int[][] mapMatrix;
- public static final Boolean CACHE_TURN_MATRIX = Boolean.FALSE;
+ public static final Boolean CACHE_TURN_MATRIX = Boolean.TRUE;
private int[][] turnMatrix;
@@ -231,6 +231,7 @@
}
public String[][] initWaveMatrix(Integer lev) {
+ log.info("There is initializing Wave Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -250,6 +251,7 @@
}
public synchronized DynamicNode[][] initDynamicMatrix(Integer lev) {
+ log.info("There is initializing Dynamic Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -269,6 +271,7 @@
}
public synchronized String[][] initCdaMatrix(Integer lev) {
+ log.info("There is initializing Cda Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -297,6 +300,7 @@
}
public synchronized int[][] initTurnMatrix(Integer lev) {
+ log.info("There is initializing Turn Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -345,6 +349,7 @@
public synchronized int[][] initMapMatrix(Integer lev) {
+ log.info("There is initializing Map Matrix......");
lev = Optional.ofNullable(lev).orElse(MAP_DEFAULT_LEV);
String[][] codeMatrix = getCodeMatrix(lev);
@@ -366,7 +371,7 @@
}
public synchronized String[][] initCodeMatrix(Integer lev) {
- log.info("銆怉STAR銆戞鍦ㄨ绠楃煩闃垫暟鎹�......");
+ log.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)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
index 5eeab25..dab90d9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java
@@ -60,7 +60,7 @@
* 4.AgvServiceImpl.judgeOnline
* 5.
*/
- @Scheduled(cron = "0/1 * * * * ? ")
+// @Scheduled(cron = "0/1 * * * * ? ")
public void process() {
Boolean fakeSign = configService.getVal("fakeSign", Boolean.class);
if (null == fakeSign || !fakeSign) {
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index 240bdfe..b360fb9 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -91,7 +91,7 @@
logging:
file:
- path: /stock/out/rcs-manager/logs
+ path: stock/out/rcs-manager/logs
config:
open-office-home: C
--
Gitblit v1.9.1