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 b5071c4d8..85cecc012 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 @@ -14,7 +14,6 @@ import com.cf.imes.module.executor.dal.dataobject.plate.PlateGoodDO; import com.cf.imes.module.executor.service.plate.PlateService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; @@ -137,15 +136,15 @@ public class PlateController { return success(plateService.createNewPlate(reqVO)); } - @GetMapping("/view/page") + @GetMapping("/body/view/page") @Operation(summary = "获取柜体下的板件视图分页列表数据") public CommonResult> getBodyViewPlatesPage(@Validated(OrderCadViewPageGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { - return success(plateService.getViewPlatesPage(orderCadViewPlatePageReqVO)); + return success(plateService.getBodyViewPlatesPage(orderCadViewPlatePageReqVO)); } - @GetMapping("/view/cadinfo") + @GetMapping("/body/view/cadinfo") @Operation(summary = "获取板件对应柜体下的所有板件视图列表数据") public CommonResult> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { - return success(plateService.getViewPlatesCadInfo(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/service/plate/PlateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java index afdcd4301..60ebeb8a2 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateService.java @@ -96,18 +96,18 @@ public interface PlateService { List createNewPlate(List reqVO); /** - * 获取板件视图分页列表 + * 获取柜体板件视图分页列表 * * @param orderBodyPageRespVO * @return */ - PageResult getViewPlatesPage(OrderCadViewPlatePageReqVO orderBodyPageRespVO); + PageResult getBodyViewPlatesPage(OrderCadViewPlatePageReqVO orderBodyPageRespVO); /** - * 根据板件id获取所有板件cad视图所需信息 + * 根据板件id获取柜体下所有板件cad视图所需信息 * * @param orderBodyPageRespVO * @return */ - List getViewPlatesCadInfo(OrderCadViewPlatePageReqVO orderBodyPageRespVO); + List getBodyViewPlatesCadInfo(OrderCadViewPlatePageReqVO orderBodyPageRespVO); } \ 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/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 e9173e417..3dbf74f81 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 @@ -810,7 +810,7 @@ public class PlateServiceImpl implements PlateService { } @Override - public PageResult getViewPlatesPage(OrderCadViewPlatePageReqVO pageReqVO) { + public PageResult getBodyViewPlatesPage(OrderCadViewPlatePageReqVO pageReqVO) { PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage pageRes = orderItemMapper.selectBodyViewPlatesPage(page, pageReqVO.getOrderId(), pageReqVO.getRoomId(), pageReqVO.getBodyId(), pageReqVO.getGroupId(), getUserOrganId(), null, false); @@ -818,7 +818,7 @@ public class PlateServiceImpl implements PlateService { } @Override - public List getViewPlatesCadInfo(OrderCadViewPlatePageReqVO reqVO) { + public List getBodyViewPlatesCadInfo(OrderCadViewPlatePageReqVO reqVO) { Long plateId = reqVO.getPlateNo(); // 匹配板材 PlateDO plateDO = plateMapper.selectById(plateId);