From 9e715c16b49a066e627d150fb2d973a8562db8dc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 09:26:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 63 ++++++-------------------------
1 files changed, 12 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 568d8a8..cd49feb 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,29 +1,25 @@
package com.zy.core;
-import com.zy.asrs.service.impl.MainServiceImpl;
+import com.core.common.SpringUtils;
+import com.zy.core.plugin.MainProcessPluginApi;
import com.zy.core.properties.SystemProperties;
-import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-
import javax.annotation.PreDestroy;
/**
* WCS涓绘祦绋�
- * Created by vincent on 2020/8/6
*/
-@Data
@Slf4j
@Component
public class MainProcess {
- @Autowired
- private MainServiceImpl mainService;
+ @Value("${mainProcessPlugin}")
+ private String mainProcessPlugin;
+ private MainProcessPluginApi mainProcessPluginApi;
// 鎵�灞炵嚎绋�
private Thread thread;
- // 棰戠巼
- private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -32,53 +28,18 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
-
- // 闂撮殧
- Thread.sleep(300);
+ if (mainProcessPluginApi == null) {
+ String className = mainProcessPlugin.contains(".") ? mainProcessPlugin : "com.zy.core.plugin." + mainProcessPlugin;
+ Class<? extends MainProcessPluginApi> clazz = Class.forName(className).asSubclass(MainProcessPluginApi.class);
+ mainProcessPluginApi = SpringUtils.getBean(clazz);
+ }
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile(); // 缁勬墭
-
- //鍒濆鍖栧疄鏃跺湴鍥�
- mainService.initRealtimeBasMap();
- // 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱
- mainService.stnToCrnStnPick();
- // 鐩樼偣鍐嶅叆搴�
- mainService.stnToCrnStnPlate();
- // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
- mainService.shuttleInExecute();
- // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
- mainService.shuttleOutExecute();
- //鍥涘悜绌挎杞︿换鍔″畬鎴�
- mainService.shuttleFinished();
- //鎻愬崌鏈轰换鍔�
- mainService.liftIoExecute();
- //鎻愬崌鏈轰换鍔″畬鎴�
- mainService.liftFinished();
- //搴撲綅绉昏浆
- mainService.locToLocExecute();
- //鎵ц灏忚溅绉诲簱浠诲姟
- mainService.shuttleMoveExecute();
- // 寮傚父淇℃伅璁板綍
- mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
- mainService.storeEmptyPlt();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
- // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- mainService.loopShuttleCharge();
- mainService.executeShuttleCharge();
-
- //鎵弿璁惧PakMk鏍囪鏄惁瓒呮椂
- mainService.scanDevicePakMk();
-
+ mainProcessPluginApi.run();
// 闂撮殧
Thread.sleep(200);
} catch (Exception e) {
--
Gitblit v1.9.1