From bd591d58c09951c62dc1776504b1631a19f9a0b1 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 05 一月 2026 08:49:38 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 50 ++++++++++++++++++++++++-
zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/ConfigService.java | 2 +
zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/ConfigServiceImpl.java | 40 ++++++++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java | 10 +++--
4 files changed, 96 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
index 93c1194..e496015 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java
@@ -63,8 +63,18 @@
@Scheduled(fixedDelay = 1000) // 鍥哄畾棰戠巼鎵ц锛屽悓姝�
// @Scheduled(cron = "0/1 * * * * ? ")
private void execute() {
- if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
- this.autoRun();
+ if (configService.getVal("TaskAssignMode", Boolean.class)) {
+ this.autoRun();
+ }
+ if (configService.getVal("TaskAssignMode1", Boolean.class,false)) {
+ this.autoRun0(1);
+ }
+ if (configService.getVal("TaskAssignMode2", Boolean.class,false)) {
+ this.autoRun0(2);
+ }
+ if (configService.getVal("TaskAssignMode3", Boolean.class,false)) {
+ this.autoRun0(3);
+ }
}
private void autoRun() {
@@ -83,6 +93,26 @@
// 绉诲簱
this.runLocToLoc(memo);
}
+
+ private void autoRun0(Integer i) {
+ int availableAgvCount = this.getAvailableAgvCount();
+ if (0 == availableAgvCount) { return; }
+
+// List<String> staPreNos = getStaPrefixes(staGroupList);
+ List<String> staPreNos = new ArrayList<>();
+ String memo = "DEMO_STA_" + String.join("-", staPreNos);
+ if(i ==1){
+ // 鍏ュ簱
+ this.runStaToLoc0(memo);
+ }else if (i == 2){
+ // 鍑哄簱
+ this.runLocToSta0(memo);
+ }else if (i == 3){
+ // 绉诲簱
+ this.runLocToLoc(memo);
+ }
+ }
+
// 鍏ュ簱
private void runStaToLoc(String memo) {
@@ -133,6 +163,14 @@
}
private void runStaToLoc0(String memo) {
+ int availableAgvCount = this.getAvailableAgvCount();
+
+ // 鏈�澶� ? 缁刡us杩愯
+ if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>()
+ .in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
+ .in(Bus::getMemo, memo, memo)
+ )) { return; }
+
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
if (null == agvModel) { return; }
@@ -245,6 +283,14 @@
}
private void runLocToSta0(String memo) {
+ int availableAgvCount = this.getAvailableAgvCount();
+
+ // 鏈�澶� ? 缁刡us杩愯
+ if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>()
+ .in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
+ .in(Bus::getMemo, memo, memo)
+ )) { return; }
+
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
if (null == agvModel) { return; }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java
index 9a7ab84..0ed6424 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/utils/UtilsController.java
@@ -67,7 +67,7 @@
private int d2 = 5;
- private List<Integer> starts2 = Lists.newArrayList(389, 478, 567, 745, 835, 923, 1012, 1101, 1190, 1366, 1458, 1547);
+ private List<Integer> starts2 = Lists.newArrayList(389, 478, 567, 656,835, 923, 1012, 1101, 1190, 1366, 1458, 1547);
@RequestMapping("/loc")
@@ -90,9 +90,11 @@
// }
if (loc.getBay() > 32) {
Integer i = starts2.get((loc.getRow() - 13) / 2);
- Code cacheByData = codeService.getCacheByData(Utils.zeroFill((Utils.zeroFill((((loc.getBay()-1) % 8) + i + (((loc.getBay()-1) / 8) - 4) * 10) + "", 8)) + "", 8));
- loc.setCode(cacheByData.getId());
- locService.updateById(loc);
+ if (i==656){
+ Code cacheByData = codeService.getCacheByData(Utils.zeroFill((Utils.zeroFill((((loc.getBay()-1) % 8) + i + (((loc.getBay()-1) / 8) - 4) * 10) + "", 8)) + "", 8));
+ loc.setCode(cacheByData.getId());
+ locService.updateById(loc);
+ }
}
}
return "success";
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/ConfigService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/ConfigService.java
index 8ede185..2f74919 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/ConfigService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/ConfigService.java
@@ -7,6 +7,8 @@
<T> T getVal(String key, Class<T> clazz);
+ <T> T getVal(String key, Class<T> clazz, T b);
+
<T> boolean setVal(String key, T val);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/ConfigServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/ConfigServiceImpl.java
index d20cd4c..f05daa9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/ConfigServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/impl/ConfigServiceImpl.java
@@ -72,6 +72,46 @@
}
@Override
+ @SuppressWarnings("unchecked")
+ public <T> T getVal(String key, Class<T> clazz, T defaultValue) {
+ Config config = CONFIG_CACHE.get(key);
+ if (config == null) {
+ List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key));
+ config = list.stream().findFirst().orElse(null);
+ if (null == config) {
+ return defaultValue;
+ }
+ }
+ String val = config.getVal();
+ switch (ConfigType.query(config.getType())) {
+ case BOOLEAN:
+ if (val.equals("1") || val.trim().equalsIgnoreCase("TRUE")) {
+ return (T) Boolean.TRUE;
+ }
+ return (T) Boolean.FALSE;
+ case NUMBER:
+ if (clazz == Integer.class) {
+ return (T) Integer.valueOf(val);
+ } else if (clazz == Short.class) {
+ return (T) Short.valueOf(val);
+ } else if (clazz == Long.class) {
+ return (T) Long.valueOf(val);
+ } else if (clazz == Double.class) {
+ return (T) Double.valueOf(val);
+ }
+ throw new UnsupportedOperationException("Unsupported type: " + clazz.getName());
+ case STRING:
+ return (T) val;
+ case JSON:
+ return GsonUtils.fromJson(val, clazz);
+ case DATE:
+ return (T) DateUtils.convert(val);
+ default:
+ return defaultValue;
+ }
+ }
+
+ @Override
public <T> boolean setVal(String key, T val) {
Config config = CONFIG_CACHE.get(key);
if (config == null) {
--
Gitblit v1.9.1