From 959139e7a5d89e8498d731082a949310ae1c6fcf Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 05 十二月 2025 14:32:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/NotifyUtils.java | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/NotifyUtils.java b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
index 18dc8ab..5ad1a73 100644
--- a/src/main/java/com/zy/asrs/utils/NotifyUtils.java
+++ b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
@@ -1,6 +1,5 @@
package com.zy.asrs.utils;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.SnowflakeIdWorker;
import com.zy.asrs.domain.NotifyDto;
@@ -27,16 +26,16 @@
@Autowired
private ConfigService configService;
- public synchronized boolean notify(String notifyType, Integer device, String taskNo, NotifyMsgType msgType) {
- return append(notifyType, device, taskNo, msgType, null);
+ public synchronized boolean notify(String notifyType, Integer device, String taskNo, String superTaskNo, NotifyMsgType msgType) {
+ return append(notifyType, device, taskNo, superTaskNo, msgType, null);
}
- public synchronized boolean notify(String notifyType, Integer device, String taskNo, NotifyMsgType msgType, String data) {
- return append(notifyType, device, taskNo, msgType, data);
+ public synchronized boolean notify(String notifyType, Integer device, String taskNo, String superTaskNo, NotifyMsgType msgType, String data) {
+ return append(notifyType, device, taskNo, superTaskNo, 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,35 +52,36 @@
return list;
}
- public String getKey(String deviceType, Integer device) {
- SlaveType type = SlaveType.findInstance(deviceType);
- if (type == null) {
- return null;
- }
+ public String getKey(String notifyType, Integer device) {
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;
+ if (notifyType.equals(String.valueOf(SlaveType.Crn))) {
+ key = RedisKeyType.QUEUE_CRN.key + device;
+ } else if (notifyType.equals(String.valueOf(SlaveType.Devp))) {
+ key = RedisKeyType.QUEUE_DEVP.key + device;
+ } else if (notifyType.equals(String.valueOf(SlaveType.Rgv))) {
+ key = RedisKeyType.QUEUE_RGV.key + device;
+ } 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 = null;
- if (notifyType.equals(String.valueOf(SlaveType.Shuttle))) {
- key = RedisKeyType.QUEUE_SHUTTLE.key + device;
- } else if (notifyType.equals(String.valueOf(SlaveType.ForkLift))) {
- key = RedisKeyType.QUEUE_FORK_LIFT.key + device;
- } else if (notifyType.equals("task")) {
- key = RedisKeyType.QUEUE_FORK_LIFT.key + device;
- } else {
+ private boolean append(String notifyType, Integer device, String taskNo, String superTaskNo, NotifyMsgType msgType, String data) {
+ boolean notifyEnable = true;
+ Config notifyEnableConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyEnable"));
+ if (notifyEnableConfig != null) {
+ notifyEnable = notifyEnableConfig.getValue().equals("Y");
+ }
+
+ if (!notifyEnable) {
+ return false;
+ }
+
+ String key = getKey(notifyType, device);
+ if (key == null) {
return false;
}
@@ -93,6 +93,7 @@
dto.setMsgDesc(msgType.desc);
dto.setData(data);
dto.setTaskNo(taskNo);
+ dto.setSuperTaskNo(superTaskNo);
//閲嶈瘯娆℃暟
Config notifyFailTimesConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyFailTimes"));
--
Gitblit v1.9.1