From 91f024118120b2e640afdfac29ba9436ec64eed8 Mon Sep 17 00:00:00 2001
From: DragonWenLong <552045633@qq.com>
Date: Tue, 23 Sep 2025 15:55:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(mqtt):=20=E6=B7=BB=E5=8A=A0=E7=94=B5?=
 =?UTF-8?q?=E6=B1=A0=E7=94=B5=E9=87=8F=E7=99=BE=E5=88=86=E6=AF=94=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=B9=B6=E9=80=82=E9=85=8D=E6=8E=A7=E5=88=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 MqttXinghanJson 中新增 batteryPercentage 字段- 在 XinghanDeviceDataRule 中设置 batteryPercentage 值
- 适配控制百分比列表显示电池电量信息
---
 .../java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java | 4 ++++
 .../global/mqtt/rule/xinghan/XinghanDeviceDataRule.java       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java
index 4d9513f..a487d0d 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java
@@ -66,5 +66,9 @@ public class MqttXinghanJson {
      */
     @JsonProperty("sta_system")
     public String stasystem;
+    /**
+     * 电量百分比(适配控制列表显示)
+     */
+    public String batteryPercentage;
 
 }
diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanDeviceDataRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanDeviceDataRule.java
index b2e89a4..6fc2f5f 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanDeviceDataRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanDeviceDataRule.java
@@ -76,7 +76,7 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
             // Latitude, longitude
             //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
             MqttXinghanJson deviceStatus = objectMapper.convertValue(context.getPayloadDict(), MqttXinghanJson.class);
-
+            deviceStatus.setBatteryPercentage(deviceStatus.getStaPowerPercent().toString());
             // 发送设备状态和位置信息到Redis
             asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),deviceStatus);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));