From 05149e21b3af6534c2d8c3a35c3ee3672ed09af2 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期六, 24 一月 2026 11:13:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 4 ++--
src/main/java/com/zy/core/cache/TaskProtocolCache.java | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/cache/TaskProtocolCache.java b/src/main/java/com/zy/core/cache/TaskProtocolCache.java
index f2f01c6..77e5865 100644
--- a/src/main/java/com/zy/core/cache/TaskProtocolCache.java
+++ b/src/main/java/com/zy/core/cache/TaskProtocolCache.java
@@ -154,6 +154,44 @@
// lock.readLock().unlock(); // 閲婃斁璇婚攣
}
}
+ /**
+ * 鏌ヨ鏄惁鏈夊彲鎵ц浠诲姟
+ */
+ public TaskProtocol getNowPosRunTask3(Long targetPosition) {
+// lock.readLock().lock(); // 鍔犺閿�
+ try {
+ for (TaskProtocol task : cache.values()) {
+ if (task.getTaskStatus()==1) {
+ long runPos = Math.abs(task.getTargetPosition() - targetPosition);
+ if (runPos<50) {
+ return task;
+ }
+ return null;
+ }
+ }
+ for (TaskProtocol task : cache.values()) {
+ if (task.getTaskStatus()==2) {
+ long runPos = Math.abs(task.getTargetPosition() - targetPosition);
+ if (runPos<50) {
+ return task;
+ }
+ return null;
+ }
+ }
+ for (TaskProtocol task : cache.values()) {
+ if (task.getTaskStatus()==3) {
+ long runPos = Math.abs(task.getTargetPosition() - targetPosition);
+ if (runPos<50) {
+ return task;
+ }
+ return null;
+ }
+ }
+ return null; // 杩斿洖鍓湰
+ } finally {
+// lock.readLock().unlock(); // 閲婃斁璇婚攣
+ }
+ }
/**
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index a6a852d..d74d526 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -522,7 +522,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){
@@ -727,7 +727,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){
--
Gitblit v1.9.1