From a4e40f5123bae89523a4529a2953229f859604b6 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Wed, 6 Aug 2025 09:16:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(sis):=20-=20=E6=96=B0=E5=A2=9E=20RocketMQ?= =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=92=8C=E7=9B=B8=E5=85=B3=E6=9C=8D=E5=8A=A1=20-=20=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E8=BF=9C=E7=A8=8B=E5=BC=80=E9=97=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=92=8C=E6=9C=8D=E5=8A=A1=E6=96=B9=E6=B3=95=20-=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A2=AF=E6=8E=A7=E4=B8=8B=E5=8F=91=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/CleanLiftAuthRocketConsumer.java | 44 +++++++++---------- .../sis/mapper/SisAccessControlMapper.java | 4 +- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/consumer/CleanLiftAuthRocketConsumer.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/consumer/CleanLiftAuthRocketConsumer.java index dca65425..b2e9323a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/consumer/CleanLiftAuthRocketConsumer.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/consumer/CleanLiftAuthRocketConsumer.java @@ -33,32 +33,28 @@ public class CleanLiftAuthRocketConsumer implements RocketMQListener public void onMessage(MessageExt ext) { log.info("【消费者】接收消息：消息体 => {}", new String(ext.getBody())); -// Long deviceId = Long.parseLong(ext.getUserProperty("deviceId")); -// Long groupId = Long.parseLong(ext.getUserProperty("groupId")); -// Long deviceFloorId = Long.parseLong(ext.getUserProperty("deviceFloorId")); -// -// // 获取当前电梯信息 -// SisElevatorInfoVo ele = sisElevatorInfoService.queryById(deviceId); -// -// // 获取权限组下电梯⇄楼层关联信息 -// List groupRef = sisElevatorFloorRefService.queryByAuthGroupId(groupId); -// -// // 取出当前电梯的楼层授权信息 -// List eleRef = groupRef.stream().filter(o -> Objects.equals(o.getElevatorId(), deviceId)).toList(); -// -// for (SisElevatorFloorRefVo ref : eleRef){ -// if (ref.getOutChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){ -// HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getOutChannel().intValue(), 3); -// } -// -// if (ref.getInChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){ -// HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getInChannel().intValue(), 3); -// } -// } + Long deviceId = Long.parseLong(ext.getUserProperty("deviceId")); + Long groupId = Long.parseLong(ext.getUserProperty("groupId")); + Long deviceFloorId = Long.parseLong(ext.getUserProperty("deviceFloorId")); - HikApiService.getInstance().controlGateway("192.168.24.188", 1, 3); - HikApiService.getInstance().controlGateway("192.168.24.188", 2, 3); + // 获取当前电梯信息 + SisElevatorInfoVo ele = sisElevatorInfoService.queryById(deviceId); + // 获取权限组下电梯⇄楼层关联信息 + List groupRef = sisElevatorFloorRefService.queryByAuthGroupId(groupId); + + // 取出当前电梯的楼层授权信息 + List eleRef = groupRef.stream().filter(o -> Objects.equals(o.getElevatorId(), deviceId)).toList(); + + for (SisElevatorFloorRefVo ref : eleRef){ + if (ref.getOutChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){ + HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getOutChannel().intValue(), 3); + } + + if (ref.getInChannel() != null && Objects.equals(ref.getFloorId(), deviceFloorId)){ + HikApiService.getInstance().controlGateway(ele.getControlIp(), ref.getInChannel().intValue(), 3); + } + } log.info("梯控清除权限完成"); } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java index 6a593fd7..226224b8 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAccessControlMapper.java @@ -1,5 +1,6 @@ package org.dromara.sis.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.sis.domain.SisAccessControl; import org.dromara.sis.domain.vo.SisAccessControlVo; @@ -8,8 +9,9 @@ import org.dromara.sis.domain.vo.SisAccessControlVo; * 门禁设备Mapper接口 * * @author lxj - * @date 2025-06-25 + * @since 2025-06-25 */ +@Mapper public interface SisAccessControlMapper extends BaseMapperPlus { SisAccessControlVo queryById(Long id);