From 5ab0056ca5a7f1501bce4783db289e3e94de62b0 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期六, 28 六月 2025 12:49:32 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/RgvThread.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/core/MainProcess.java | 54 ++++++++++++++++++++++++++++--------------------------
3 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3f263f5..91fe3ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1423,7 +1423,7 @@
(int) crnProtocol.getAlarm(), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
- now, // 娣诲姞鏃堕棿
+ taskWrk.getCreateTime(), // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
null, // 娣诲姞浜哄憳
now, // 淇敼鏃堕棿
null, // 淇敼浜哄憳
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 06c14c4..cf57af9 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,6 +22,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ private Thread thread2;
/**
* =====>> 寮�濮嬪伐浣�
@@ -30,59 +31,60 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
-
// 闂撮殧
Thread.sleep(400);
-
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
// mainService.generateStoreWrkFileIsEmptyMk(); // 缁勬墭 绌烘墭
-
mainService.generateStoreWrkFileWalk(); // 浠诲姟涓嬪彂
-
-
-// // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
-// mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
// 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
mainService.storeFinished();
- Thread.sleep(100);
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍑哄簱 ===>> 鍫嗗灈鏈�5鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
-// mainService.crnStnToOutStnSou();
-
- // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
- mainService.recCrnErr();
-
// 浠诲姟涓嬪彂
mainService.taskStart();
-
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
-// mainService.ledExecute(9);
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-// mainService.ledReset(10);
-
-
-
-
} catch (Exception e) {
e.printStackTrace();
}
}
});
thread.start();
+
+ thread2 = new Thread(() -> {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ // 闂撮殧
+ Thread.sleep(200);
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+ mainService.crnStnToOutStn();
+ // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ mainService.recCrnErr();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈�5鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
+// mainService.crnStnToOutStnSou();
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+// mainService.ledExecute(9);
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+// mainService.ledReset(10);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ thread2.start();
}
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
+ if (thread2 != null) thread2.interrupt();
}
}
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 7ee4342..cd40f7a 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -344,7 +344,7 @@
// System.out.println(JSON.toJSON(rgvRun));
// 浼戠湢 1 绉�
- if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 500) {
+ if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 500L) {
rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
} else {
continue;
--
Gitblit v1.9.1