From f1d43f160a1e9f42477f542122589e9867998bc1 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Mon, 10 Mar 2025 19:10:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9A=E5=A4=8D=E5=88=B6webcad?= =?UTF-8?q?=E4=B8=93=E7=94=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=97=A0=E9=9C=80?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/parts/PartsController.java | 10 ++++------ .../module/manage/service/parts/PartsService.java | 12 ++++++++++-- .../manage/service/parts/PartsServiceImpl.java | 14 +++++++++++--- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java index 82317b2c1..f9c1d4e4c 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java @@ -95,7 +95,7 @@ public class PartsController { @GetMapping("/webcad/page") @Operation(summary = "获得配件分页") public CommonResult> webCadGetPage(@Valid PartsPageReqVO pageReqVO) { - PageResult pageResult = partsService.getPage(pageReqVO); + PageResult pageResult = partsService.webCadGetPage(pageReqVO); return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); } @@ -159,12 +159,10 @@ public class PartsController { return success(BeanUtils.toBean(pageResult, PartsRespVO.class)); } - @GetMapping("/all") + @GetMapping("/webcad/all") @Operation(summary = "获取全部配件信息") - @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')") - public CommonResult> getPlateAll(@RequestParam("organId") Long organId, - @RequestParam("category") String category) { - List list = partsService.getPartAll(organId,category); + public CommonResult> getPlateAll(@RequestParam("category") String category) { + List list = partsService.getPartAll(category); return success(BeanUtils.toBean(list, PartsRespVO.class)); } } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java index 5d75cf48d..5398235c8 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java @@ -61,6 +61,14 @@ public interface PartsService { */ PageResult getPage(PartsPageReqVO pageReqVO); + /** + * webcad获取配件表 parts_{N}分页 + * + * @param pageReqVO 分页查询 + * @return 配件表 parts_{N}分页 + */ + PageResult webCadGetPage(PartsPageReqVO pageReqVO); + PageResult getCadPage(PartsCadPageReqVO pageReqVO); /** @@ -74,7 +82,7 @@ public interface PartsService { * @param importParts 导入配件列表 * @param isUpdateSupport 是否支持更新 */ - void importPartsList(List importParts, boolean isUpdateSupport , Long organId); + void importPartsList(List importParts, boolean isUpdateSupport, Long organId); default String getSavePath() { @@ -85,5 +93,5 @@ public interface PartsService { } - List getPartAll(Long organId, String category); + List getPartAll(String category); } \ No newline at end of file diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java index f064706f7..4e74cb616 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java @@ -157,6 +157,15 @@ public class PartsServiceImpl implements PartsService { return partsMapper.selectPage(pageReqVO); } + @Override + public PageResult webCadGetPage(PartsPageReqVO pageReqVO) { + pageReqVO.setLength(numberUtil.compareLength(pageReqVO.getLength())) + .setWidth(numberUtil.compareLength(pageReqVO.getWidth())) + .setThickness(numberUtil.compareLength(pageReqVO.getThickness())); + + return partsMapper.selectPage(pageReqVO); + } + @Override @OrganIgnore public PageResult getCadPage(PartsCadPageReqVO pageReqVO) { @@ -209,9 +218,8 @@ public class PartsServiceImpl implements PartsService { } @Override - public List getPartAll(Long organId, String category) { - organId = getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), organId); - return partsMapper.getAllByOrganId(organId , category); + public List getPartAll(String category) { + return partsMapper.getAllByOrganId(OrganContextHolder.getOrganId(), category); } private void validateOrganExists(Long organId) {