From dfd8616e659669797ab8bf02422251bf4b89ed89 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 20 十月 2025 12:47:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hcddwcs-gdfs-version2' into hcddwcs-gdfs-version2
---
src/main/java/com/zy/core/MainProcess.java | 90 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4c003d9..fe79a52 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -5,12 +5,9 @@
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;
-import java.util.ArrayList;
-import java.util.Date;
/**
* WCS涓绘祦绋�
@@ -25,64 +22,77 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ private Thread licenseThread;
// 棰戠巼
- private int i = 0;
- private int j = 0;
- private int k = 0;
- private int l = 0;
private int[] autoZ = new int[]{0,0,0,0,0,0,0};
/**
* =====>> 寮�濮嬪伐浣�
*/
public void start(){
- thread = new Thread(() -> {
- try{
+ thread = new Thread(this::mainThread);
+ thread.start();
+ licenseThread = new Thread(this::licenseThreadRun);
+ licenseThread.start();
+ }
+
+ private void mainThread(){
+ try{
+ Thread.sleep(200);
+ log.info("++++++++ 寮�濮嬮獙璇佽鍙瘉 ++++++++");
+ if (!mainService.licenseVerify()){
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佸け璐� ++++++++");
+ } else {
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佹垚鍔� ++++++++");
+ }
+ } catch (Exception e) {}
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ // 闂撮殧
Thread.sleep(200);
+
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+
+ //鏇存柊浣嶇疆淇℃伅
+ mainService.updateStePosition();
+ // 浠诲姟涓嬪彂
+ mainService.DevpTaskNoRun();
+ // 浠诲姟瀹屾垚
+ mainService.rgvCompleteWrkMastSta(autoZ);
+ // 浠诲姟鍙栨秷
+ mainService.rgvCancelWrkMastSta();
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private void licenseThreadRun(){
+ while (true) {
+ try{
+ Thread.sleep(60*60*1000L);
log.info("++++++++ 寮�濮嬮獙璇佽鍙瘉 ++++++++");
if (!mainService.licenseVerify()){
SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
log.info("++++++++ 楠岃瘉璁稿彲璇佸け璐� ++++++++");
} else {
- SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+// SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
log.info("++++++++ 楠岃瘉璁稿彲璇佹垚鍔� ++++++++");
}
} catch (Exception e) {}
- while (!Thread.currentThread().isInterrupted()) {
- try {
- // 闂撮殧
- Thread.sleep(200);
-// System.out.println("寮�濮嬶細"+new Date().getTime());
-
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
-
- //鏇存柊浣嶇疆淇℃伅
- mainService.updateStePositionNearby();
- //鏇存柊浣嶇疆淇℃伅
- mainService.updateStePosition();
- // 浠诲姟涓嬪彂
- mainService.DevpTaskNoRun();
- // 浠诲姟瀹屾垚
- mainService.rgvCompleteWrkMastSta(autoZ);
- //鏇存柊浣嶇疆淇℃伅
- mainService.updateStePosition();
-// System.out.println("缁撴潫锛�"+new Date().getTime());
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- thread.start();
+ }
}
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
+ if (licenseThread != null) licenseThread.interrupt();
}
}
--
Gitblit v1.9.1