From baa341c2bf7c4749edf348462b84bc6f50b1d23d Mon Sep 17 00:00:00 2001
From: DragonWenLong <552045633@qq.com>
Date: Tue, 23 Sep 2025 14:21:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(equipment):=20=E5=AE=9E=E7=8E=B0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=BB=B4=E4=BF=AE=E8=AE=B0=E5=BD=95=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E6=8A=A5=E8=AD=A6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-重构文件哈希工具类路径并优化上传逻辑，支持秒传
- 新增维修记录图片ID列表字段及删除旧图片逻辑- 设备维修记录查询增加设备名称模糊搜索条件
-日期查询条件添加格式化注解支持 yyyy-MM-dd- MQTT规则中新增SOS与静止报警处理机制
- 实现报警生命周期管理（开始/结束）及Redis缓存控制
- 添加报警信息入库和位置解析功能
- 优化设备状态数据解析与经纬度异步存储逻辑
---
 .../global/mqtt/rule/xinghan/XinghanDeviceDataRule.java        | 3 +++
 1 file changed, 3 insertions(+)

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 17dce0ed..b2e89a4c 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
@@ -186,6 +186,9 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
      */
     private DeviceAlarmBo createAlarmBo(String deviceImei, AlarmType type) {
         Device device = deviceService.selectDeviceByImei(deviceImei);
+        if (device == null) {
+            return null;
+        }
         DeviceAlarmBo bo = new DeviceAlarmBo();
         bo.setDeviceId(device.getId());
         bo.setDeviceImei(deviceImei);