From 52cbfeb0c93770530965955ca861f3d0a2bedd66 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 12 一月 2026 11:01:27 +0800
Subject: [PATCH] 添加重量信息
---
src/main/java/com/zy/asrs/utils/NotifyUtils.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/NotifyUtils.java b/src/main/java/com/zy/asrs/utils/NotifyUtils.java
index ba4e618..4875edf 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;
@@ -55,10 +54,12 @@
public String getKey(String notifyType, Integer device) {
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;
+ 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 {
@@ -69,6 +70,16 @@
}
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;
@@ -85,7 +96,7 @@
dto.setSuperTaskNo(superTaskNo);
//閲嶈瘯娆℃暟
- Config notifyFailTimesConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyFailTimes"));
+ Config notifyFailTimesConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "notifyRetryTimes"));
if (notifyFailTimesConfig != null) {
dto.setFailTimes(Integer.parseInt(notifyFailTimesConfig.getValue()));
}
--
Gitblit v1.9.1