From f35a15fc23586a5006bb14746766b74027154208 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Thu, 17 Jul 2025 14:49:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sis):=20=E5=AD=97=E6=AE=B5=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java     | 2 +-
 .../org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java    | 2 +-
 .../sis/service/impl/SisElevatorFloorRefServiceImpl.java     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java
index d4537d7..ce26948 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorFloorRefBo.java
@@ -35,7 +35,7 @@ public class SisElevatorFloorRefBo extends BaseEntity {
     private Long elevatorId;
 
     /**
-     * 楼层层数
+         * 楼层层数
      */
     @NotEmpty(message = "楼层层数不能为空", groups = { AddGroup.class, EditGroup.class })
     private Collection<Long> floorNums;
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java
index 931e1bd..24cc8bc 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/hik/calback/HikAlarmCallBack.java
@@ -123,7 +123,7 @@ public class HikAlarmCallBack implements HCNetSDK.FMSGCallBack_V31 {
 
                         layerArray.forEach(layer -> {
                             SisElevatorFloorRefVo floorRef = floorRefList.stream()
-                                .filter(vo -> vo.getLayerNum().intValue() == layer)  // 直接使用 layer
+                                .filter(vo -> vo.getFloorNum().intValue() == layer)  // 直接使用 layer
                                 .findFirst()
                                 .orElse(null);
                             if (floorRef == null) {
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
index 68c6505..3517d7b 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorFloorRefServiceImpl.java
@@ -88,6 +88,11 @@ public class SisElevatorFloorRefServiceImpl implements ISisElevatorFloorRefServi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(SisElevatorFloorRefBo bo) {
+        // 清除已有权限
+        List<SisElevatorFloorRefVo> list = this.queryByElevatorId(bo.getElevatorId());
+        Collection<Long> ids = list.stream().map(SisElevatorFloorRefVo::getId).toList();
+        baseMapper.deleteByIds(ids);
+
         boolean flag = false;
         for (Long num : bo.getFloorNums()){
             SisElevatorFloorRef add = new SisElevatorFloorRef();