From 1bc0b18a88ed90fa19e0c050d7befecb2a16bb8a Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期五, 10 十月 2025 12:38:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/MainProcess.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 8d87aca..5770eec 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,18 +1,13 @@
package com.zy.core;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.impl.MainServiceImpl;
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;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
/**
* WCS涓绘祦绋�
@@ -27,6 +22,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ private Thread threadVerify;
// 棰戠巼
private int[] autoZ = new int[]{0,0,0,0,0,0,0};
@@ -58,23 +54,12 @@
//鏇存柊浣嶇疆淇℃伅
mainService.updateStePosition();
- // 浠诲姟鎺掑簭
- List<List<List<WrkMast>>> wrkMastListAll = mainService.DevpTaskNoRun();
// 浠诲姟涓嬪彂
- mainService.taskDown(wrkMastListAll);;
+ mainService.DevpTaskNoRun();
// 浠诲姟瀹屾垚
mainService.rgvCompleteWrkMastSta(autoZ);
-
-// //鏇存柊浣嶇疆淇℃伅
-// mainService.updateStePositionNearby(null);
-// //鏇存柊浣嶇疆淇℃伅
-// mainService.updateStePosition();
-// // 浠诲姟涓嬪彂
-// mainService.DevpTaskNoRun();
-// // 浠诲姟瀹屾垚
-// mainService.rgvCompleteWrkMastSta(autoZ);
-// //鏇存柊浣嶇疆淇℃伅
-// mainService.updateStePosition();
+ // 浠诲姟鍙栨秷
+ mainService.rgvCancelWrkMastSta();
} catch (Exception e) {
e.printStackTrace();
@@ -82,11 +67,40 @@
}
});
thread.start();
+ threadVerify = new Thread(() -> {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ // 闂撮殧
+ Thread.sleep(60000);
+
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+
+ try{
+ 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) {}
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ threadVerify.start();
}
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
+ if (threadVerify != null) threadVerify.interrupt();
}
}
--
Gitblit v1.9.1