From 9e24e3daafd149a64e50bae6ec84951ec7d50e2b Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Thu, 14 Aug 2025 17:38:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=8A=E8=AD=A6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=914?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mqtt/rule/bjq/BjqLightBrightnessRule.java | 51 +++++++++++++++++++
 .../service/device/DeviceBJQBizService.java   |  5 ++
 .../app/domain/vo/AppDeviceDetailVo.java      |  3 ++
 3 files changed, 59 insertions(+)
 create mode 100644 fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLightBrightnessRule.java

diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLightBrightnessRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLightBrightnessRule.java
new file mode 100644
index 00000000..0fc6dd8e
--- /dev/null
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLightBrightnessRule.java
@@ -0,0 +1,51 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqLightBrightnessRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.MAIN_LIGHT_BRIGHTNESS;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String convertValue = convertArr[1].toString();
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理灯光亮度命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+}
diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java
index 888b1fed..671fe8ef 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java
@@ -165,6 +165,11 @@ public class DeviceBJQBizService {
             vo.setAlarmStatus(alarmStatus);
         }
 
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(lightBrightness)){
+            vo.setLightBrightness(lightBrightness);
+        }
+
         return vo;
     }
 
diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java
index 230a2c48..c1728092 100644
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java
@@ -104,4 +104,7 @@ public class AppDeviceDetailVo {
      * 告警状态(0解除告警，1告警)
      */
     private String alarmStatus;
+
+    // 灯光亮度
+    private String lightBrightness;
 }