From 22a623b08a221984b8eb960af9a83484418a26b9 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期四, 05 三月 2026 15:42:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 9744012..0eb2902 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -588,7 +588,7 @@
RgvThread rgvThreadOther = (RgvThread) SlaveConnection.get(SlaveType.Rgv, slave.getOtherId());
TaskProtocolCache taskProtocolCacheOther = rgvThreadOther.getTaskProtocolCache();
- TaskProtocol nowPosRunTask = taskProtocolCacheOther.getNowPosRunTask(rgvProtocolOther.getRgvPos());
+ TaskProtocol nowPosRunTask = taskProtocolCacheOther.getNowPosRunTask3(rgvProtocolOther.getRgvPos());
if (!Cools.isEmpty(nowPosRunTask)){
boolean signNowPosRun = true;
if (nowPosRunTask.getTaskStatus()==3){
@@ -673,7 +673,12 @@
}
}
signNowPosRun =false;
+ } else {
+ signNowPosRun =false;
}
+ }
+ if (new TrackRangeUtils().IsItSmall(slave)){
+ signNowPosRun = false;
}
} else {
long twoPos = Math.abs(nowPosRunTask2.getTargetPosition() - rgvProtocolOther.getRgvPos());
@@ -683,7 +688,13 @@
}
if (Math.abs(onePos - twoPos)>100){
if (onePos-50>twoPos+50){
+ signNowPosRun =true;
+ } else {
signNowPosRun =false;
+ }
+ } else {
+ if (new TrackRangeUtils().IsItSmall(slave)){
+ signNowPosRun = false;
}
}
}
@@ -793,7 +804,7 @@
} else {
RgvThread rgvThreadOther = (RgvThread) SlaveConnection.get(SlaveType.Rgv, slave.getOtherId());
TaskProtocolCache taskProtocolCacheOther = rgvThreadOther.getTaskProtocolCache();
- TaskProtocol nowPosRunTask = taskProtocolCacheOther.getNowPosRunTask(rgvProtocolOther.getRgvPos());
+ TaskProtocol nowPosRunTask = taskProtocolCacheOther.getNowPosRunTask3(rgvProtocolOther.getRgvPos());
if (!Cools.isEmpty(nowPosRunTask)){
boolean signNowPosRun = true;
if (nowPosRunTask.getTaskStatus()==3){
@@ -880,7 +891,12 @@
}
}
signNowPosRun =false;
+ } else {
+ signNowPosRun =false;
}
+ }
+ if (new TrackRangeUtils().IsItSmall(slave)){
+ signNowPosRun = false;
}
} else {
long twoPos = Math.abs(nowPosRunTask2.getTargetPosition() - rgvProtocolOther.getRgvPos());
@@ -890,8 +906,14 @@
}
if (Math.abs(onePos - twoPos)>100){
if (onePos-50>twoPos+50){
+ signNowPosRun =true;
+ } else {
signNowPosRun =false;
}
+ } else {
+ if (new TrackRangeUtils().IsItSmall(slave)){
+ signNowPosRun = false;
+ }
}
}
}
--
Gitblit v1.9.1