From 937232b009c40359167457639e34d4cda5b0567f Mon Sep 17 00:00:00 2001 From: FCL Date: Mon, 9 Mar 2026 14:43:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=BE=E5=A4=87-=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4=E4=BF=9D=E5=85=BB=E3=80=81=E4=BD=BF=E7=94=A8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/DeviceConfigBusinessItemController.java | 13 +++++++++++++ .../admin/DeviceConfigBusinessRuleController.java | 4 ++-- .../vo/DeviceConfigBusinessItemPageReqVO.java | 4 ++++ .../service/DeviceConfigBusinessRuleService.java | 2 +- .../DeviceConfigBusinessRuleServiceImpl.java | 4 ++-- .../device/dal/mapper/DeviceInfomationMapper.xml | 7 +++++++ 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java index d7032f36..51cc23f9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessItemController.java @@ -1,8 +1,11 @@ package com.zt.plat.module.qms.resource.device.controller.admin; +import com.zt.plat.module.qms.resource.device.common.DeviceConstant; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceConfigBusinessItemPageReqVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceConfigBusinessItemRespVO; import com.zt.plat.module.qms.resource.device.controller.vo.DeviceConfigBusinessItemSaveReqVO; +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceConfigBusinessRuleDO; +import com.zt.plat.module.qms.resource.device.service.DeviceConfigBusinessRuleService; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -54,6 +57,7 @@ public class DeviceConfigBusinessItemController extends AbstractFileUploadContro @Resource private DeviceConfigBusinessItemService deviceConfigBusinessItemService; + @Resource private DeviceConfigBusinessRuleService deviceConfigBusinessRuleService; @PostMapping("/create") @Operation(summary = "创建设备-检查项目配置") @@ -101,6 +105,15 @@ public class DeviceConfigBusinessItemController extends AbstractFileUploadContro @Operation(summary = "获得设备-检查项目配置分页") // @PreAuthorize("@ss.hasPermission('qms:device-config-business-item:query')") public CommonResult> getDeviceConfigBusinessItemPage(@Valid DeviceConfigBusinessItemPageReqVO pageReqVO) { + + Long productId = pageReqVO.getProductId(); + if (productId != null) { + DeviceConfigBusinessRuleDO ruleDO = deviceConfigBusinessRuleService.getByProductId(productId, DeviceConstant.MAINTAIN_TYPE); + if(ruleDO != null){ + pageReqVO.setRuleId(ruleDO.getId()); + } + } + PageResult pageResult = deviceConfigBusinessItemService.getDeviceConfigBusinessItemPage(pageReqVO); return success(BeanUtils.toBean(pageResult, DeviceConfigBusinessItemRespVO.class)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java index a7a4f201..af069763 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceConfigBusinessRuleController.java @@ -64,8 +64,8 @@ public class DeviceConfigBusinessRuleController extends AbstractFileUploadContro @GetMapping("/getByProductId") @Operation(summary = "获得设备-业务配置") @Parameter(name = "productId", description = "设备大类id", required = true, example = "1024") - public CommonResult getByProductId(@RequestParam("productId") Long productId) { - DeviceConfigBusinessRuleDO entity = deviceConfigBusinessRuleService.getByProductId(productId); + public CommonResult getByProductId(@RequestParam("productId") Long productId, @RequestParam("businessDomain") String businessDomain) { + DeviceConfigBusinessRuleDO entity = deviceConfigBusinessRuleService.getByProductId(productId, businessDomain); if(entity == null) return success(null); return success(BeanUtils.toBean(entity, DeviceConfigBusinessRuleRespVO.class)); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java index 5c3cd7c5..408444dc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceConfigBusinessItemPageReqVO.java @@ -53,4 +53,8 @@ public class DeviceConfigBusinessItemPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + //=================扩展属性==================== + @Schema(description = "设备大类id") + private Long productId; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java index 9bc5c354..978e725c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleService.java @@ -17,7 +17,7 @@ import com.zt.plat.framework.common.pojo.PageResult; */ public interface DeviceConfigBusinessRuleService { - DeviceConfigBusinessRuleDO getByProductId(Long productId); + DeviceConfigBusinessRuleDO getByProductId(Long productId, String businessDomain); CommonResult getRuleByDeviceIdAndType(Long deviceId, String type); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java index 4c78a785..bbaff6c8 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceConfigBusinessRuleServiceImpl.java @@ -40,9 +40,9 @@ public class DeviceConfigBusinessRuleServiceImpl implements DeviceConfigBusiness @Resource private DeviceProductService deviceProductService; @Override - public DeviceConfigBusinessRuleDO getByProductId(Long productId) { + public DeviceConfigBusinessRuleDO getByProductId(Long productId, String businessDomain) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(DeviceConfigBusinessRuleDO::getProductId, productId); + queryWrapper.eq(DeviceConfigBusinessRuleDO::getProductId, productId).eq(DeviceConfigBusinessRuleDO::getBusinessDomain, businessDomain); List list = deviceConfigBusinessRuleMapper.selectList(queryWrapper); if(list.size() > 1) throw exception0(DEVICE_CONFIG_BUSINESS_RULE_NOT_EXISTS.getCode(), "业务配置数据有" + list.size() + "行， 请联系管理员处理！"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml index 48eeb280..2977a9f2 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.xml @@ -78,6 +78,13 @@ and d.PDT_ID = #{param.productId} + + and d.PDT_ID in ( + + #{productId} + + ) + and d.DEV_NAME like concat('%',#{param.deviceName},'%')