From 6fb8e73535610c0bc038da5ca668f5d09e0e2b14 Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Fri, 1 Aug 2025 14:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LightingCommandTypeConstants.java         | 34 +------------------
 .../global/mqtt/rule/LocationDataRule.java    |  2 +-
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java
index 5687f33..64c8449 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java
@@ -40,37 +40,5 @@ public class LightingCommandTypeConstants {
      * 主动上报设备数据 (Active Reporting Device Data)
      */
     public static final String ACTIVE_REPORTING_DEVICE_DATA = "Light_12";
-    
-    /**
-     * 获取命令类型描述
-     * 
-     * @param commandType 命令类型
-     * @return 命令类型描述
-     */
-    public static String getCommandTypeDescription(String commandType) {
-        return switch (commandType) {
-            case LIGHT_MODE -> "灯光模式 (Light Mode)";
-            case PERSONNEL_INFO -> "人员信息 (Personnel Information)";
-            case BOOT_LOGO -> "开机LOGO (Boot Logo)";
-            case LASER_LIGHT -> "激光灯 (Laser Light)";
-            case MAIN_LIGHT_BRIGHTNESS -> "主灯亮度 (Main Light Brightness)";
-            case LOCATION_DATA -> "定位数据 (Location Data)";
-            default -> "未知命令类型 (Unknown Command Type)";
-        };
-    }
-    
-    /**
-     * 检查是否为有效命令类型
-     * 
-     * @param commandType 命令类型
-     * @return 是否有效
-     */
-    public static boolean isValidCommandType(String commandType) {
-        return commandType.equals(LIGHT_MODE)  ||
-               commandType.equals(PERSONNEL_INFO) ||
-               commandType.equals(BOOT_LOGO) ||
-               commandType.equals(LASER_LIGHT) ||
-               commandType.equals(MAIN_LIGHT_BRIGHTNESS) ||
-               commandType.equals(LOCATION_DATA);
-    }
+
 }
diff --git a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
index 37b4302..94499cf 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java
@@ -105,7 +105,7 @@ public class LocationDataRule implements MqttMessageRule {
     public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
         CompletableFuture.runAsync(() -> {
             try {
-                if(StringUtils.isNotBlank(latitude) || StringUtils.isNotBlank(longitude)){
+                if(StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)){
                     return;
                 }
                 // 构造位置信息对象