From 0860a6d956dd77010d063ed06a65d70c9dab119c Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期二, 17 三月 2026 16:42:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/NormalProcess.java | 4 ++--
src/main/java/com/zy/core/enums/RedisKeyType.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 0c55f06..0fe6c84 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,5 +1,6 @@
package com.zy.common.service;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
@@ -277,7 +278,7 @@
data.put("command", command);
data.put("stationId", command.getStationId());
data.put("deviceNo", 1);
- redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + command.getStationId(), JSONObject.toJSONString(data), 60 * 5);
+ redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + command.getStationId(), JSON.toJSONString(data), 60 * 5);
if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
wrkMast.setCrnNo(findCrnResult.getCrnNo());
diff --git a/src/main/java/com/zy/core/enums/RedisKeyType.java b/src/main/java/com/zy/core/enums/RedisKeyType.java
index aade0c5..d933b77 100644
--- a/src/main/java/com/zy/core/enums/RedisKeyType.java
+++ b/src/main/java/com/zy/core/enums/RedisKeyType.java
@@ -59,7 +59,7 @@
PLANNER_SCHEDULE("planner_schedule_"),
RECEIVE_IN_TASK_CHANGE_STATION_TASK("receive_in_task_change_station_task_"),
- RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT("receive_in_task_change_station_task_send_limit_"),
+ SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK("send_limit_receive_in_task_change_station_task_"),
;
public String key;
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