From b0adf1fc4f1582120cd73fd61384e2f8cf08ddff Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Sat, 26 Apr 2025 21:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/EqDeviceController.java    |  2 +-
 .../web/domain/bo/EqEquipmentLogBo.java       | 22 +++++++--------
 .../resources/i18n/messages_zh_CN.properties  | 28 +++++++++----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
index d105da43c..646441cb3 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
@@ -293,7 +293,7 @@ public class EqDeviceController extends BaseController {
         String equipmentName = eqEquipmentLogBo.getEquipmentName();
         Integer status = eqEquipmentLogBo.getStatus();
 //        List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "1", "2", "112", "113");
-        List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108",  "112", "113");
+        List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108","109","110","112", "113");
 
         //设备id查询
         DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java
index 06b6c999d..8354ea8f9 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqEquipmentLogBo.java
@@ -75,18 +75,18 @@ public class EqEquipmentLogBo extends BaseEntity {
      * 14.设备故障 deviceException
      *
      * 101.烟雾报警 √
-     * 102.红外触发报警√
-     * 103.电机运行报警√
-     * 104.电机维修报警√
-     * 105.非APP开门提醒√
-     * 106.非APP关门提醒√
-     * 107.关门故障报警√
-     * 108.开门故障报警√
-     * 109.开门运行提醒 使用1
-     * 110.关门运行提醒 使用2
+     * 102.红外保护被触发√
+     * 103.电机运转报警√
+     * 104.电机维修告警√
+     * 105.非APP开门√
+     * 106.非APP关门√
+     * 107.关门故障√
+     * 108.开门故障√
+     * 109.开门 使用1
+     * 110.关门 使用2
      * 111.忘记关门提醒
-     * 112.门体手动开启提醒√
-     * 113.半开门运行提醒√
+     * 112.门被手动打开√
+     * 113.半开门√
      * 114.门体停止运行提醒
      *
      * 500.设备离线 offline
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
index 655546e72..baa287e9d 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
@@ -332,21 +332,21 @@ logStatus.name11=红外故障
 logStatus.name12=电机运转故障
 logStatus.name13=电机维护故障
 logStatus.name14=设备故障
-## 《故障状态》
+## 《日志告警状态》
 logStatus.name101=烟雾报警
-logStatus.name102=红外触发报警
-logStatus.name103=电机运行报警
-logStatus.name104=电机维修报警
-logStatus.name105=非APP开门提醒
-logStatus.name106=非APP关门提醒
-logStatus.name107=关门故障报警
-logStatus.name108=开门故障报警
-logStatus.name109=开门运行提醒
-logStatus.name110=关门运行提醒
-logStatus.name111=忘记关门提醒
-logStatus.name112=门体手动开启提醒
-logStatus.name113=半开门运行提醒
-logStatus.name114=门体停止运行提醒
+logStatus.name102=红外保护被触发
+logStatus.name103=电机运转报警
+logStatus.name104=电机维修告警
+logStatus.name105=非APP开门
+logStatus.name106=非APP关门
+logStatus.name107=关门故障
+logStatus.name108=开门故障
+logStatus.name109=开门
+logStatus.name110=关门
+logStatus.name111=忘记关门提醒(日志未用)
+logStatus.name112=门被手动打开
+logStatus.name113=半开门
+logStatus.name114=门体停止运行提醒(日志未用)
 
 logStatus.name500=离线
 logStatus.name501=在线