From 9d2f7ee6bcef26b55108821dc2dc08dbb1eb4c0a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 12 二月 2025 09:51:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/NotifyUtils.java | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/NotifyUtils.java b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
index 8fb8930..431bf18 100644
--- a/src/main/java/com/zy/asrs/utils/NotifyUtils.java
+++ b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
@@ -35,8 +35,8 @@
return append(notifyType, device, taskNo, msgType, data);
}
- public synchronized List<String> takeKeys(String deviceType, Integer device) {
- String key = getKey(deviceType, device);
+ public synchronized List<String> takeKeys(String notifyType, Integer device) {
+ String key = getKey(notifyType, device);
if(key == null){
return null;
}
@@ -53,27 +53,7 @@
return list;
}
- public String getKey(String deviceType, Integer device) {
- SlaveType type = SlaveType.findInstance(deviceType);
- if (type == null) {
- return null;
- }
- String key = null;
- switch (type) {
- case Shuttle:
- key = RedisKeyType.QUEUE_SHUTTLE.key + device;
- break;
- case ForkLift:
- key = RedisKeyType.QUEUE_FORK_LIFT.key + device;
- break;
- default:
- return null;
- }
-
- return key;
- }
-
- private boolean append(String notifyType, Integer device, String taskNo, NotifyMsgType msgType, String data) {
+ public String getKey(String notifyType, Integer device) {
String key = null;
if (notifyType.equals(String.valueOf(SlaveType.Shuttle))) {
key = RedisKeyType.QUEUE_SHUTTLE.key + device;
@@ -82,6 +62,15 @@
} else if (notifyType.equals("task")) {
key = RedisKeyType.QUEUE_TASK.key + device;
} else {
+ return null;
+ }
+
+ return key;
+ }
+
+ private boolean append(String notifyType, Integer device, String taskNo, NotifyMsgType msgType, String data) {
+ String key = getKey(notifyType, device);
+ if(key == null){
return false;
}
--
Gitblit v1.9.1