From 7852dbc52f26d515d38933c8db0976284c41517a Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期三, 10 十二月 2025 17:31:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 80 +++++++++++++++++++++++++++++++---------
src/main/java/com/zy/core/model/protocol/RgvRunProtocol.java | 11 +++++
2 files changed, 72 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/RgvRunProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvRunProtocol.java
index 82a4503..154b3ac 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvRunProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvRunProtocol.java
@@ -1,6 +1,13 @@
package com.zy.core.model.protocol;
+import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.zy.common.utils.News;
+import com.zy.core.cache.OutputQueue;
import lombok.Data;
+
+import java.util.Date;
/**
* Created by IX on 2025/02/21
@@ -10,9 +17,11 @@
private String dev = "RGV";
- private Integer RgvNo = 1;
+ private Integer rgvNo = 1;
+ private Integer rgvNo2 = 3;
public Long currentTimeMilliOld = 0L;
+ public Long currentTimeMilliOld2 = 0L;
public RgvRunProtocol(){}
}
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index f87315d..9744012 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -290,8 +290,14 @@
continue;
}
RgvRunProtocol rgvRun = RgvRunCache.getRgvRun();
- if (!rgvRun.getRgvNo().equals(slave.getId())){
- continue;
+ if (slave.getId()>2){
+ if (!rgvRun.getRgvNo2().equals(slave.getId())){
+ continue;
+ }
+ } else {
+ if (!rgvRun.getRgvNo().equals(slave.getId())){
+ continue;
+ }
}
try {
Thread.sleep(100);
@@ -299,14 +305,27 @@
// System.out.println(JSON.toJSON(rgvRun));
// 浼戠湢 1 绉�
- if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 500L) {
- rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
- } else {
- continue;
+ if (slave.getId()>2){
+ if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld2 > 500L) {
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ } else {
+ continue;
+ }
+ }else {
+ if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 500L) {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ } else {
+ continue;
+ }
}
if (!deviceDetection()) {
- rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
- rgvRun.setRgvNo(slave.getOtherId());
+ if (slave.getId()>2){
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo2(slave.getOtherId());
+ } else {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ }
RgvRunCache.updateRgvStatus(rgvRun);
if (!errorRgv.equals("鏃�")){
RgvErrCache.updateRgvErr(slave.getId(),errorRgv);
@@ -324,21 +343,36 @@
rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
}
if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)){
- rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
- rgvRun.setRgvNo(slave.getOtherId());
+ if (slave.getId()>2){
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo2(slave.getOtherId());
+ } else {
+ 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());
+ if (slave.getId()>2){
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo2(slave.getOtherId());
+ } else {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ }
RgvRunCache.updateRgvStatus(rgvRun);
RgvErrCache.updateRgvErr(slave.getId(),"灏忚溅鎺㈢墿鐗╃姸鎬佸紓甯�");
continue;
}
if (rgvTaskProtocol.getAvoid() != 0) {
- rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
- rgvRun.setRgvNo(slave.getOtherId());
+ if (slave.getId()>2){
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo2(slave.getOtherId());
+ } else {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ }
RgvRunCache.updateRgvStatus(rgvRun);
continue;
}
@@ -425,8 +459,13 @@
}
}
}
- rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
- rgvRun.setRgvNo(slave.getOtherId());
+ if (slave.getId()>2){
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo2(slave.getOtherId());
+ } else {
+ 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());
@@ -437,8 +476,13 @@
// log.error("e2:"+e2.getMessage());
}
rgvRun = RgvRunCache.getRgvRun();
- rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
- rgvRun.setRgvNo(slave.getOtherId());
+ if (slave.getId()>2){
+ rgvRun.currentTimeMilliOld2 = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo2(slave.getOtherId());
+ } else {
+ rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
+ rgvRun.setRgvNo(slave.getOtherId());
+ }
RgvRunCache.updateRgvStatus(rgvRun);
continue;
// e.printStackTrace();
--
Gitblit v1.9.1