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 | 126 ++++++++++-------------------------------
1 files changed, 31 insertions(+), 95 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index fbb579c..7e206fa 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -24,8 +24,7 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
- private Thread armThread;
- private Thread agvThread;
+ private Thread licenseThread;
// 棰戠巼
private int i = 0;
private int k = 0;
@@ -37,12 +36,8 @@
public void start(){
thread = new Thread(this::crnAndDevRun);
thread.start();
-
- armThread = new Thread(this::roboticArmDispatch);
- armThread.start();
-
- agvThread = new Thread(this::agvDispatch);
- agvThread.start();
+ licenseThread = new Thread(this::licenseThreadRun);
+ licenseThread.start();
}
private void crnAndDevRun() {
while (!Thread.currentThread().isInterrupted()) {
@@ -55,11 +50,6 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
- // 婕旂ず
-// mainService.crnDemoOfLocMove1();
- //鍒锋柊RGV鍦板浘
- mainService.refreshRgvMap();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
@@ -92,99 +82,45 @@
//鍫嗗灈鏈鸿鎺ヤ换鍔＄敓鎴�
mainService.connectWrk(10);
-// mainService.outOfDevp(11);
- if (i>10){
- //绌烘墭鐩樿嚜鍔ㄥ嚭搴�
- mainService.autoEmptyOut();
- //绌烘墭鐩樿嚜鍔ㄥ叆搴�
- mainService.autoEmptyIn();
- i=0;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ private void licenseThreadRun(){
+ int i = 0;
+ while (true) {
+ try{
+ Thread.sleep(60*60*1000L);
+
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
}
- i++;
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
- k++;
-
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- try{
- //RGV灏忚溅鍑哄叆搴撳彇璐т笅鍙�
- mainService.rgvIoExecute(11);
- if(k > 2){
- mainService.rgvOutExecute();
- k = 0;
+ log.info("++++++++ 寮�濮嬮獙璇佽鍙瘉 ++++++++");
+ if (!mainService.licenseVerify()){
+ if (i>6){
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佸け璐� ++++++++");
+ i = 0;
+ } else {
+ i++;
}
- }catch (Exception e){
- e.printStackTrace();
- log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+ } else {
+// SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+ log.info("++++++++ 楠岃瘉璁稿彲璇佹垚鍔� ++++++++");
}
-// //瀹屾垚灏忚溅浠诲姟
- mainService.rgvTaskComplete();
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- private void roboticArmDispatch() {
- while (!Thread.currentThread().isInterrupted()) {
- try {
-
- // 闂撮殧
- Thread.sleep(400);
-
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
-
- //arm浠诲姟瀹屾垚
- mainService.armMissionAccomplished();//4==>5
- mainService.armMissionAccomplishedScanToCheckIn();//3===銆�4
-
- //arm浠诲姟涓嬪彂
- mainService.armTaskAssignment();//0===銆�1
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- private void agvDispatch() {
- while (!Thread.currentThread().isInterrupted()) {
- try {
-
- // 闂撮殧
- Thread.sleep(400);
-
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
- //agv浠诲姟涓嬪彂
-// mainService.agvTaskAssignment0();//0===銆�1 AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
-// mainService.agvTaskAssignment1();//0===銆�1 AGV搴撲綅==銆婣GV搴撲綅 1
-// mainService.agvTaskAssignment2();//0===銆�1 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2
-// mainService.agvTaskAssignment3();//0===銆�1 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
-//
-//
-// mainService.agvTaskCreateFull();//浠诲姟鐢熸垚 鍑哄簱鍙�==銆婣GV搴撲綅
-// mainService.agvTaskCreateEmpty();//浠诲姟鐢熸垚 鍑哄簱鍙�==銆婣GV搴撲綅
-// mainService.agvTaskCreateR();//浠诲姟鐢熸垚 AGV搴撲綅==銆嬪叆搴撳彛
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+ } 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