From 4f58aa9c1ed00545c7e941c3ce4d420843c627a7 Mon Sep 17 00:00:00 2001 From: zcxlsm Date: Mon, 4 Aug 2025 16:52:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sis):=201Vo=20=E7=B1=BB=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20DeviceInfo=20=E5=86=85=E9=83=A8=E7=B1=BB?= =?UTF-8?q?=20-=20=E6=B3=A8=E9=87=8A=E6=8E=89=20Sync?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sis/domain/vo/SisElevatorInfoVo.java | 9 +++++++-- .../sis/mapper/SisElevatorInfoMapper.java | 4 +++- .../dromara/sis/sdk/e8/utils/E8ApiUtil.java | 6 +++--- .../sis/service/ISisElevatorInfoService.java | 2 +- .../impl/SisElevatorInfoServiceImpl.java | 19 ++++++++++--------- .../dromara/sis/task/SyncLiftAuthTask.java | 2 +- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java index 7a479510..a1b84bce 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisElevatorInfoVo.java @@ -159,12 +159,17 @@ public class SisElevatorInfoVo implements Serializable { /** * 呼梯摄像头 */ - private List remoteCallElevatorDeviceId; + private List remoteCallElevatorDeviceId; /** * 梯控摄像头 */ - private Long elevatorControlDeviceId; + private DeviceInfo elevatorControlDeviceId; + @Data + public static class DeviceInfo { + private Long deviceId; + private String deviceIp; + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java index 59339c0f..daf43e0b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisElevatorInfoMapper.java @@ -1,5 +1,6 @@ package org.dromara.sis.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.sis.domain.SisElevatorInfo; import org.dromara.sis.domain.vo.SisElevatorInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -8,8 +9,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * 电梯基本信息Mapper接口 * * @author lxj - * @date 2025-07-10 + * @since 2025-07-10 */ +@Mapper public interface SisElevatorInfoMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java index e23dac16..73f3eda7 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/e8/utils/E8ApiUtil.java @@ -22,13 +22,13 @@ import java.util.stream.Collectors; @Component public class E8ApiUtil { - @Value("e8.url") + @Value("${E8Plat.url}") private String BASE_URL; - @Value("e8.secretKey") + @Value("${E8Plat.secretKey}") private String SECRET_KEY; - @Value("e8.key") + @Value("${E8Plat.key}") private String KEY; /** diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorInfoService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorInfoService.java index c1ab87f9..99f7b12e 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorInfoService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisElevatorInfoService.java @@ -12,7 +12,7 @@ import java.util.List; * 电梯基本信息Service接口 * * @author lxj - * @date 2025-07-10 + * @since 2025-07-10 */ public interface ISisElevatorInfoService { 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 78363c16..2b1bc9b7 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 @@ -34,7 +34,7 @@ import static org.dromara.common.core.constant.CodePrefixConstants.ELEVATOR_CONT * 电梯基本信息Service业务层处理 * * @author lxj - * @date 2025-07-10 + * @since 2025-07-10 */ @Slf4j @RequiredArgsConstructor @@ -57,20 +57,21 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { public SisElevatorInfoVo queryById(Long elevatorId) { SisElevatorInfoVo sisElevatorInfoVo = baseMapper.selectVoById(elevatorId); if (sisElevatorInfoVo == null) { - return sisElevatorInfoVo; + return null; } List ref = deviceBindRefService.queryByBindId(elevatorId); if (CollUtil.isNotEmpty(ref)) { - List remoteCallElevatorDeviceId = new ArrayList<>(ref.size()); - Long elevatorControlDeviceId = null; + List remoteCallElevatorDeviceId = new ArrayList<>(ref.size()); for (SisDeviceBindRef item : ref) { + SisElevatorInfoVo.DeviceInfo deviceInfo = new SisElevatorInfoVo.DeviceInfo(); + deviceInfo.setDeviceId(item.getDeviceId()); + deviceInfo.setDeviceIp(item.getDeviceIp()); if (Objects.equals(item.getControlType(), ControlTypeEnum.REMOTE_CALL_ELEVATOR.getCode())) { - remoteCallElevatorDeviceId.add(item.getDeviceId()); - } else { - elevatorControlDeviceId = item.getDeviceId(); + remoteCallElevatorDeviceId.add(deviceInfo); + }else { + sisElevatorInfoVo.setElevatorControlDeviceId(deviceInfo); } sisElevatorInfoVo.setRemoteCallElevatorDeviceId(remoteCallElevatorDeviceId); - sisElevatorInfoVo.setElevatorControlDeviceId(elevatorControlDeviceId); } } return sisElevatorInfoVo; @@ -261,7 +262,7 @@ public class SisElevatorInfoServiceImpl implements ISisElevatorInfoService { * @return 列表 */ @Override - public List queryListByIds(Collection ids){ + public List queryListByIds(Collection ids) { return baseMapper.selectVoByIds(ids); } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/SyncLiftAuthTask.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/SyncLiftAuthTask.java index 27ce995c..2678a3c1 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/SyncLiftAuthTask.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/task/SyncLiftAuthTask.java @@ -35,7 +35,7 @@ public class SyncLiftAuthTask { /** * 同步电梯权限 */ - @Scheduled(cron = "*/5 * 6-22 * * ?") +// @Scheduled(cron = "*/5 * 6-22 * * ?") public void syncLiftAuth() { QueryDto dto = new QueryDto(); dto.setPageIndex(1);