From 190201789934d7b2b4344e0eba6b4a0c2e38f54e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 27 八月 2025 14:34:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java | 11 -----------
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 4 +++-
src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 8 --------
pom.xml | 2 +-
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 3 ++-
5 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0e54fd9..aca0a6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<cool.version>3.4.0</cool.version>
<mysql-driver.version>5.1.47</mysql-driver.version>
<mybatis-plus.version>2.3.2</mybatis-plus.version>
- <fastjson.version>1.2.58</fastjson.version>
+ <fastjson.version>1.2.83</fastjson.version>
<springfox.version>2.7.0</springfox.version>
</properties>
diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
index c5b94b5..08041ee 100644
--- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java
@@ -200,14 +200,6 @@
return this.taskNo == null ? 0 : this.taskNo;
}
- public synchronized void setSyncTaskNo(Integer taskNo) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- if (null != redisUtil) {
- redisUtil.set(RedisKeyType.LIFT_FLAG.key + this.liftNo, taskNo);
- this.taskNo = taskNo;
- }
- }
-
public String getModel$() {
if (this.model == null) {
return "";
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index c4db647..126af7d 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -247,17 +247,6 @@
return this.taskNo == null ? 0 : this.taskNo;
}
- public synchronized void setSyncTaskNo(Integer taskNo) {
- RedisUtil redisUtil = null;
- try {
- redisUtil = SpringUtils.getBean(RedisUtil.class);
- }catch (Exception e) {}
- if (null != redisUtil) {
- redisUtil.set(RedisKeyType.SHUTTLE_FLAG.key + this.shuttleNo, taskNo);
- this.taskNo = taskNo;
- }
- }
-
@Override
public ShuttleProtocol clone() {
try {
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index 0ff3b77..9918060 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -483,7 +483,8 @@
@Override
public boolean setSyncTaskNo(Integer taskNo) {
- this.liftProtocol.setSyncTaskNo(taskNo);
+ redisUtil.setSync(RedisKeyType.LIFT_FLAG.key + liftProtocol.getLiftNo(), taskNo);
+ this.liftProtocol.setTaskNo(taskNo);
return true;
}
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index aba6db6..e167988 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -762,13 +762,15 @@
@Override
public synchronized boolean setTaskNo(Integer taskNo) {
+ redisUtil.set(RedisKeyType.SHUTTLE_FLAG.key + shuttleProtocol.getShuttleNo(), taskNo);
this.shuttleProtocol.setTaskNo(taskNo);
return true;
}
@Override
public synchronized boolean setSyncTaskNo(Integer taskNo) {
- this.shuttleProtocol.setSyncTaskNo(taskNo);
+ redisUtil.setSync(RedisKeyType.SHUTTLE_FLAG.key + shuttleProtocol.getShuttleNo(), taskNo);
+ this.shuttleProtocol.setTaskNo(taskNo);
return true;
}
--
Gitblit v1.9.1