From b791daa70e38b4e426d2b065da5bd317fe8c91f3 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 27 五月 2025 11:18:46 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/core/thread/RgvThread.java | 274 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 162 insertions(+), 112 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 723c1c1..3c70e71 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -25,10 +25,7 @@
import com.zy.core.model.RgvSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.RgvCommand;
-import com.zy.core.model.protocol.RgvProtocol;
-import com.zy.core.model.protocol.RgvTaskProtocol;
-import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.model.protocol.TaskProtocol;
+import com.zy.core.model.protocol.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -132,6 +129,7 @@
while (true) {
try {
Thread.sleep(20);
+ System.out.println("璇荤嚎绋�"+ slave.getId());
readStatus();
@@ -187,115 +185,131 @@
/**
* 浠诲姟涓嬪彂
*/
- private void taskWalkIssued2() {
- while (true) {
- try {
- // 浼戠湢 1 绉�
- Thread.sleep(100);
- if (!deviceDetection()) {
- continue;
- }
- RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
- RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
- if (rgvProtocol == null || rgvTaskProtocol == null) {
- initRgv();
- rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
- rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
- }
- if (rgvTaskProtocol.getAvoid() != 0) {
- continue;
- }
- if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE)){
- continue;
- }
- if (rgvProtocol.getLoaded() == -1){
- continue;
- }
-
- List<TaskProtocol> allTakeTaskProtocol = taskProtocolCache.getAllWalkTaskProtocol();
- for (TaskProtocol taskProtocol : allTakeTaskProtocol) {
- if (taskProtocol.getIsRunning() == 1) {//鍑嗗涓嬪彂
- // 鍙岃溅
- if (rgvOtherStatusEnable()) {
- //鍙︿竴鍙拌溅鏄惁鍏佽姝ゅ彴杞︽墽琛�
- if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
- continue;
- }
- }
- if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
- && taskProtocol.getTargetPosition()>=rgvProtocol.getRgvPos()-50){
- taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
- break;
- } else {
- TaskProtocol issued = new TaskProtocol(taskProtocol,true);
- write(issued);
- taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
- break;
- }
- }
- }
- } catch (Exception e) {
- log.error("RGV浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- try{
- DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV浠诲姟涓嬪彂绾跨▼寮傚父"+e.getMessage());
- } catch (Exception e2){
- log.error("e2:"+e2.getMessage());
- }
-// e.printStackTrace();
- }
- }
- }
+// private void taskWalkIssued2() {
+// while (true) {
+// try {
+// // 浼戠湢 1 绉�
+// Thread.sleep(100);
+// if (!deviceDetection()) {
+// continue;
+// }
+// RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+// RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+// if (rgvProtocol == null || rgvTaskProtocol == null) {
+// initRgv();
+// rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
+// rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+// }
+// if (rgvTaskProtocol.getAvoid() != 0) {
+// continue;
+// }
+// if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE)){
+// continue;
+// }
+// if (rgvProtocol.getLoaded() == -1){
+// continue;
+// }
+//
+// List<TaskProtocol> allTakeTaskProtocol = taskProtocolCache.getAllWalkTaskProtocol();
+// for (TaskProtocol taskProtocol : allTakeTaskProtocol) {
+// if (taskProtocol.getIsRunning() == 1) {//鍑嗗涓嬪彂
+// // 鍙岃溅
+// if (rgvOtherStatusEnable()) {
+// //鍙︿竴鍙拌溅鏄惁鍏佽姝ゅ彴杞︽墽琛�
+// if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
+// continue;
+// }
+// }
+// if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
+// && taskProtocol.getTargetPosition()>=rgvProtocol.getRgvPos()-50){
+// taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
+// break;
+// } else {
+// TaskProtocol issued = new TaskProtocol(taskProtocol,true);
+// write(issued);
+// taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
+// break;
+// }
+// }
+// }
+// } catch (Exception e) {
+// log.error("RGV浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// try{
+// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+// deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV浠诲姟涓嬪彂绾跨▼寮傚父"+e.getMessage());
+// } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+// }
+//// e.printStackTrace();
+// }
+// }
+// }
/**
* 婕父
*/
- private void taskWalkIssued() {
- while (true) {
- try {
- // 浼戠湢 1 绉�
- Thread.sleep(100);
-
- if (!deviceDetection()) {
- continue;
- }
- RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
- if (rgvTaskProtocol == null) {
- initRgv();
- rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
- }
- if (rgvTaskProtocol.getAvoid() != 1) {
- continue;
- }
- TaskProtocol issued = new TaskProtocol();
- issued.setTaskNo(32222L);
- issued.setTargetPosition(rgvTaskProtocol.getAvoidingTheDestination());
- issued.setTaskStatus(1);
- issued.setDirection(true);
- write(issued);
- rgvTaskProtocol.setAvoid(0);
-
- Thread.sleep(200);
- RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
-
- } catch (Exception e) {
- log.error("RGV琛岃蛋浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛�" + e.getMessage());
-// e.printStackTrace();
- }
- }
- }
+// private void taskWalkIssued() {
+// while (true) {
+// try {
+// // 浼戠湢 1 绉�
+// Thread.sleep(100);
+//
+// if (!deviceDetection()) {
+// continue;
+// }
+// RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+// if (rgvTaskProtocol == null) {
+// initRgv();
+// rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+// }
+// if (rgvTaskProtocol.getAvoid() != 1) {
+// continue;
+// }
+// TaskProtocol issued = new TaskProtocol();
+// issued.setTaskNo(32222L);
+// issued.setTargetPosition(rgvTaskProtocol.getAvoidingTheDestination());
+// issued.setTaskStatus(1);
+// issued.setDirection(true);
+// write(issued);
+// rgvTaskProtocol.setAvoid(0);
+//
+// Thread.sleep(200);
+// RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
+//
+// } catch (Exception e) {
+// log.error("RGV琛岃蛋浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛�" + e.getMessage());
+//// e.printStackTrace();
+// }
+// }
+// }
/**
* 浠诲姟涓嬪彂
*/
private void taskIssued() {
while (true) {
+ RgvRunProtocol rgvRun = RgvRunCache.getRgvRun();
+ if (!rgvRun.getRgvNo().equals(slave.getId())){
+ continue;
+ }
try {
- // 浼戠湢 1 绉�
Thread.sleep(50);
- if (!deviceDetection()) {
+ rgvRun = RgvRunCache.getRgvRun();
+ System.out.println(JSON.toJSON(rgvRun));
+
+ // 浼戠湢 1 绉�
+ if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 1500) {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ } else {
continue;
}
+ if (!deviceDetection()) {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ RgvRunCache.updateRgvStatus(rgvRun);
+ continue;
+ }
+
RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
if (rgvProtocol == null || rgvTaskProtocol == null) {
@@ -303,10 +317,16 @@
rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
}
- if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE)){
+ if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)){
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ RgvRunCache.updateRgvStatus(rgvRun);
continue;
}
if (rgvProtocol.getLoaded() == -1){
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ RgvRunCache.updateRgvStatus(rgvRun);
continue;
}
if (rgvTaskProtocol.getAvoid() != 0) {
@@ -319,10 +339,13 @@
write(issued);
rgvTaskProtocol.setAvoid(0);
- try{Thread.sleep(50L);} catch (Exception e){}
+// try{Thread.sleep(50L);} catch (Exception e){}
RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
}
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ RgvRunCache.updateRgvStatus(rgvRun);
continue;
}
@@ -335,7 +358,7 @@
if (rgvOtherStatusEnable()) {
//鍙︿竴鍙拌溅鏄惁鍏佽姝ゅ彴杞︽墽琛�
if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
- continue;
+ break;
}
}
if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
@@ -357,7 +380,7 @@
if (rgvOtherStatusEnable()) {
//鍙︿竴鍙拌溅鏄惁鍏佽姝ゅ彴杞︽墽琛�
if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
- continue;
+ break;
}
}
if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
@@ -366,13 +389,12 @@
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, taskProtocol.getTargetPositionStaNoPlcId());
StaProtocol staProtocol = devpThread.getStation().get(taskProtocol.getTargetPositionStaNo());
if (staProtocol == null ) {
- continue;
+ break;
}
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (!staProtocol.isAutoing() || staProtocol.isLoading()
- || staProtocol.getWorkNo() != 0
){
- continue;
+ break;
}
}
TaskProtocol issued = new TaskProtocol(taskProtocol);
@@ -387,6 +409,9 @@
}
}
}
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ RgvRunCache.updateRgvStatus(rgvRun);
} catch (Exception e) {
log.error("RGV浠诲姟涓嬪彂绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
try{
@@ -395,10 +420,34 @@
} catch (Exception e2){
log.error("e2:"+e2.getMessage());
}
+ rgvRun = RgvRunCache.getRgvRun();
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ RgvRunCache.updateRgvStatus(rgvRun);
+ continue;
// e.printStackTrace();
}
}
}
+ public boolean isSignRgvTaskProtocol() {
+ RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
+ if (rgvTaskProtocol == null) {
+ return false;
+ }
+ RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
+ RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
+
+ if (rgvProtocolOther == null) {
+ return false;
+ }
+ if (rgvProtocolOther.statusEnable) {
+ if (rgvTaskProtocolOther == null) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public boolean deviceDetection() {
RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
@@ -408,11 +457,13 @@
return false;
}
if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1 || rgvProtocol.getRgvPosDestination() == 0L
- || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
+ || ((!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
return false;
}
RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
+// System.out.println("rgvTaskProtocol:"+slave.getId()+"sign:"+rgvTaskProtocol.isSignRun()+"/n"+
+// "rgvTaskProtocolOther:"+slave.getOtherId()+"sign:"+rgvTaskProtocolOther.isSignRun()+"/n");
if (rgvProtocolOther == null) {
return false;
@@ -447,8 +498,7 @@
Long[][] avoidRange = new TrackRangeUtils().avoidRange(slave, trackEntireLength, trackBenchmark, avoidDistance);
if (new TrackRangeUtils().IsItSmall(slave)) {
-
- if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)) {
+ if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE) && (Math.abs(rgvProtocolOther.getRgvPos() - rgvProtocolOther.getRgvPosDestination())<50)) {
if ((rgvProtocolOther.getRgvPos() - rgvProtocolOther.getCarBodyJiaoMing())
- (targetPosition + rgvProtocol.getCarBodyKunPeng())
> avoidDistance - 50) {//鏃犻渶閬胯
@@ -469,7 +519,6 @@
if (signNowPosRun){
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (!staProtocol.isAutoing() || staProtocol.isLoading()
- || staProtocol.getWorkNo() != 0
){
if (targetPosition.equals(nowPosRunTask.getTargetPosition())){
if (rgvProtocolOther.getRgvPosDestination() >= rgvProtocolOther.getRgvPos()-50) {
@@ -585,7 +634,7 @@
}
}
} else {
- if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)) {
+ if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE) && (Math.abs(rgvProtocolOther.getRgvPos() - rgvProtocolOther.getRgvPosDestination())<50)) {
if ((targetPosition - rgvProtocol.getCarBodyJiaoMing())
- (rgvProtocolOther.getRgvPos() + rgvProtocolOther.getCarBodyKunPeng())
> avoidDistance - 50) {//鏃犻渶閬胯
@@ -605,7 +654,6 @@
if (signNowPosRun){
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (!staProtocol.isAutoing() || staProtocol.isLoading()
- || staProtocol.getWorkNo() != 0
){
if (targetPosition.equals(nowPosRunTask.getTargetPosition())){
if (rgvProtocolOther.getRgvPosDestination() <= rgvProtocolOther.getRgvPos() + 50) {
@@ -825,6 +873,7 @@
if (rgvProtocol.getRgvPosDestination()==0L){
rgvProtocol.setRgvPosDestination(rgvProtocol.getRgvPos());
}
+
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 8));
rgvProtocol.setTaskNo((long)siemensNet.getByteTransform().TransInt32(result.Content, 10));
@@ -844,6 +893,7 @@
rgvProtocol.setErr4(status[11]);
rgvProtocol.setErr5(status[12]);
rgvProtocol.setErr6(status[13]);
+ System.out.println("璇荤嚎绋�"+ slave.getId()+"---"+JSON.toJSONString(rgvProtocol));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
// // 宸ヤ綅1澶嶄綅淇″彿
--
Gitblit v1.9.1