From 6daf900a09adcca981f620744bf89851654d88e0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 05 八月 2025 09:58:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/DeviceMsgUtils.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 5a1fb51..dd78cef 100644
--- a/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
+++ b/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
@@ -24,6 +24,14 @@
@Autowired
private RedisUtil redisUtil;
+ public String getDeviceConfig() {
+ Object obj = redisUtil.get(RedisKeyType.DEVICE_CONFIG.key);
+ if(null == obj){
+ return null;
+ }
+ return obj.toString();
+ }
+
public DeviceCommandMsgModel getDeviceCommandMsg(SlaveType deviceType, Integer deviceId) {
TreeSet<String> listKey = getDeviceCommandMsgListKey(deviceType, deviceId);
if (listKey.isEmpty()) {
@@ -70,14 +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) {
@@ -113,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("璁惧绫诲瀷鏈畾涔�");
}
@@ -127,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