cad三维看图接口参数校验修正

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;
 }

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<List<OrderBodyViewPlatePageRespVO>> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
-    public CommonResult<List<OrderBodyViewPlatePageRespVO>> getBodyViewPlatesCadInfo(@Valid OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
         return success(plateService.getBodyViewPlatesCadInfo(orderCadViewPlatePageReqVO));
     }
 }

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 {
+}

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<OrderBodyViewPlatesPageDO> viewPlatesPage;
 
         Integer range = reqVO.getRange();
-        if (OrderCadViewPlateRangeEnum.GROUP.getRange().equals(range)) {
+        if (OrderCadViewPlateRangeEnum.BODY.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 {
             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<OrderBodyViewPlatesPageDO> records = viewPlatesPage.getRecords();