From 80e0f329f7074bce2869cbfeefbe9fe7489dd461 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 30 Dec 2025 10:28:30 +0800 Subject: [PATCH] =?UTF-8?q?cad=E4=B8=89=E7=BB=B4=E7=9C=8B=E5=9B=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/vo/order/OrderCadViewPlatePageReqVO.java | 4 +++- .../controller/admin/plate/PlateController.java | 3 +-- .../admin/plate/vo/OrderCadViewInfoGroup.java | 10 ++++++++++ .../executor/service/plate/PlateServiceImpl.java | 8 +++----- 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java index 234cd0ff3..eaeaa1a4d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java @@ -2,6 +2,7 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order; import com.cf.imes.framework.common.pojo.PageParam; import com.cf.imes.framework.common.validation.InEnum; +import com.cf.imes.module.executor.controller.admin.plate.vo.OrderCadViewInfoGroup; import com.cf.imes.module.executor.enums.OrderCadViewPlateRangeEnum; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; @@ -32,10 +33,11 @@ public class OrderCadViewPlatePageReqVO extends PageParam { private Long groupId; @Schema(description = "板件编号", example = "1024") + @NotNull(message = "板件编号不能为空", groups = OrderCadViewInfoGroup.class) private Long plateNo; @Schema(description = "板件查询范围", example = "1") -// @NotNull(message = "板件查询范围不能为空") + @NotNull(message = "板件查询范围不能为空", groups = OrderCadViewInfoGroup.class) @InEnum(OrderCadViewPlateRangeEnum.class) private Integer range; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index 9d84fed44..bc0b82d41 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -147,8 +147,7 @@ public class PlateController { @GetMapping("/body/view/cadinfo") @Operation(summary = "获取板件对应柜体下的所有板件视图列表数据") - @Parameter(name = "plateNo", description = "板件id", required = true) - public CommonResult> getBodyViewPlatesCadInfo(@Valid OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { + public CommonResult> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { return success(plateService.getBodyViewPlatesCadInfo(orderCadViewPlatePageReqVO)); } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java new file mode 100644 index 000000000..7b440bcce --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java @@ -0,0 +1,10 @@ +package com.cf.imes.module.executor.controller.admin.plate.vo; + +/** + * cad视图信息请求校验组 + * + * @author Gqr + * @since 2025/12/30 9:58 + */ +public interface OrderCadViewInfoGroup { +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 430d202fa..14c0d6e72 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -884,12 +884,10 @@ public class PlateServiceImpl implements PlateService { IPage viewPlatesPage; Integer range = reqVO.getRange(); - if (OrderCadViewPlateRangeEnum.GROUP.getRange().equals(range)) { - viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getGroupId(), orderItemDO.getOrganId(), true); - } else if (OrderCadViewPlateRangeEnum.GROUP_WITH_BODY.getRange().equals(range)) { - viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getGroupId(), orderItemDO.getOrganId(), true); - } else { + if (OrderCadViewPlateRangeEnum.BODY.getRange().equals(range)) { viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), null, orderItemDO.getOrganId(), true); + } else { + viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderItemDO.getOrderId(), orderItemDO.getRoomId(), orderItemDO.getBodyId(), orderItemDO.getGroupId(), orderItemDO.getOrganId(), true); } List records = viewPlatesPage.getRecords();