From 412a3546ab66f1db915fe2a8566896003f86aad5 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 24 三月 2025 10:41:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java | 133 +++------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvGroupConstant.java | 72 +++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java | 4
zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java | 263 --------------------------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PatrolService.java | 2
5 files changed, 106 insertions(+), 368 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java
index bb6fdd6..ef1c926 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvAreaDispatcher.java
@@ -23,112 +23,39 @@
}
public void initEnableArea() {
- AGV_AREA.put("1", FAR_LEFT_AREA);
- AGV_AREA.put("102", FAR_LEFT_AREA);
- AGV_AREA.put("3", FAR_LEFT_AREA);
- AGV_AREA.put("4", FAR_LEFT_AREA);
- AGV_AREA.put("5", FAR_LEFT_AREA);
- AGV_AREA.put("6", FAR_LEFT_AREA);
- AGV_AREA.put("7", FAR_LEFT_AREA);
- AGV_AREA.put("8", FAR_LEFT_AREA);
- AGV_AREA.put("9", FAR_LEFT_AREA);
- AGV_AREA.put("10", FAR_LEFT_AREA);
- AGV_AREA.put("11", LEFT_AREA);
- AGV_AREA.put("12", LEFT_AREA);
- AGV_AREA.put("13", LEFT_AREA);
- AGV_AREA.put("14", LEFT_AREA);
- AGV_AREA.put("15", LEFT_AREA);
- AGV_AREA.put("16", LEFT_AREA);
- AGV_AREA.put("17", LEFT_AREA);
- AGV_AREA.put("18", LEFT_AREA);
- AGV_AREA.put("19", LEFT_AREA);
- AGV_AREA.put("20", LEFT_AREA);
- AGV_AREA.put("21", MIDDLE_AREA);
- AGV_AREA.put("22", MIDDLE_AREA);
- AGV_AREA.put("23", MIDDLE_AREA);
- AGV_AREA.put("24", MIDDLE_AREA);
- AGV_AREA.put("25", MIDDLE_AREA);
- AGV_AREA.put("26", MIDDLE_AREA);
- AGV_AREA.put("27", MIDDLE_AREA);
- AGV_AREA.put("28", MIDDLE_AREA);
- AGV_AREA.put("29", MIDDLE_AREA);
- AGV_AREA.put("30", MIDDLE_AREA);
- AGV_AREA.put("31", RIGHT_AREA);
- AGV_AREA.put("32", RIGHT_AREA);
- AGV_AREA.put("33", RIGHT_AREA);
- AGV_AREA.put("34", RIGHT_AREA);
- AGV_AREA.put("35", RIGHT_AREA);
- AGV_AREA.put("36", RIGHT_AREA);
- AGV_AREA.put("37", RIGHT_AREA);
- AGV_AREA.put("38", RIGHT_AREA);
- AGV_AREA.put("39", RIGHT_AREA);
- AGV_AREA.put("40", RIGHT_AREA);
- AGV_AREA.put("41", FAR_RIGHT_AREA);
- AGV_AREA.put("42", FAR_RIGHT_AREA);
- AGV_AREA.put("43", FAR_RIGHT_AREA);
- AGV_AREA.put("44", FAR_RIGHT_AREA);
- AGV_AREA.put("45", FAR_RIGHT_AREA);
- AGV_AREA.put("46", FAR_RIGHT_AREA);
- AGV_AREA.put("47", FAR_RIGHT_AREA);
- AGV_AREA.put("48", FAR_RIGHT_AREA);
- AGV_AREA.put("49", FAR_RIGHT_AREA);
- AGV_AREA.put("50", FAR_RIGHT_AREA);
+ for (String agv : AgvGroupConstant.FIRST_AGV_GROUP) {
+ AGV_AREA.put(agv, FAR_LEFT_AREA);
+ }
+ for (String agv : AgvGroupConstant.SECOND_AGV_GROUP) {
+ AGV_AREA.put(agv, LEFT_AREA);
+ }
+ for (String agv : AgvGroupConstant.THIRD_AGV_GROUP) {
+ AGV_AREA.put(agv, MIDDLE_AREA);
+ }
+ for (String agv : AgvGroupConstant.FOURTH_AGV_GROUP) {
+ AGV_AREA.put(agv, RIGHT_AREA);
+ }
+ for (String agv : AgvGroupConstant.FIFTH_AGV_GROUP) {
+ AGV_AREA.put(agv, FAR_RIGHT_AREA);
+ }
}
public void initDisableArea() {
- AGV_DISABLE_AREA.put("1", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("102", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("3", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("4", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("5", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("6", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("7", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("8", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("9", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("10", FAR_LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("11", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("12", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("13", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("14", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("15", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("16", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("17", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("18", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("19", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("20", LEFT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("21", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("22", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("23", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("24", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("25", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("26", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("27", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("28", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("29", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("30", MIDDLE_DISABLE_AREA);
- AGV_DISABLE_AREA.put("31", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("32", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("33", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("34", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("35", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("36", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("37", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("38", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("39", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("40", RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("41", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("42", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("43", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("44", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("45", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("46", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("47", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("48", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("49", FAR_RIGHT_DISABLE_AREA);
- AGV_DISABLE_AREA.put("50", FAR_RIGHT_DISABLE_AREA);
+ for (String agv : AgvGroupConstant.FIRST_AGV_GROUP) {
+ AGV_DISABLE_AREA.put(agv, FAR_LEFT_DISABLE_AREA);
+ }
+ for (String agv : AgvGroupConstant.SECOND_AGV_GROUP) {
+ AGV_DISABLE_AREA.put(agv, LEFT_DISABLE_AREA);
+ }
+ for (String agv : AgvGroupConstant.THIRD_AGV_GROUP) {
+ AGV_DISABLE_AREA.put(agv, MIDDLE_DISABLE_AREA);
+ }
+ for (String agv : AgvGroupConstant.FOURTH_AGV_GROUP) {
+ AGV_DISABLE_AREA.put(agv, RIGHT_DISABLE_AREA);
+ }
+ for (String agv : AgvGroupConstant.FIFTH_AGV_GROUP) {
+ AGV_DISABLE_AREA.put(agv, FAR_RIGHT_DISABLE_AREA);
+ }
}
-
-
-
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvGroupConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvGroupConstant.java
new file mode 100644
index 0000000..8ab9567
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/AgvGroupConstant.java
@@ -0,0 +1,72 @@
+package com.zy.acs.manager.core.constant;
+
+import java.util.ArrayList;
+
+public class AgvGroupConstant {
+
+ public static final ArrayList<String> FIRST_AGV_GROUP = new ArrayList<String>(){{
+ add("1");
+ add("102");
+ add("3");
+ add("4");
+ add("5");
+ add("6");
+ add("7");
+ add("8");
+ add("9");
+ add("10");
+ }};
+
+ public static final ArrayList<String> SECOND_AGV_GROUP = new ArrayList<String>(){{
+ add("11");
+ add("12");
+ add("13");
+ add("14");
+ add("15");
+ add("16");
+ add("17");
+ add("18");
+ add("19");
+ add("20");
+ }};
+
+ public static final ArrayList<String> THIRD_AGV_GROUP = new ArrayList<String>(){{
+ add("21");
+ add("22");
+ add("23");
+ add("24");
+ add("25");
+ add("26");
+ add("27");
+ add("28");
+ add("29");
+ add("30");
+ }};
+
+ public static final ArrayList<String> FOURTH_AGV_GROUP = new ArrayList<String>(){{
+ add("31");
+ add("32");
+ add("33");
+ add("34");
+ add("35");
+ add("36");
+ add("37");
+ add("38");
+ add("39");
+ add("40");
+ }};
+
+ public static final ArrayList<String> FIFTH_AGV_GROUP = new ArrayList<String>(){{
+ add("41");
+ add("42");
+ add("43");
+ add("44");
+ add("45");
+ add("46");
+ add("47");
+ add("48");
+ add("49");
+ add("50");
+ }};
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java
index b16670f..8509e12 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/constant/MapDataConstant.java
@@ -19,265 +19,4 @@
public static final Integer DEADLOCK_TASK_TIMEOUT = 6 * MAX_JAM_TIMEOUT;
-}
-//
-//update man_code set corner = 1 where data = '00000001';
-//update man_code set corner = 1 where data = '00000003';
-//update man_code set corner = 1 where data = '00000005';
-//update man_code set corner = 1 where data = '00000015';
-//update man_code set corner = 1 where data = '00000025';
-//update man_code set corner = 1 where data = '00000035';
-//update man_code set corner = 1 where data = '00000042';
-//update man_code set corner = 1 where data = '00000044';
-//update man_code set corner = 1 where data = '00000046';
-//update man_code set corner = 1 where data = '00000056';
-//update man_code set corner = 1 where data = '00000066';
-//update man_code set corner = 1 where data = '00000076';
-//update man_code set corner = 1 where data = '00000083';
-//update man_code set corner = 1 where data = '00000085';
-//update man_code set corner = 1 where data = '00000087';
-//update man_code set corner = 1 where data = '00000097';
-//update man_code set corner = 1 where data = '00000107';
-//update man_code set corner = 1 where data = '00000117';
-//update man_code set corner = 1 where data = '00000126';
-//update man_code set corner = 1 where data = '00000132';
-//update man_code set corner = 1 where data = '00000135';
-//update man_code set corner = 1 where data = '00000141';
-//update man_code set corner = 1 where data = '00000148';
-//update man_code set corner = 1 where data = '00000150';
-//update man_code set corner = 1 where data = '00000152';
-//update man_code set corner = 1 where data = '00000162';
-//update man_code set corner = 1 where data = '00000172';
-//update man_code set corner = 1 where data = '00000182';
-//update man_code set corner = 1 where data = '00000189';
-//update man_code set corner = 1 where data = '00000191';
-//update man_code set corner = 1 where data = '00000193';
-//update man_code set corner = 1 where data = '00000203';
-//update man_code set corner = 1 where data = '00000213';
-//update man_code set corner = 1 where data = '00000223';
-//update man_code set corner = 1 where data = '00000230';
-//update man_code set corner = 1 where data = '00000232';
-//update man_code set corner = 1 where data = '00000234';
-//update man_code set corner = 1 where data = '00000244';
-//update man_code set corner = 1 where data = '00000254';
-//update man_code set corner = 1 where data = '00000264';
-//update man_code set corner = 1 where data = '00000271';
-//update man_code set corner = 1 where data = '00000277';
-//update man_code set corner = 1 where data = '00000280';
-//update man_code set corner = 1 where data = '00000286';
-//update man_code set corner = 1 where data = '00000292';
-//update man_code set corner = 1 where data = '00000294';
-//update man_code set corner = 1 where data = '00000296';
-//update man_code set corner = 1 where data = '00000306';
-//update man_code set corner = 1 where data = '00000316';
-//update man_code set corner = 1 where data = '00000326';
-//update man_code set corner = 1 where data = '00000332';
-//update man_code set corner = 1 where data = '00000338';
-//update man_code set corner = 1 where data = '00000347';
-//update man_code set corner = 1 where data = '00000349';
-//update man_code set corner = 1 where data = '00000351';
-//update man_code set corner = 1 where data = '00000361';
-//update man_code set corner = 1 where data = '00000371';
-//update man_code set corner = 1 where data = '00000381';
-//update man_code set corner = 1 where data = '00000387';
-//update man_code set corner = 1 where data = '00000393';
-//update man_code set corner = 1 where data = '00000402';
-//update man_code set corner = 1 where data = '00000404';
-//update man_code set corner = 1 where data = '00000406';
-//update man_code set corner = 1 where data = '00000416';
-//update man_code set corner = 1 where data = '00000426';
-//update man_code set corner = 1 where data = '00000436';
-//update man_code set corner = 1 where data = '00000442';
-//update man_code set corner = 1 where data = '00000448';
-//update man_code set corner = 1 where data = '00000459';
-//update man_code set corner = 1 where data = '00000465';
-//update man_code set corner = 1 where data = '00000468';
-//update man_code set corner = 1 where data = '00000474';
-//update man_code set corner = 1 where data = '00000478';
-//update man_code set corner = 1 where data = '00000482';
-//update man_code set corner = 1 where data = '00000491';
-//update man_code set corner = 1 where data = '00000493';
-//update man_code set corner = 1 where data = '00000495';
-//update man_code set corner = 1 where data = '00000505';
-//update man_code set corner = 1 where data = '00000515';
-//update man_code set corner = 1 where data = '00000525';
-//update man_code set corner = 1 where data = '00000531';
-//update man_code set corner = 1 where data = '00000537';
-//update man_code set corner = 1 where data = '00000546';
-//update man_code set corner = 1 where data = '00000548';
-//update man_code set corner = 1 where data = '00000550';
-//update man_code set corner = 1 where data = '00000560';
-//update man_code set corner = 1 where data = '00000570';
-//update man_code set corner = 1 where data = '00000580';
-//update man_code set corner = 1 where data = '00000586';
-//update man_code set corner = 1 where data = '00000592';
-//update man_code set corner = 1 where data = '00000601';
-//update man_code set corner = 1 where data = '00000603';
-//update man_code set corner = 1 where data = '00000605';
-//update man_code set corner = 1 where data = '00000615';
-//update man_code set corner = 1 where data = '00000625';
-//update man_code set corner = 1 where data = '00000635';
-//update man_code set corner = 1 where data = '00000641';
-//update man_code set corner = 1 where data = '00000647';
-//update man_code set corner = 1 where data = '00000656';
-//update man_code set corner = 1 where data = '00000662';
-//update man_code set corner = 1 where data = '00000665';
-//update man_code set corner = 1 where data = '00000671';
-//update man_code set corner = 1 where data = '00000675';
-//update man_code set corner = 1 where data = '00000679';
-//update man_code set corner = 1 where data = '00000687';
-//update man_code set corner = 1 where data = '00000689';
-//update man_code set corner = 1 where data = '00000691';
-//update man_code set corner = 1 where data = '00000701';
-//update man_code set corner = 1 where data = '00000711';
-//update man_code set corner = 1 where data = '00000721';
-//update man_code set corner = 1 where data = '00000727';
-//update man_code set corner = 1 where data = '00000733';
-//update man_code set corner = 1 where data = '00000742';
-//update man_code set corner = 1 where data = '00000744';
-//update man_code set corner = 1 where data = '00000746';
-//update man_code set corner = 1 where data = '00000756';
-//update man_code set corner = 1 where data = '00000766';
-//update man_code set corner = 1 where data = '00000776';
-//update man_code set corner = 1 where data = '00000782';
-//update man_code set corner = 1 where data = '00000788';
-//update man_code set corner = 1 where data = '00000797';
-//update man_code set corner = 1 where data = '00000799';
-//update man_code set corner = 1 where data = '00000801';
-//update man_code set corner = 1 where data = '00000811';
-//update man_code set corner = 1 where data = '00000821';
-//update man_code set corner = 1 where data = '00000831';
-//update man_code set corner = 1 where data = '00000837';
-//update man_code set corner = 1 where data = '00000843';
-//update man_code set corner = 1 where data = '00000854';
-//update man_code set corner = 1 where data = '00000860';
-//update man_code set corner = 1 where data = '00000863';
-//update man_code set corner = 1 where data = '00000869';
-//update man_code set corner = 1 where data = '00000873';
-//update man_code set corner = 1 where data = '00000877';
-//update man_code set corner = 1 where data = '00000886';
-//update man_code set corner = 1 where data = '00000888';
-//update man_code set corner = 1 where data = '00000890';
-//update man_code set corner = 1 where data = '00000900';
-//update man_code set corner = 1 where data = '00000910';
-//update man_code set corner = 1 where data = '00000920';
-//update man_code set corner = 1 where data = '00000926';
-//update man_code set corner = 1 where data = '00000932';
-//update man_code set corner = 1 where data = '00000941';
-//update man_code set corner = 1 where data = '00000943';
-//update man_code set corner = 1 where data = '00000945';
-//update man_code set corner = 1 where data = '00000955';
-//update man_code set corner = 1 where data = '00000965';
-//update man_code set corner = 1 where data = '00000975';
-//update man_code set corner = 1 where data = '00000981';
-//update man_code set corner = 1 where data = '00000987';
-//update man_code set corner = 1 where data = '00000996';
-//update man_code set corner = 1 where data = '00000998';
-//update man_code set corner = 1 where data = '00001000';
-//update man_code set corner = 1 where data = '00001010';
-//update man_code set corner = 1 where data = '00001020';
-//update man_code set corner = 1 where data = '00001030';
-//update man_code set corner = 1 where data = '00001036';
-//update man_code set corner = 1 where data = '00001042';
-//update man_code set corner = 1 where data = '00001051';
-//update man_code set corner = 1 where data = '00001057';
-//update man_code set corner = 1 where data = '00001060';
-//update man_code set corner = 1 where data = '00001066';
-//update man_code set corner = 1 where data = '00001070';
-//update man_code set corner = 1 where data = '00001074';
-//update man_code set corner = 1 where data = '00001082';
-//update man_code set corner = 1 where data = '00001084';
-//update man_code set corner = 1 where data = '00001086';
-//update man_code set corner = 1 where data = '00001096';
-//update man_code set corner = 1 where data = '00001106';
-//update man_code set corner = 1 where data = '00001116';
-//update man_code set corner = 1 where data = '00001122';
-//update man_code set corner = 1 where data = '00001128';
-//update man_code set corner = 1 where data = '00001137';
-//update man_code set corner = 1 where data = '00001139';
-//update man_code set corner = 1 where data = '00001141';
-//update man_code set corner = 1 where data = '00001151';
-//update man_code set corner = 1 where data = '00001161';
-//update man_code set corner = 1 where data = '00001171';
-//update man_code set corner = 1 where data = '00001177';
-//update man_code set corner = 1 where data = '00001183';
-//update man_code set corner = 1 where data = '00001192';
-//update man_code set corner = 1 where data = '00001194';
-//update man_code set corner = 1 where data = '00001196';
-//update man_code set corner = 1 where data = '00001206';
-//update man_code set corner = 1 where data = '00001216';
-//update man_code set corner = 1 where data = '00001226';
-//update man_code set corner = 1 where data = '00001232';
-//update man_code set corner = 1 where data = '00001238';
-//update man_code set corner = 1 where data = '00001249';
-//update man_code set corner = 1 where data = '00001255';
-//update man_code set corner = 1 where data = '00001258';
-//update man_code set corner = 1 where data = '00001264';
-//update man_code set corner = 1 where data = '00001268';
-//update man_code set corner = 1 where data = '00001272';
-//update man_code set corner = 1 where data = '00001281';
-//update man_code set corner = 1 where data = '00001283';
-//update man_code set corner = 1 where data = '00001285';
-//update man_code set corner = 1 where data = '00001295';
-//update man_code set corner = 1 where data = '00001305';
-//update man_code set corner = 1 where data = '00001315';
-//update man_code set corner = 1 where data = '00001321';
-//update man_code set corner = 1 where data = '00001327';
-//update man_code set corner = 1 where data = '00001336';
-//update man_code set corner = 1 where data = '00001338';
-//update man_code set corner = 1 where data = '00001340';
-//update man_code set corner = 1 where data = '00001350';
-//update man_code set corner = 1 where data = '00001360';
-//update man_code set corner = 1 where data = '00001370';
-//update man_code set corner = 1 where data = '00001376';
-//update man_code set corner = 1 where data = '00001382';
-//update man_code set corner = 1 where data = '00001391';
-//update man_code set corner = 1 where data = '00001393';
-//update man_code set corner = 1 where data = '00001395';
-//update man_code set corner = 1 where data = '00001405';
-//update man_code set corner = 1 where data = '00001415';
-//update man_code set corner = 1 where data = '00001425';
-//update man_code set corner = 1 where data = '00001431';
-//update man_code set corner = 1 where data = '00001437';
-//update man_code set corner = 1 where data = '00001444';
-//update man_code set corner = 1 where data = '00001450';
-//update man_code set corner = 1 where data = '00001453';
-//update man_code set corner = 1 where data = '00001459';
-//update man_code set corner = 1 where data = '00001465';
-//update man_code set corner = 1 where data = '00001467';
-//update man_code set corner = 1 where data = '00001469';
-//update man_code set corner = 1 where data = '00001479';
-//update man_code set corner = 1 where data = '00001489';
-//update man_code set corner = 1 where data = '00001499';
-//update man_code set corner = 1 where data = '00001506';
-//update man_code set corner = 1 where data = '00001508';
-//update man_code set corner = 1 where data = '00001510';
-//update man_code set corner = 1 where data = '00001520';
-//update man_code set corner = 1 where data = '00001530';
-//update man_code set corner = 1 where data = '00001540';
-//update man_code set corner = 1 where data = '00001547';
-//update man_code set corner = 1 where data = '00001549';
-//update man_code set corner = 1 where data = '00001551';
-//update man_code set corner = 1 where data = '00001561';
-//update man_code set corner = 1 where data = '00001571';
-//update man_code set corner = 1 where data = '00001581';
-//update man_code set corner = 1 where data = '00001590';
-//update man_code set corner = 1 where data = '00001596';
-//update man_code set corner = 1 where data = '00001599';
-//update man_code set corner = 1 where data = '00001605';
-//update man_code set corner = 1 where data = '00001612';
-//update man_code set corner = 1 where data = '00001614';
-//update man_code set corner = 1 where data = '00001616';
-//update man_code set corner = 1 where data = '00001626';
-//update man_code set corner = 1 where data = '00001636';
-//update man_code set corner = 1 where data = '00001646';
-//update man_code set corner = 1 where data = '00001653';
-//update man_code set corner = 1 where data = '00001655';
-//update man_code set corner = 1 where data = '00001657';
-//update man_code set corner = 1 where data = '00001667';
-//update man_code set corner = 1 where data = '00001677';
-//update man_code set corner = 1 where data = '00001687';
-//update man_code set corner = 1 where data = '00001692';
-//update man_code set corner = 1 where data = '00001694';
-//update man_code set corner = 1 where data = '00001696';
-//update man_code set corner = 1 where data = '00001706';
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
index bad3252..f594efa 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -230,9 +230,9 @@
// return;
// }
- int agvCount = agvService.count(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+// int agvCount = agvService.count(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel || 0 == agvCount) {
+ if (null == agvModel) {
return;
}
// int maxCapacity = agvModel.getBackpack() * agvCount;
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 1496bca..debe09b 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
@@ -243,7 +243,7 @@
executePatrolLogic(agvNo);
// executeUShapeConveyor(agvNo);
} catch (Exception e) {
- log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�: {}", agvNo, e.getMessage());
+ log.error("鎵цAGV{}璺戝簱浠诲姟鏃跺彂鐢熷紓甯�", agvNo, e);
}
};
--
Gitblit v1.9.1