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 d4537d75..ce269482 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 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 931e1bdb..24cc8bc8 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 68c65050..3517d7be 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 list = this.queryByElevatorId(bo.getElevatorId()); + Collection ids = list.stream().map(SisElevatorFloorRefVo::getId).toList(); + baseMapper.deleteByIds(ids); + boolean flag = false; for (Long num : bo.getFloorNums()){ SisElevatorFloorRef add = new SisElevatorFloorRef();