From a502dc5a81d42a70e2ba2ad9e4cce97fea2b7669 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 14 一月 2026 15:42:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/FakeProcess.java | 277 +++++++++++++++++++++++++++++++------------------------
1 files changed, 155 insertions(+), 122 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/FakeProcess.java b/src/main/java/com/zy/core/plugin/FakeProcess.java
index 7aad282..f4b1702 100644
--- a/src/main/java/com/zy/core/plugin/FakeProcess.java
+++ b/src/main/java/com/zy/core/plugin/FakeProcess.java
@@ -23,6 +23,7 @@
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.DualCrnProtocol;
import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.plugin.api.MainProcessPluginApi;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DualCrnThread;
@@ -38,18 +39,26 @@
import org.springframework.stereotype.Component;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
@Slf4j
@Component
public class FakeProcess implements MainProcessPluginApi {
- private static Map<Integer,Long> stationStayTimeMap = new HashMap<>();
- private static String enableFake = "N";
- private static String fakeRealTaskRequestWms = "N";
- private static String fakeGenerateInTask = "Y";
- private static String fakeGenerateOutTask = "Y";
+ private static final long METHOD_TIMEOUT_MS = 15000; // 15绉掕秴鏃�
+ private static final ExecutorService timeoutExecutor = Executors.newCachedThreadPool();
- private Thread asyncRunThread = null;
+ private static Map<Integer,Long> stationStayTimeMap = new ConcurrentHashMap<>();
+ private static volatile String enableFake = "N";
+ private static volatile String fakeRealTaskRequestWms = "N";
+ private static volatile String fakeGenerateInTask = "Y";
+ private static volatile String fakeGenerateOutTask = "Y";
+
private Thread asyncFakeRunThread = null;
@Autowired
@@ -77,57 +86,50 @@
@Autowired
private DualCrnOperateProcessUtils dualCrnOperateProcessUtils;
- @Override
- public void run() {
- asyncRun();
- asyncFakeRun();
-
- //鎵ц鍫嗗灈鏈轰换鍔�
- crnOperateUtils.crnIoExecute();
- //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
- crnIoExecuteFinish();
- //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- stationOperateProcessUtils.stationInExecute();
- //鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
- stationOperateProcessUtils.stationOutExecute();
- //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
- stationOperateProcessUtils.stationOutExecuteFinish();
-
- //鎵ц鍙屽伐浣嶅爢鍨涙満浠诲姟
- dualCrnOperateProcessUtils.dualRrnIoExecute();
- //鍙屽伐浣嶅爢鍨涙満浠诲姟鎵ц瀹屾垚
- dualCrnOperateProcessUtils.dualCrnIoExecuteFinish();
+ /**
+ * 甯﹁秴鏃朵繚鎶ゆ墽琛屾柟娉�
+ * @param taskName 浠诲姟鍚嶇О锛堢敤浜庢棩蹇楋級
+ * @param task 瑕佹墽琛岀殑浠诲姟
+ */
+ private void executeWithTimeout(String taskName, Runnable task) {
+ Future<?> future = timeoutExecutor.submit(task);
+ try {
+ future.get(METHOD_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ } catch (TimeoutException e) {
+ // 浣跨敤 cancel(false) 涓嶅彂閫佷腑鏂俊鍙凤紝閬垮厤 RedisCommandInterruptedException
+ // 浠诲姟浼氬湪鍚庡彴缁х画鎵ц鐩村埌瀹屾垚锛屼絾涓诲惊鐜笉浼氱瓑寰�
+ future.cancel(false);
+ News.error("[WCS Warning] 鏂规硶鎵ц瓒呮椂锛屼富寰幆宸茶烦杩�: {}, 瓒呮椂鏃堕棿: {}ms (浠诲姟浠嶅湪鍚庡彴杩愯)", taskName, METHOD_TIMEOUT_MS);
+ } catch (Exception e) {
+ News.error("[WCS Error] 鏂规硶鎵ц寮傚父: {}, 寮傚父: {}", taskName, e.getMessage());
+ }
}
- public void asyncRun() {
- if (asyncRunThread != null) {
- return;
- }
+ @Override
+ public void run() {
+ long startTime = System.currentTimeMillis();
+ asyncFakeRun();
- asyncRunThread = new Thread(() -> {
- while (!Thread.currentThread().isInterrupted()) {
- try {
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
+ //璇锋眰鐢熸垚鍏ュ簱浠诲姟
+ executeWithTimeout("generateStoreWrkFile", this::generateStoreWrkFile);
- //璇锋眰鐢熸垚鍏ュ簱浠诲姟
- generateStoreWrkFile();
+ //鎵ц鍫嗗灈鏈轰换鍔�
+ executeWithTimeout("crnIoExecute", crnOperateUtils::crnIoExecute);
+ //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�-鍏峰浠跨湡鑳藉姏
+ executeWithTimeout("crnIoExecuteFinish", this::crnIoExecuteFinish);
+ //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
+ executeWithTimeout("stationInExecute", stationOperateProcessUtils::stationInExecute);
+ //鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔�
+ executeWithTimeout("stationOutExecute", stationOperateProcessUtils::stationOutExecute);
+ //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
+ executeWithTimeout("stationOutExecuteFinish", stationOperateProcessUtils::stationOutExecuteFinish);
- // 闂撮殧
- Thread.sleep(50);
- } catch (InterruptedException ie) {
- Thread.currentThread().interrupt();
- break;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- asyncRunThread.setName("asyncRunProcess");
- asyncRunThread.setDaemon(true);
- asyncRunThread.start();
+ //鎵ц鍙屽伐浣嶅爢鍨涙満浠诲姟
+ executeWithTimeout("dualCrnIoExecute", dualCrnOperateProcessUtils::dualCrnIoExecute);
+ //鍙屽伐浣嶅爢鍨涙満浠诲姟鎵ц瀹屾垚
+ executeWithTimeout("dualCrnIoExecuteFinish", dualCrnOperateProcessUtils::dualCrnIoExecuteFinish);
+
+ News.info("[WCS Debug] 涓荤嚎绋婻un鎵ц瀹屾垚,鑰楁椂:{}ms", System.currentTimeMillis() - startTime);
}
public void asyncFakeRun() {
@@ -195,7 +197,7 @@
}
//妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞朵豢鐪熺敓鎴愭ā鎷熷叆搴撶珯鐐规暟鎹�
- private synchronized void checkInStationHasTask() {
+ private void checkInStationHasTask() {
if (!enableFake.equals("Y")) {
return;
}
@@ -235,7 +237,7 @@
&& !stationProtocol.isLoading()
&& stationProtocol.getTaskNo() == 0
) {
- StationCommand command = stationThread.getMoveCommand(commonService.getWorkNo(WrkIoType.FAKE_TASK_NO.id), stationId, entity.getBarcodeStation().getStationId(), 0);
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.FAKE_TASK_NO.id), stationId, entity.getBarcodeStation().getStationId(), 0);
MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
redisUtil.set(RedisKeyType.GENERATE_FAKE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 5);
}
@@ -244,7 +246,7 @@
}
//鐢熸垚浠跨湡妯℃嫙鍏ュ簱浠诲姟
- private synchronized void generateFakeInTask() {
+ private void generateFakeInTask() {
if (!enableFake.equals("Y")) {
return;
}
@@ -324,7 +326,7 @@
taskParam.setBarcode(stationProtocol.getBarcode());
WrkMast wrkMast = commonService.createInTask(taskParam);
- StationCommand command = stationThread.getMoveCommand(wrkMast.getWrkNo(), stationId, stationId, 0);
+ StationCommand command = stationThread.getCommand(StationCommandType.MOVE, wrkMast.getWrkNo(), stationId, stationId, 0);
if(command == null){
News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
continue;
@@ -337,7 +339,7 @@
}
//鐢熸垚浠跨湡妯℃嫙鍑哄簱浠诲姟
- private synchronized void generateFakeOutTask() {
+ private void generateFakeOutTask() {
if (!enableFake.equals("Y")) {
return;
}
@@ -404,82 +406,103 @@
* 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗�
*/
public synchronized void generateStoreWrkFile() {
- if (fakeRealTaskRequestWms.equals("N")) {
- return;
- }
-
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- for (BasDevp basDevp : basDevps) {
- StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
- if(stationThread == null){
- continue;
+ try {
+ if (fakeRealTaskRequestWms.equals("N")) {
+ return;
}
- Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+ Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
+ if (systemConfigMapObj == null) {
+ return;
+ }
+ HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
- List<StationObjModel> list = basDevp.getBarcodeStationList$();
- for (StationObjModel entity : list) {
- Integer stationId = entity.getStationId();
- if(!stationMap.containsKey(stationId)){
+ int conveyorStationTaskLimit = 30;
+ String conveyorStationTaskLimitStr = systemConfigMap.get("conveyorStationTaskLimit");
+ if(conveyorStationTaskLimitStr != null){
+ conveyorStationTaskLimit = Integer.parseInt(conveyorStationTaskLimitStr);
+ }
+ int currentStationTaskCount = stationOperateProcessUtils.getCurrentStationTaskCount();
+ if (currentStationTaskCount > conveyorStationTaskLimit) {
+ News.error("杈撻�佺珯鐐逛换鍔″凡杈惧埌涓婇檺锛屼笂闄愬�硷細{}锛岀珯鐐逛换鍔℃暟锛歿}", conveyorStationTaskLimit, currentStationTaskCount);
+ return;
+ }
+
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ for (BasDevp basDevp : basDevps) {
+ StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+ if (stationThread == null) {
continue;
}
- StationProtocol stationProtocol = stationMap.get(stationId);
- if (stationProtocol == null) {
- continue;
- }
+ Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
- //婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
- if (stationProtocol.isAutoing()
- && stationProtocol.isLoading()
- && stationProtocol.getTaskNo() > 0
- ) {
- if (Cools.isEmpty(stationProtocol.getBarcode())) {
+ List<StationObjModel> list = basDevp.getBarcodeStationList$();
+ for (StationObjModel entity : list) {
+ Integer stationId = entity.getStationId();
+ if (!stationMap.containsKey(stationId)) {
continue;
}
- //妫�娴嬩换鍔℃槸鍚︾敓鎴�
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
- if (!wrkMasts.isEmpty()) {
+ StationProtocol stationProtocol = stationMap.get(stationId);
+ if (stationProtocol == null) {
continue;
}
- Object lock = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId);
- if (lock != null) {
- continue;
- }
- redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
-
- String response = wmsOperateUtils.applyInTask(stationProtocol.getBarcode(), stationProtocol.getStationId(), stationProtocol.getPalletHeight());
- if (response == null) {
- News.error("璇锋眰WMS鍏ュ簱鎺ュ彛澶辫触锛屾帴鍙ｆ湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
- continue;
- }
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- StartupDto dto = jsonObject.getObject("data", StartupDto.class);
-
- CreateInTaskParam taskParam = new CreateInTaskParam();
- taskParam.setTaskNo(dto.getTaskNo());
- taskParam.setLocNo(dto.getLocNo());
- taskParam.setTaskPri(dto.getTaskPri());
- taskParam.setBarcode(stationProtocol.getBarcode());
- WrkMast wrkMast = commonService.createInTask(taskParam);
-
- StationCommand command = stationThread.getMoveCommand(wrkMast.getWrkNo(), stationId, stationId, 0);
- if(command == null){
- News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+ //婊¤冻鑷姩銆佹湁鐗┿�佹湁宸ヤ綔鍙凤紝鐢熸垚鍏ュ簱鏁版嵁
+ if (stationProtocol.isAutoing()
+ && stationProtocol.isLoading()
+ && stationProtocol.getTaskNo() > 0
+ ) {
+ if (Cools.isEmpty(stationProtocol.getBarcode())) {
continue;
}
- MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+
+ //妫�娴嬩换鍔℃槸鍚︾敓鎴�
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", stationProtocol.getBarcode()));
+ if (!wrkMasts.isEmpty()) {
+ continue;
+ }
+
+ Object lock = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId);
+ if (lock != null) {
+ continue;
+ }
+ redisUtil.set(RedisKeyType.GENERATE_IN_TASK_LIMIT.key + stationId, "lock", 2);
+
+ String response = wmsOperateUtils.applyInTask(stationProtocol.getBarcode(), stationProtocol.getStationId(), stationProtocol.getPalletHeight());
+ if (response == null) {
+ News.error("璇锋眰WMS鍏ュ簱鎺ュ彛澶辫触锛屾帴鍙ｆ湭鍝嶅簲锛侊紒锛乺esponse锛歿}", response);
+ continue;
+ }
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+
+ CreateInTaskParam taskParam = new CreateInTaskParam();
+ taskParam.setTaskNo(dto.getTaskNo());
+ taskParam.setLocNo(dto.getLocNo());
+ taskParam.setTaskPri(dto.getTaskPri());
+ taskParam.setBarcode(stationProtocol.getBarcode());
+ WrkMast wrkMast = commonService.createInTask(taskParam);
+
+ StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO, wrkMast.getWrkNo(), stationId, stationId, 0);
+ if (command == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "鑾峰彇杈撻�佺嚎鍛戒护澶辫触");
+ continue;
+ }
+ MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
+ }
}
}
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
//璁＄畻鎵�鏈夌珯鐐瑰仠鐣欐椂闂�
- public synchronized void calcAllStationStayTime() {
+ public void calcAllStationStayTime() {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
for (BasDevp basDevp : basDevps) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
@@ -501,7 +524,7 @@
}
//妫�娴嬪嚭搴撶珯鐐瑰仠鐣欐槸鍚﹁秴鏃�
- public synchronized void checkOutStationStayTimeOut() {
+ public void checkOutStationStayTimeOut() {
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
for (BasDevp basDevp : basDevps) {
List<StationObjModel> outStationList = basDevp.getOutStationList$();
@@ -527,7 +550,7 @@
continue;
}
- StationCommand command = stationThread.getMoveCommand(0, stationObjModel.getStationId(), 0, 0);
+ StationCommand command = stationThread.getCommand(StationCommandType.RESET, 0, stationObjModel.getStationId(), 0, 0);
if(command == null){
continue;
}
@@ -541,7 +564,7 @@
}
//妫�娴嬪叆搴撶珯鐐瑰爢鍨涙満鏄惁鍙栬蛋璐х墿
- public synchronized void checkInStationCrnTake() {
+ public void checkInStationCrnTake() {
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
List<StationObjModel> inStationList = basCrnp.getInStationList$();
@@ -575,11 +598,6 @@
continue;
}
- StationCommand command = stationThread.getMoveCommand(0, stationObjModel.getStationId(), 0, 0);
- if(command == null){
- continue;
- }
-
Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
StationProtocol stationProtocol = statusMap.get(stationObjModel.getStationId());
if (stationProtocol == null) {
@@ -587,6 +605,11 @@
}
if(stationProtocol.getTaskNo() > 0) {
+ StationCommand command = stationThread.getCommand(StationCommandType.RESET, 0, stationObjModel.getStationId(), 0, 0);
+ if(command == null){
+ continue;
+ }
+
WrkMast wrkMast = wrkMastService.selectByWorkNo(stationProtocol.getTaskNo());
if (wrkMast == null) {
MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
@@ -615,7 +638,17 @@
continue;
}
DualCrnProtocol dualCrnProtocol = dualCrnThread.getStatus();
- if (!dualCrnProtocol.getStatusType().equals(DualCrnStatusType.PUT_MOVING) && !dualCrnProtocol.getStatusType().equals(DualCrnStatusType.PUTTING)) {
+
+ boolean reset = false;
+ if (dualCrnProtocol.getTaskNo() > 0 && dualCrnProtocol.getLoaded() == 1) {
+ reset = true;
+ }
+
+ if (dualCrnProtocol.getTaskNoTwo() > 0 && dualCrnProtocol.getLoadedTwo() == 1) {
+ reset = true;
+ }
+
+ if (!reset) {
continue;
}
@@ -630,7 +663,7 @@
}
//鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
- public synchronized void crnIoExecuteFinish() {
+ public void crnIoExecuteFinish() {
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp : basCrnps) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, basCrnp.getCrnNo());
@@ -682,7 +715,7 @@
continue;
}
//鐢熸垚浠跨湡绔欑偣鏁版嵁
- StationCommand command = stationThread.getMoveCommand(9998, wrkMast.getSourceStaNo(), 0, 0);
+ StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO, 9998, wrkMast.getSourceStaNo(), 0, 0);
MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
}
}else if(wrkMast.getWrkSts() == WrkStsType.LOC_MOVE_RUN.sts){
--
Gitblit v1.9.1