From a12ee50d08b9a16a4f8a8bf58217ba2ea2d70b7c Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Tue, 5 Aug 2025 16:35:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(device):=20=E5=A2=9E=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=91=E5=AE=9A=E6=A5=BC=E5=B1=82=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/sis/domain/SisDeviceBindRef.java | 4 ++++ .../org/dromara/sis/domain/SisDeviceManage.java | 5 +++++ .../dromara/sis/domain/bo/SisDeviceManageBo.java | 6 ++++++ .../dromara/sis/domain/vo/SisDeviceManageVo.java | 6 +++++- .../service/impl/SisAccessControlServiceImpl.java | 1 + .../service/impl/SisDeviceManageServiceImpl.java | 6 +++++- .../service/impl/SisElevatorInfoServiceImpl.java | 13 +++++++++---- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java index 1f7dcd53..dff03c38 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceBindRef.java @@ -45,5 +45,9 @@ public class SisDeviceBindRef extends TenantEntity { */ private Integer controlType; + /** + * 楼层id + */ + private Long deviceFloorId; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java index e18bbf54..38fd0d3c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/SisDeviceManage.java @@ -80,4 +80,9 @@ public class SisDeviceManage extends BaseEntity { private String tenantId; + /** + * 楼层id + */ + private Long floorId; + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java index 75f6be27..81662907 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisDeviceManageBo.java @@ -62,6 +62,12 @@ public class SisDeviceManageBo extends BaseEntity { @NotBlank(message = "设备密码不能为空", groups = {AddGroup.class, EditGroup.class}) private String devicePwd; + /** + * 楼层id + */ + @NotNull(message = "楼层id不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long floorId; + /** * 设备类型 */ diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java index 0e0249d4..0c56837a 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisDeviceManageVo.java @@ -77,6 +77,11 @@ public class SisDeviceManageVo implements Serializable { @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "deviceType", other = "sis_ipc_device_type") private Integer deviceTypeName; + /** + * 楼层id + */ + private Long floorId; + /** * 设备厂商编号 */ @@ -90,5 +95,4 @@ public class SisDeviceManageVo implements Serializable { private Long groupId; private String groupName; - } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java index a44b4352..6bf1601c 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAccessControlServiceImpl.java @@ -141,6 +141,7 @@ public class SisAccessControlServiceImpl implements ISisAccessControlService { SisDeviceBindRef sisDeviceBindRef = new SisDeviceBindRef(); sisDeviceBindRef.setDeviceId(sisDeviceManageVo.getId()); sisDeviceBindRef.setDeviceIp(sisDeviceManageVo.getDeviceIp()); + sisDeviceBindRef.setDeviceFloorId(sisDeviceManageVo.getFloorId()); sisDeviceBindRef.setBindId(bo.getId()); sisDeviceBindRef.setControlType(ControlTypeEnum.ACCESS_CONTROL.getCode()); Boolean insert = sisDeviceBindRefService.insert(sisDeviceBindRef); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java index 86973097..2562c7fe 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisDeviceManageServiceImpl.java @@ -50,7 +50,11 @@ public class SisDeviceManageServiceImpl implements ISisDeviceManageService { */ @Override public SisDeviceManageVo queryById(Long id) { - return baseMapper.selectVoById(id); + SisDeviceManageVo deviceManageVo = baseMapper.selectVoById(id); + + log.info("查询设备管理：{}", deviceManageVo); + + return deviceManageVo; } /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java index 08819ef0..b0c5aa14 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisElevatorInfoServiceImpl.java @@ -20,12 +20,10 @@ import org.dromara.sis.domain.SisElevatorFloorChannelRef; import org.dromara.sis.domain.SisElevatorInfo; import org.dromara.sis.domain.bo.SisElevatorInfoBo; import org.dromara.sis.domain.enums.ControlTypeEnum; +import org.dromara.sis.domain.vo.SisDeviceManageVo; import org.dromara.sis.domain.vo.SisElevatorInfoVo; import org.dromara.sis.mapper.SisElevatorInfoMapper; -import org.dromara.sis.service.ISisDeviceBindRefService; -import org.dromara.sis.service.ISisElevatorFloorChannelRefService; -import org.dromara.sis.service.ISisElevatorFloorRefService; -import org.dromara.sis.service.ISisElevatorInfoService; +import org.dromara.sis.service.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +43,7 @@ import static org.dromara.common.core.constant.CodePrefixConstants.ELEVATOR_CONT public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { private final SisElevatorInfoMapper baseMapper; + private final ISisDeviceManageService deviceManageService; private final ISisDeviceBindRefService deviceBindRefService; private final ISisElevatorFloorRefService elevatorFloorRefService; private final ISisElevatorFloorChannelRefService elevatorFloorChannelRefService; @@ -201,20 +200,26 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { List ls = new ArrayList<>(); // 梯控 if (bo.getElevatorControlDeviceId() != null) { + SisDeviceManageVo vo = deviceManageService.queryById(bo.getElevatorControlDeviceId().getDeviceId()); + SisDeviceBindRef ref = new SisDeviceBindRef(); ref.setDeviceId(bo.getElevatorControlDeviceId().getDeviceId()); ref.setDeviceIp(bo.getElevatorControlDeviceId().getDeviceIp()); ref.setBindId(bo.getElevatorId()); + ref.setDeviceFloorId(vo.getFloorId()); ref.setControlType(ControlTypeEnum.ELEVATOR_CONTROL.getCode()); ls.add(ref); } // 远程呼叫 if (bo.getRemoteCallElevatorDeviceId() != null && !bo.getRemoteCallElevatorDeviceId().isEmpty()) { for (SisElevatorInfoBo.DeviceInfo deviceInfo : bo.getRemoteCallElevatorDeviceId()) { + SisDeviceManageVo vo = deviceManageService.queryById(deviceInfo.getDeviceId()); + SisDeviceBindRef ref = new SisDeviceBindRef(); ref.setDeviceId(deviceInfo.getDeviceId()); ref.setDeviceIp(deviceInfo.getDeviceIp()); ref.setBindId(bo.getElevatorId()); + ref.setDeviceFloorId(vo.getFloorId()); ref.setControlType(ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode()); ls.add(ref); }