From 7d154cd8bcd274a53ad573e95c574ad936b4e249 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 07 七月 2025 07:46:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/DeviceMsgUtils.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/DeviceMsgUtils.java b/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
index bf60fbc..eb9f81f 100644
--- a/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
+++ b/src/main/java/com/zy/core/utils/DeviceMsgUtils.java
@@ -1,9 +1,10 @@
package com.zy.core.utils;
-import com.core.exception.CoolException;
+import com.zy.common.exception.CoolException;
import com.zy.common.utils.RedisUtil;
import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.DeviceCommandMsgModel;
import com.zy.core.model.DeviceMsgModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -23,18 +24,27 @@
@Autowired
private RedisUtil redisUtil;
- public Object getDeviceCommandMsg(SlaveType deviceType, Integer deviceId) {
+ 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()) {
return null;
}
+ //deviceShuttleCommandMsgKey_1_1751674783851
String firstKey = listKey.first();
- Object data = redisUtil.get(firstKey);
+ DeviceCommandMsgModel commandMsgModel = (DeviceCommandMsgModel) redisUtil.get(firstKey);
if (destroyAfterReading) {
redisUtil.del(firstKey);
}
- return data;
+ return commandMsgModel;
}
public DeviceMsgModel getDeviceMsg(SlaveType deviceType, Integer deviceId) {
@@ -67,22 +77,22 @@
redisUtil.set(key, msgModel, 60 * 60);
}
- public String sendDeviceMsg(SlaveType deviceType, Integer deviceId, Object command) {
+ public String sendDeviceMsg(SlaveType deviceType, Integer deviceId, DeviceMsgModel deviceMsgModel) {
String key = parseDeviceMsgKey(deviceType, deviceId) + System.currentTimeMillis();
-
- DeviceMsgModel deviceMsgModel = new DeviceMsgModel();
- deviceMsgModel.setDeviceId(deviceId);
- deviceMsgModel.setDeviceMsg(command);
redisUtil.set(key, deviceMsgModel, 60 * 60 * 24);
return key;
}
- public String sendDeviceCommand(SlaveType deviceType, Integer deviceId, Object command) {
+ public String sendDeviceCommand(SlaveType deviceType, Integer deviceId, DeviceCommandMsgModel command) {
String key = parseDeviceCommandMsgKey(deviceType, deviceId) + System.currentTimeMillis();
redisUtil.set(key, command, 60 * 60 * 24);
return key;
}
+ public void sendDeviceConfig(String allDevices) {
+ redisUtil.set(RedisKeyType.DEVICE_CONFIG.key, allDevices);
+ }
+
public TreeSet<String> getDeviceMsgListKey(SlaveType deviceType, Integer deviceId) {
String listKey = parseDeviceMsgKey(deviceType, deviceId);
Set<String> keys = redisUtil.searchKeys(listKey);
--
Gitblit v1.9.1