From b172bbb35399bd3958f177a75361070a114fc19c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 17 三月 2026 16:45:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0
---
src/main/java/com/zy/core/plugin/NormalProcess.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 5973403..9dadea4 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -332,7 +332,7 @@
Integer stationId = data.getInteger("stationId");
Integer deviceNo = data.getInteger("deviceNo");
- Object lock = redisUtil.get(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT.key + stationId);
+ Object lock = redisUtil.get(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId);
if(lock != null){
continue;
}
@@ -368,7 +368,7 @@
//缂撳瓨鍛戒护鐩稿悓锛屼笅鍙戝懡浠ゆ敼鍙樺叆搴撲换鍔″彿淇℃伅
MessageQueue.offer(SlaveType.Devp, deviceNo, new Task(2, command));
- redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT.key + stationId, "lock", 5);
+ redisUtil.set(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId, "lock", 5);
}
}
--
Gitblit v1.9.1