From ac3d7c0f68d4dc8be199fc1e0f08fc2ec3d447c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Wed, 19 Aug 2026 09:42:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202.=E6=8A=A5=E8=AD=A6=E6=81=A2=E5=A4=8D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/devicetypes/DeviceTypesController.java  | 2 +-
 .../yudao/module/warehousealarm/engine/RuleEngine.java       | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/controller/admin/devicetypes/DeviceTypesController.java b/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/controller/admin/devicetypes/DeviceTypesController.java
index da90b7c..003cc03 100644
--- a/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/controller/admin/devicetypes/DeviceTypesController.java
+++ b/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/controller/admin/devicetypes/DeviceTypesController.java
@@ -65,7 +65,7 @@ public class DeviceTypesController {
     @GetMapping("/get")
     @Operation(summary = "获得设备类型定义")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('warehousealarm:device-types:query')")
+    @PermitAll
     public CommonResult<DeviceTypesRespVO> getDeviceTypes(@RequestParam("id") Long id) {
         DeviceTypesDO deviceTypes = deviceTypesService.getDeviceTypes(id);
         return success(BeanUtils.toBean(deviceTypes, DeviceTypesRespVO.class));
diff --git a/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/engine/RuleEngine.java b/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/engine/RuleEngine.java
index c985083..0ff85b8 100644
--- a/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/engine/RuleEngine.java
+++ b/yudao-module-warehousealarm/yudao-module-warehousealarm-biz/src/main/java/cn/iocoder/yudao/module/warehousealarm/engine/RuleEngine.java
@@ -267,7 +267,7 @@ public class RuleEngine {
                    break;
                }
                if (!triggered) {
-                   // 所有组条件都不满足 → 恢复该规则该设备对应的活跃报警
+                   // 报警恢复
                    for (AlarmRecordsDO alarm : activeAlarms) {
                        recoverAlarm(alarm, ruleId,3);
                    }
@@ -286,6 +286,7 @@ public class RuleEngine {
                }
            }
        }catch (Exception e){
+           e.printStackTrace();
             log.error("[RuleEngine] 规则评估失败: ruleId={}, deviceId={}, error={}", rule.getId(), triggerDevice.getId(), e.getMessage());
         }finally {
 
@@ -445,7 +446,7 @@ public class RuleEngine {
         //如果有报警灯，关闭报警灯
         List<RuleActionsDO> actions = actionMapper.selectList(new QueryWrapper<RuleActionsDO>()
                 .eq("rule_id", ruleId)
-                .eq("action_type", "switch"));
+                .eq("action_param", "switch"));
 
         for (RuleActionsDO action : actions) {
 //           执行单个动作