From 6182cc11c3e93610df7fda87611d2ca807c6354c Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期四, 16 十月 2025 14:28:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/DeviceMsgUtils.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/DeviceMsgUtils.java b/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
index b30d9c2..dd78cef 100644
--- a/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
+++ b/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
@@ -78,18 +78,23 @@
public String sendDeviceMsg(SlaveType deviceType, Integer deviceId, DeviceMsgModel deviceMsgModel) {
String key = parseDeviceMsgKey(deviceType, deviceId) + System.currentTimeMillis();
- redisUtil.set(key, deviceMsgModel, 60 * 60 * 24);
+ redisUtil.set(key, deviceMsgModel, 60 * 60);
return key;
}
public String sendDeviceCommand(SlaveType deviceType, Integer deviceId, DeviceCommandMsgModel command) {
String key = parseDeviceCommandMsgKey(deviceType, deviceId) + System.currentTimeMillis();
- redisUtil.set(key, command, 60 * 60 * 24);
+ command.setResultKey(key);
+ redisUtil.set(key, command, 60 * 60);
return key;
}
public void sendDeviceConfig(String allDevices) {
redisUtil.set(RedisKeyType.DEVICE_CONFIG.key, allDevices);
+ }
+
+ public void sendFakeDeviceConfig(String fakeDevices) {
+ redisUtil.set(RedisKeyType.FAKE_DEVICE_CONFIG.key, fakeDevices);
}
public TreeSet<String> getDeviceMsgListKey(SlaveType deviceType, Integer deviceId) {
@@ -125,6 +130,8 @@
return RedisKeyType.DEVICE_SHUTTLE_MSG_KEY_.key + deviceId + "_";
} else if (deviceType.equals(SlaveType.ForkLift)) {
return RedisKeyType.DEVICE_FORK_LIFT_MSG_KEY_.key + deviceId + "_";
+ } else if (deviceType.equals(SlaveType.Lift)) {
+ return RedisKeyType.DEVICE_LIFT_MSG_KEY_.key + deviceId + "_";
}else {
throw new CoolException("璁惧绫诲瀷鏈畾涔�");
}
@@ -139,6 +146,8 @@
return RedisKeyType.DEVICE_SHUTTLE_COMMAND_MSG_KEY.key + deviceId + "_";
} else if (deviceType.equals(SlaveType.ForkLift)) {
return RedisKeyType.DEVICE_FORK_LIFT_COMMAND_MSG_KEY.key + deviceId + "_";
+ } else if (deviceType.equals(SlaveType.Lift)) {
+ return RedisKeyType.DEVICE_LIFT_COMMAND_MSG_KEY.key + deviceId + "_";
}else {
throw new CoolException("璁惧绫诲瀷鏈畾涔�");
}
--
Gitblit v1.9.1