diff --git a/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceMessageController.java b/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceMessageController.java index 79b5d5ab6..03461d50e 100644 --- a/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceMessageController.java +++ b/yudao-module-iot/yudao-module-iot-server/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/device/IotDeviceMessageController.java @@ -89,4 +89,4 @@ public class IotDeviceMessageController { return success(true); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java index 34c53a0e8..3c49376cd 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustequipinfo/DustEquipinfoController.java @@ -123,6 +123,16 @@ public class DustEquipinfoController { return success(respVO); } + @GetMapping("/equipCode/get") + @Operation(summary = "获得除尘系统信息") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('system:dust-equipinfo:query')") + public CommonResult getDustEquipinfoByCode(@RequestParam("equipCode") String equipCode) { + DustEquipinfoRespVO result = dustEquipinfoService.getDustEquipByCode(equipCode); + return success(result); + + } + @GetMapping("/page") @Operation(summary = "获得除尘系统信息分页") @PreAuthorize("@ss.hasPermission('system:dust-equipinfo:query')") diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoService.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoService.java index e188596fd..5d5eba1ca 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoService.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoService.java @@ -62,4 +62,6 @@ public interface DustEquipinfoService { List getDustEquipinfoList(); String getDustEquipNameByCode(String equipCode); + + DustEquipinfoRespVO getDustEquipByCode(String equipCode); } diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java index 726cb4f92..d88501c03 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustequipinfo/DustEquipinfoServiceImpl.java @@ -60,8 +60,8 @@ public class DustEquipinfoServiceImpl implements DustEquipinfoService { Long maxCode = Optional.ofNullable(dustEquipinfoMapper.getMaxEquipCode(dataId)) .filter(code -> code > 0) .map(code -> code + 1) - .orElse(1L); // 默认从1开始 - createReqVO.setEquipCode(String.format("%03d", maxCode)); + .orElse(Long.valueOf(dataId+"001")); // 默认从1开始 + createReqVO.setEquipCode(String.valueOf(maxCode)); }); DustEquipinfoDO dustEquipinfo = BeanUtils.toBean(createReqVO, DustEquipinfoDO.class); dustEquipinfo.setDustTechnology(join); @@ -127,4 +127,10 @@ public class DustEquipinfoServiceImpl implements DustEquipinfoService { .map(DustEquipinfoDO::getEquipName).orElse(null); } + @Override + public DustEquipinfoRespVO getDustEquipByCode(String equipCode) { + DustEquipinfoDO dustEquipinfoDO = dustEquipinfoMapper.selectOne(DustEquipinfoDO::getEquipCode, equipCode); + return BeanUtils.toBean(dustEquipinfoDO, DustEquipinfoRespVO.class); + } + } diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dusttargetinfo/DustTargetinfoServiceImpl.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dusttargetinfo/DustTargetinfoServiceImpl.java index a9bd5969a..18a0089d1 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dusttargetinfo/DustTargetinfoServiceImpl.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dusttargetinfo/DustTargetinfoServiceImpl.java @@ -42,11 +42,10 @@ public class DustTargetinfoServiceImpl implements DustTargetinfoService { String equipCode = createReqVO.getEquipCode(); //然后根据设备编码去查找所有的指标信息,并将他们倒叙排序找到指标编码的最大值 Long maxTargetCode = dustTargetinfoMapper.getMaxTargetCode(equipCode); - Long targetCode = Optional.ofNullable(maxTargetCode).map(maxCode -> maxCode+1).orElse(1L); - createReqVO.setTargetCode(String.format("%03d", targetCode)); + Long targetCode = Optional.ofNullable(maxTargetCode).map(maxCode -> maxCode+1).orElse(Long.valueOf(equipCode+"001")); + createReqVO.setTargetCode(String.valueOf(targetCode)); DustTargetinfoDO dustTargetinfo = BeanUtils.toBean(createReqVO, DustTargetinfoDO.class); dustTargetinfoMapper.insert(dustTargetinfo); - // 返回 return dustTargetinfo.getId(); }