diff --git a/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteFloorService.java b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteFloorService.java index 9e9d707b..88b5e5d3 100644 --- a/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteFloorService.java +++ b/ruoyi-api/property-api/src/main/java/org/dromara/property/api/RemoteFloorService.java @@ -21,10 +21,10 @@ public interface RemoteFloorService { List> queryTreeList(); /** - * 根据单元ID查询楼层 + * 根据楼层id查询楼层 * - * @param unitId 单元ID + * @param buildingId 单元ID * @return 楼层 */ - List queryByUnitId(Long unitId); + List queryByBuildingId(Long buildingId); } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/ContentTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/ContentTypeEnum.java new file mode 100644 index 00000000..78530307 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/ContentTypeEnum.java @@ -0,0 +1,70 @@ +package org.dromara.common.core.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author lsm + * @apiNote ContentTypeEnum + * @since 2025/8/4 + */ +@Getter +@AllArgsConstructor +public enum ContentTypeEnum { + + /** + * JPEG图片类型 + */ + JPG("jpg", "image/jpeg"), + + /** + * JPEG图片类型 + */ + JPEG("jpeg", "image/jpeg"), + + /** + * PNG图片类型 + */ + PNG("png", "image/png"), + + /** + * GIF图片类型 + */ + GIF("gif", "image/gif"); + + private final String extension; + private final String contentType; + + /** + * 根据文件扩展名获取内容类型 + * + * @param extension 文件扩展名 + * @return 对应的内容类型，如果未找到则返回null + */ + public static String getContentType(String extension) { + for (ContentTypeEnum type : values()) { + if (type.extension.equalsIgnoreCase(extension)) { + return type.contentType; + } + } + return null; + } + + /** + * 获取文件扩展名 + * + * @return 文件扩展名 + */ + public String getExtension() { + return extension; + } + + /** + * 获取内容类型 + * + * @return 内容类型 + */ + public String getContentType() { + return contentType; + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java index fa43aa3d..ab0eca00 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/TbFloorController.java @@ -105,14 +105,14 @@ public class TbFloorController extends BaseController { } /** - * 根据单元ID查询楼层 + * 根据楼层id查询楼层 * - * @param unitId 单元ID + * @param buildingId 单元ID * @return 楼层 */ - @GetMapping("/queryByUnitId/{unitId}") - public R> queryByUnitId(@NotNull(message = "单元ID不能为空") - @PathVariable("unitId") Long unitId) { - return R.ok(tbFloorService.queryByUnitId(unitId)); + @GetMapping("/queryByBuildingId/{buildingId}") + public R> queryByBuildingId(@NotNull(message = "楼层ID不能为空") + @PathVariable("buildingId") Long buildingId) { + return R.ok(tbFloorService.queryByBuildingId(buildingId)); } } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java index f5b660f1..835f7345 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/dubbo/RemoteFloorServiceImpl.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.domain.TreeNode; import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.redis.utils.RedisUtils; import org.dromara.property.api.RemoteFloorService; import org.dromara.property.api.domain.vo.RemoteFloorVo; import org.dromara.property.domain.vo.TbBuildingVo; @@ -34,7 +35,6 @@ public class RemoteFloorServiceImpl implements RemoteFloorService { private final ITbUnitService unitService; private final ITbFloorService floorService; - @Override public RemoteFloorVo queryByFloorId(Long floorId) { TbFloorVo tbFloorVo = floorService.queryById(floorId); @@ -103,14 +103,14 @@ public class RemoteFloorServiceImpl implements RemoteFloorService { } /** - * 根据单元ID查询楼层 + * 根据楼层id查询楼层 * - * @param unitId 单元ID + * @param buildingId 单元ID * @return 楼层 */ @Override - public List queryByUnitId(Long unitId){ - List tbFloorVo = floorService.queryByUnitId(unitId); + public List queryByBuildingId(Long buildingId){ + List tbFloorVo = floorService.queryByBuildingId(buildingId); List remoteFloorVos = new ArrayList<>(); tbFloorVo.forEach(item -> { diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java index 9156cc52..bd81cfbc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/ITbFloorService.java @@ -76,10 +76,10 @@ public interface ITbFloorService { List queryAll(); /** - * 根据单元ID查询楼层 + * 根据楼层id查询楼层 * - * @param unitId 单元ID + * @param buildingId 单元ID * @return 楼层 */ - List queryByUnitId(Long unitId); + List queryByBuildingId(Long buildingId); } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java index 549616a1..45b8dc2e 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/TbFloorServiceImpl.java @@ -160,15 +160,15 @@ public class TbFloorServiceImpl implements ITbFloorService { } /** - * 根据单元ID查询楼层 + * 根据楼层id查询楼层 * - * @param unitId 单元ID + * @param buildingId 单元ID * @return 楼层 */ @Override - public List queryByUnitId(Long unitId) { + public List queryByBuildingId(Long buildingId) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(TbFloor::getUnitId, unitId) + lqw.eq(TbFloor::getBuildingId, buildingId) .orderByAsc(TbFloor::getFloorNumber); return baseMapper.selectVoList(lqw); } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java index 3f132a81..e5a725c0 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/bo/SisElevatorInfoBo.java @@ -17,7 +17,7 @@ import java.util.List; * 电梯基本信息业务对象 sis_elevator_info * * @author lxj - * @date 2025-07-10 + * @since 2025-07-10 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java index 4a9cf273..3a4338bc 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/runner/HikDeviceApplicationRunner.java @@ -61,7 +61,7 @@ public class HikDeviceApplicationRunner implements ApplicationRunner { SaTokenContextMockUtil.setMockContext(() -> { // 模拟登录 StpUtil.login(-8); - floorInfoRef.set(remoteFloorService.queryByUnitId(item.getUnitId())); + floorInfoRef.set(remoteFloorService.queryByBuildingId(item.getBuildingId())); }); // 根据单元ID获取楼层信息 diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java index 251b0826..26a12b6b 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthGroupRefServiceImpl.java @@ -135,7 +135,7 @@ public class SisAuthGroupRefServiceImpl implements ISisAuthGroupRefService { log.info("开始写入授权组电梯楼层，floorIds：{}", floorIds); // 获取该电梯所在单元的楼层信息 - List floorVoList = remoteFloorService.queryByUnitId(ele.getUnitId()); + List floorVoList = remoteFloorService.queryByBuildingId(ele.getBuildingId()); // 该单元所有楼层id List allFloors = floorVoList.stream().map(RemoteFloorVo::getId).toList(); // 对比找出授权楼层id diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java index 1d2456a7..64a95406 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAuthRecordServiceImpl.java @@ -289,7 +289,7 @@ public class SisAuthRecordServiceImpl implements ISisAuthRecordService { // 楼层节点 List> floorTree = new ArrayList<>(); // 获取楼层 - List floorInfoList = remoteFloorService.queryByUnitId(item.getUnitId()); + List floorInfoList = remoteFloorService.queryByBuildingId(item.getBuildingId()); floorInfoList.forEach(floor -> { TreeNode floorNode = new TreeNode<>(); floorNode.setLevel(3); diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java index 3b6eca62..c2b371a4 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java @@ -140,7 +140,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer // 获取电梯信息 SisElevatorInfoVo ele = elevatorInfoService.queryById(deviceId); // 根据单元ID获取楼层信息 - List floorInfo = remoteFloorService.queryByUnitId(deviceId); + List floorInfo = remoteFloorService.queryByBuildingId(ele.getBuildingId()); // 获取电梯⇄楼层关联信息 List floorRefList = elevatorFloorRefService.queryByAuthGroupId(groupId);