From 15547fda83db36d8498f7b0b509c41b44b840c4d Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 18 十二月 2025 15:20:46 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java | 59 ++++++++++++-----------------
zy-acs-flow/src/config/setting.js | 2
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LocService.java | 4 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/LocMapper.java | 4 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java | 10 ++++-
5 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/zy-acs-flow/src/config/setting.js b/zy-acs-flow/src/config/setting.js
index 05cd956..7b4d473 100644
--- a/zy-acs-flow/src/config/setting.js
+++ b/zy-acs-flow/src/config/setting.js
@@ -9,7 +9,7 @@
export const HANDLE_APP_KEY = 'xltys1995';
-export const VERIFY_PASSWORD = 'root';
+export const VERIFY_PASSWORD = '';
export const SPA_NAME = 'COOL';
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 d1e72a8..0076b5f 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
@@ -76,9 +76,9 @@
String memo = "DEMO_STA_" + String.join("-", staPreNos);
// 鍏ュ簱
- this.runStaToLoc(memo);
+ this.runStaToLoc0(memo);
// 鍑哄簱
- this.runLocToSta(memo);
+ this.runLocToSta0(memo);
// 绉诲簱
this.runLocToLoc(memo);
@@ -154,7 +154,7 @@
// 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧rea缁戝畾锛屽氨鍏ㄥ湴鍥�
List<String> codeList = areaGovernService.queryCodesByOneCode(staCode);
if (Cools.isEmpty(codeList)) {
- idleLoc = locService.selectRandOneByLocSts(LocStsType.IDLE.val());
+ idleLoc = locService.selectRandOneByLocSts(LocStsType.IDLE.val(), 1);
} else {
Collections.shuffle(codeList);
for (String codeData : codeList) {
@@ -266,7 +266,7 @@
// 鎵�鍦ㄥ尯鍩熺殑鏉＄爜锛屽鏋滄病鏈塧rea缁戝畾锛屽氨鍏ㄥ湴鍥�
List<String> codeList = areaGovernService.queryCodesByOneCode(staCode);
if (Cools.isEmpty(codeList)) {
- stockLoc = locService.selectRandOneByLocSts(LocStsType.STOCK.val());
+ stockLoc = locService.selectRandOneByLocSts(LocStsType.STOCK.val(), 1);
} else {
Collections.shuffle(codeList);
for (String codeData : codeList) {
@@ -305,12 +305,6 @@
// 绉诲簱
private void runLocToLoc(String staTaskMemo) {
-// Integer startRow = Collections.min(locGroupList);
-// Integer endRow = Collections.max(locGroupList);
- Integer startRow = null;
- Integer endRow = null;
-
-// String memo = "DEMO_LOC_" + startRow + "-" + endRow;
String memo = "DEMO_LOC";
int availableAgvCount = this.getAvailableAgvCount();
@@ -319,41 +313,36 @@
if (availableAgvCount <= busService.count(new LambdaQueryWrapper<Bus>()
.in(Bus::getBusSts, BusStsType.RECEIVE.val(), BusStsType.PROGRESS.val())
.in(Bus::getMemo, memo, staTaskMemo)
- )) {
- return;
- }
+ )) { return; }
AgvModel agvModel = agvModelService.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, AgvModelType.CTU_BOX_TRANSPORT_AGV.toString()));
- if (null == agvModel) {
- return;
- }
+ if (null == agvModel) { return; }
+
int maxCapacity = agvModel.getBackpack();
// STOCK
- LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
- if (null != startRow) { stockWrapper.ge(Loc::getRow, startRow); }
- if (null != endRow) { stockWrapper.le(Loc::getRow, endRow); }
- List<Loc> stockList = locService.list(stockWrapper);
- if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
- return;
- }
- Collections.shuffle(stockList);
+ List<Loc> stockLocList = locService.selectRandByLocSts(LocStsType.STOCK.val(), maxCapacity);
+// LambdaQueryWrapper<Loc> stockWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.STOCK.val());
+// List<Loc> stockList = locService.list(stockWrapper);
+// if (Cools.isEmpty(stockList) || stockList.size() < agvModel.getBackpack()) {
+// return;
+// }
+// Collections.shuffle(stockList);
// IDLE
- LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
- if (null != startRow) { idleWrapper.ge(Loc::getRow, startRow); }
- if (null != endRow) { idleWrapper.le(Loc::getRow, endRow); }
- List<Loc> idleList = locService.list(idleWrapper);
- if (Cools.isEmpty(idleList)) {
- return;
- }
- Collections.shuffle(idleList);
+ List<Loc> idleLocList = locService.selectRandByLocSts(LocStsType.IDLE.val(), maxCapacity);
+// LambdaQueryWrapper<Loc> idleWrapper = new LambdaQueryWrapper<Loc>().eq(Loc::getLocSts, LocStsType.IDLE.val());
+// List<Loc> idleList = locService.list(idleWrapper);
+// if (Cools.isEmpty(idleList)) {
+// return;
+// }
+// Collections.shuffle(idleList);
OpenBusSubmitParam param = new OpenBusSubmitParam();
param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
- for (int i = 0; i < Math.min(maxCapacity, Math.min(stockList.size(), idleList.size())); i++) {
- Loc stockLoc = stockList.get(i);
- Loc idleLoc = idleList.get(i);
+ for (int i = 0; i < Math.min(maxCapacity, Math.min(stockLocList.size(), idleLocList.size())); i++) {
+ Loc stockLoc = stockLocList.get(i);
+ Loc idleLoc = idleLocList.get(i);
TaskDto taskDto = new TaskDto();
taskDto.setOriLoc(stockLoc.getLocNo());
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/LocMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/LocMapper.java
index c7384cd..53bae54 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/LocMapper.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/LocMapper.java
@@ -14,7 +14,7 @@
List<Map<String, Object>> selectDigitalLocWhichNeedShow();
- @Select("SELECT * FROM man_loc WHERE loc_sts = #{locSts} ORDER BY RAND() LIMIT 1")
- Loc selectRandOneByLocSts(@Param("locSts") Long locSts);
+ @Select("SELECT * FROM man_loc WHERE loc_sts = #{locSts} ORDER BY RAND() LIMIT #{limit}")
+ List<Loc> selectRandByLocSts(@Param("locSts") Long locSts, @Param("limit") Integer limit);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LocService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LocService.java
index 11efdd7..df90198 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LocService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/LocService.java
@@ -17,6 +17,8 @@
void taskCallBack(Task task);
- Loc selectRandOneByLocSts(Long locSts);
+ Loc selectRandOneByLocSts(Long locSts, Integer limit);
+
+ List<Loc> selectRandByLocSts(Long locSts, Integer limit);
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
index 3c88e08..9a152fd 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/LocServiceImpl.java
@@ -145,11 +145,17 @@
}
@Override
- public Loc selectRandOneByLocSts(Long locSts) {
+ public Loc selectRandOneByLocSts(Long locSts, Integer limit) {
+ List<Loc> locList = this.selectRandByLocSts(locSts, limit);
+ return locList.stream().findFirst().orElse(null);
+ }
+
+ @Override
+ public List<Loc> selectRandByLocSts(Long locSts, Integer limit) {
if (locSts == null) {
return null;
}
- return this.baseMapper.selectRandOneByLocSts(locSts);
+ return this.baseMapper.selectRandByLocSts(locSts, limit);
}
}
--
Gitblit v1.9.1