From a98f92c9bb825deb54752ccac3c9b7b8ed20695d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 十一月 2025 16:42:11 +0800
Subject: [PATCH] *废弃啦
---
src/main/java/com/zy/core/MainProcess.java | 102 +++++++++++---------------------------------------
1 files changed, 23 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 7fd51be..7e206fa 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -24,7 +24,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- private Thread armThread;
+ private Thread licenseThread;
// 棰戠巼
private int i = 0;
private int k = 0;
@@ -36,9 +36,8 @@
public void start(){
thread = new Thread(this::crnAndDevRun);
thread.start();
-
- armThread = new Thread(this::roboticArmDispatch);
- armThread.start();
+ licenseThread = new Thread(this::licenseThreadRun);
+ licenseThread.start();
}
private void crnAndDevRun() {
while (!Thread.currentThread().isInterrupted()) {
@@ -51,11 +50,6 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
- // 婕旂ず
-// mainService.crnDemoOfLocMove1();
- //鍒锋柊RGV鍦板浘
- mainService.refreshRgvMap();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
@@ -88,59 +82,6 @@
//鍫嗗灈鏈鸿鎺ヤ换鍔$敓鎴�
mainService.connectWrk(10);
-// mainService.outOfDevp(11);
-
- if (i>10){
- //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
- mainService.autoEmptyOut();
- //绌烘墭鐩樿嚜鍔ㄥ叆搴�
- mainService.autoEmptyIn();
- i=0;
- }
- i++;
-
- // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
-// i++;
-// if (i > 1) {
-// mainService.ioConvert();
-// i = 0;
-// }
-
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-//
- //瀹屾垚灏忚溅浠诲姟
-// mainService.rgvCompleteWrkMastSta();
-
-// //鎵ц灏忚溅绌烘澘鎼繍浠诲姟
-// mainService.rgvRunWrkMastEmptyStaPut();//鏀�
-// mainService.rgvRunWrkMastEmptyStaTake();//鍙�
-// if (rgcWrk){
-// //鎵ц灏忚溅璐х墿鎼繍浠诲姟
-// mainService.rgvRunWrkMastFullSta();
-// rgcWrk = false;
-// }else {
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-// rgcWrk = true;
-// }
-
-
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
- k++;
-
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- try{
- //RGV灏忚溅鍑哄叆搴撳彇璐т笅鍙�
- mainService.rgvIoExecute(11);
- }catch (Exception e){
- log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
- }
-// //瀹屾垚灏忚溅浠诲姟
- mainService.rgvTaskComplete();
-
- //宸ヤ綅绉诲姩
-// mainService.rgvStaMove();
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
} catch (Exception e) {
e.printStackTrace();
@@ -148,35 +89,38 @@
}
}
- private void roboticArmDispatch() {
- while (!Thread.currentThread().isInterrupted()) {
- try {
-
- // 闂撮殧
- Thread.sleep(500);
+ private void licenseThreadRun(){
+ int i = 0;
+ while (true) {
+ try{
+ Thread.sleep(60*60*1000L);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- //arm浠诲姟瀹屾垚
- mainService.armMissionAccomplished();
- mainService.armMissionAccomplishedScanToCheckIn();
-
- //arm浠诲姟涓嬪彂
- mainService.armTaskAssignment();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+ log.info("++++++++ 寮�濮嬮獙璇佽鍙瘉 ++++++++");
+ if (!mainService.licenseVerify()){
+ if (i>6){
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佸け璐� ++++++++");
+ i = 0;
+ } else {
+ i++;
+ }
+ } else {
+// SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佹垚鍔� ++++++++");
+ }
+ } catch (Exception e) {}
}
}
@PreDestroy
public void shutDown(){
if (thread != null) thread.interrupt();
- if (armThread != null) armThread.interrupt();
+ if (licenseThread != null) licenseThread.interrupt();
}
}
--
Gitblit v1.9.1