From ce9c9af4a3710d17e17814bab629ab4ef474f3f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 09 七月 2025 11:16:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index d76f41b..d0a2602 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -1,12 +1,16 @@
package com.zy.core.dispatcher;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.ShuttleGatherResult;
+import com.zy.asrs.domain.param.ShuttleGatherParam;
import com.zy.asrs.entity.BasShuttle;
+import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasShuttleService;
+import com.zy.asrs.service.DeviceConfigService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.NavigateNode;
@@ -22,7 +26,6 @@
import com.zy.core.model.ForkLiftSlave;
import com.zy.core.model.ShuttleSlave;
import com.zy.core.model.protocol.*;
-import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ForkLiftThread;
import com.zy.core.thread.ShuttleThread;
import com.zy.system.entity.Config;
@@ -40,8 +43,6 @@
public class ShuttleDispatchUtils {
@Autowired
- private SlaveProperties slaveProperties;
- @Autowired
private WrkMastService wrkMastService;
@Autowired
private CommonService commonService;
@@ -51,30 +52,34 @@
private ConfigService configService;
@Autowired
private BasShuttleService basShuttleService;
+ @Autowired
+ private DeviceConfigService deviceConfigService;
/**
* 璋冨害杞﹁締-璋冨害鎸囧畾绌挎杞�
*/
- public boolean dispatchShuttle(Integer wrkNo, String locNo, Integer shuttleNo) {
+ public synchronized boolean dispatchShuttle(Integer wrkNo, String locNo, Integer shuttleNo) {
return shuttleMoveGenerate(wrkNo, locNo, shuttleNo);
}
/**
* 璋冨害杞﹁締
*/
- public boolean dispatchShuttle(Integer wrkNo, String locNo) {
+ public synchronized boolean dispatchShuttle(Integer wrkNo, String locNo) {
ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
- for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
+ List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Shuttle)));
+ for (DeviceConfig device : shuttleList) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getDeviceNo());
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
continue;
}
- if (checkChargeWrk(shuttle.getId())) {
+ if (checkChargeWrk(device.getDeviceNo())) {
continue;//瀛樺湪鍏呯數浠诲姟锛岃繃婊ゅ皬杞�
}
@@ -82,7 +87,7 @@
continue;//灏忚溅蹇欑涓�
}
- BasShuttle basShuttle = basShuttleService.selectOne(new EntityWrapper<BasShuttle>().eq("shuttle_no", shuttle.getId()));
+ BasShuttle basShuttle = basShuttleService.selectOne(new EntityWrapper<BasShuttle>().eq("shuttle_no", device.getDeviceNo()));
if (basShuttle != null) {
if (basShuttle.getStatus() == 0) {
continue;//灏忚溅琚鐢�
@@ -166,7 +171,8 @@
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleProtocol.getCurrentLocNo();
int currentLev = Utils.getLev(currentLocNo);
- List<WrkMast> wrkMasts1 = wrkMastService.selectNoShuttleWrkByLev(currentLev);//鍒ゆ柇褰撳墠绌挎杞︽ゼ灞傛槸鍚︽湁寰呭垎閰嶈溅杈嗙殑浠诲姟锛屽鏋滄湁鍒欎笉鍒嗛厤杩欒締杞�
+ //鍒ゆ柇褰撳墠妤煎眰鏄惁鏈変换鍔★紝濡傛灉鏈夊垯涓嶅垎閰嶈繖杈嗚溅
+ List<WrkMast> wrkMasts1 = wrkMastService.selectWrkByLev(currentLev);
int shuttleCount = this.getShuttleCountByLev(currentLev);//鑾峰彇绌挎杞︽ゼ灞傝溅杈嗘暟閲�
if (!wrkMasts1.isEmpty() && shuttleCount <= 1) {
//瀛樺湪鍏朵粬浠诲姟涓斿彲鐢ㄥ皬杞︽暟閲忓皬浜庣瓑浜�1锛岃烦杩囪繖杈嗚溅
@@ -200,7 +206,7 @@
* 灏忚溅杩佺Щ浠诲姟鐢熸垚
*/
@Transactional
- public boolean shuttleMoveGenerate(Integer wrkNo, String locNo, Integer shuttleNo) {
+ public synchronized boolean shuttleMoveGenerate(Integer wrkNo, String locNo, Integer shuttleNo) {
Date now = new Date();
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
@@ -237,7 +243,7 @@
News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
return false;
}else {
- if (!mainWrkMast.getShuttleNo().equals(shuttleNo)) {
+ if (!shuttleNo.equals(mainWrkMast.getShuttleNo())) {
News.info("{}鍙峰皬杞︼紝瀛樺湪鍏朵粬宸ヤ綔妗ｄ换鍔★紝绛夊緟鎵ц瀹屾垚鍐嶇敓鎴愭柊鐨勪换鍔�", shuttleNo);
return false;
}
@@ -299,8 +305,15 @@
/**
* 灏忚溅闆嗗悎
*/
- public List<ShuttleGatherResult> shuttleGather() {
- List<BasShuttle> basShuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>().eq("status", 1));
+ public List<ShuttleGatherResult> shuttleGather(ShuttleGatherParam param) {
+ Wrapper<BasShuttle> wrapper = new EntityWrapper<BasShuttle>().eq("status", 1);
+ if (param != null) {
+ if (!param.getShuttleNos().isEmpty()) {
+ wrapper.in("shuttle_no", param.getShuttleNos());
+ }
+ }
+
+ List<BasShuttle> basShuttles = basShuttleService.selectList(wrapper);
List<ShuttleGatherResult> list = new ArrayList<>();
for (BasShuttle basShuttle : basShuttles) {
String idleLoc = basShuttle.getIdleLoc();
@@ -331,12 +344,24 @@
return false;
}
+ List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Shuttle)));
int levCount = 0;//鐩爣妤煎眰杞﹁締鏁伴噺
- for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
+ for (DeviceConfig device : shuttleList) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttle.getId());
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getDeviceNo());
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (shuttleProtocol == null || shuttleProtocol.getShuttleNo() == null) {
+ continue;
+ }
+
+ //灏忚溅鏈夊厖鐢典换鍔�
+ if (shuttleThread.isCharging()) {
+ continue;
+ }
+
+ //灏忚溅鏁呴殰璺宠繃
+ if (shuttleThread.isFault()) {
continue;
}
@@ -390,11 +415,14 @@
return null;
}
+ List<DeviceConfig> forkliftList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.ForkLift)));
+
//鑾峰彇灏忚溅鍚屼竴妤煎眰鐨勭珯鐐�
ArrayList<ForkLiftStaProtocol> list = new ArrayList<>();
int lev = Utils.getLev(shuttleProtocol.getCurrentLocNo());//灏忚溅妤煎眰
- for (ForkLiftSlave slave : slaveProperties.getForkLift()) {
- ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, slave.getId());
+ for (DeviceConfig device : forkliftList) {
+ ForkLiftThread forkLiftThread = (ForkLiftThread) SlaveConnection.get(SlaveType.ForkLift, device.getDeviceNo());
if (forkLiftThread == null) {
continue;
}
@@ -406,19 +434,32 @@
continue;
}
- ForkLiftStaProtocol forkLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(slave.getId(), lev);
+ ForkLiftStaProtocol forkLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(device.getDeviceNo(), lev);
if (forkLiftStaProtocol == null) {
continue;
}
+ //鍒ゆ柇褰撳墠灞傛槸鍚︽棤鎵樼洏
+ if (forkLiftStaProtocol.getHasTray()) {
+ continue;
+ }
+
+ if (forkLiftStaProtocol.getHasCar()) {
+ continue;
+ }
+
//鍒ゆ柇鐩爣妤煎眰绔欑偣鏄惁鏃犳墭鐩�
- ForkLiftStaProtocol targetLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(slave.getId(), targetLev);
+ ForkLiftStaProtocol targetLiftStaProtocol = ForkLiftUtils.getLiftStaByLev(device.getDeviceNo(), targetLev);
if (targetLiftStaProtocol == null) {
continue;
}
if (targetLiftStaProtocol.getHasTray()) {
continue;//鏈夋墭鐩樿烦杩�
+ }
+
+ if (targetLiftStaProtocol.getHasCar()) {
+ continue;
}
list.add(forkLiftStaProtocol);
@@ -468,10 +509,12 @@
* 鑾峰彇妤煎眰鍙敤灏忚溅鏁伴噺
*/
public int getShuttleCountByLev(int lev) {
+ List<DeviceConfig> shuttleList = deviceConfigService.selectList(new EntityWrapper<DeviceConfig>()
+ .eq("device_type", String.valueOf(SlaveType.Shuttle)));
int count = 0;
- for (ShuttleSlave slave : slaveProperties.getShuttle()) {
+ for (DeviceConfig device : shuttleList) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getDeviceNo());
if (shuttleThread == null) {
continue;
}
@@ -481,7 +524,7 @@
continue;
}
- if (checkChargeWrk(slave.getId())) {
+ if (checkChargeWrk(device.getDeviceNo())) {
continue;//瀛樺湪鍏呯數浠诲姟锛岃繃婊ゅ皬杞�
}
--
Gitblit v1.9.1