From 4b3f119b61143fed474b9dfcafd2369fc558a3b9 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期三, 07 五月 2025 15:06:52 +0800 Subject: [PATCH] 添加分页获取未删除阀控器列表接口 --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java index 3b1096a..830de5b 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java @@ -10,6 +10,7 @@ import com.dy.pipIrrGlobal.pojoBa.BaClient; import com.dy.pipIrrGlobal.pojoPr.PrDivide; import com.dy.pipIrrGlobal.voPr.VoDivide; +import com.dy.pipIrrGlobal.voPr.VoDivideDetails; import com.dy.pipIrrGlobal.voSe.VoActiveCard; import com.dy.pipIrrProject.result.ProjectResultCode; import io.swagger.v3.oas.annotations.Operation; @@ -67,12 +68,13 @@ @SsoAop() public BaseResponse<QueryResultVo<List<VoDivide>>> getDivides(QueryVo vo){ try { - QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo); - if(res.itemTotal != null && res.itemTotal > 0) { - return BaseResponseUtils.buildSuccess(res); - }else { - return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage()); - } + //QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo); + //if(res.itemTotal != null && res.itemTotal > 0) { + // return BaseResponseUtils.buildSuccess(res); + //}else { + // return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_DIVIDES.getMessage()); + //} + return BaseResponseUtils.buildSuccess(divideSv.getDivides(vo)); } catch (Exception e) { log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e); return BaseResponseUtils.buildException(e.getMessage()) ; @@ -95,14 +97,16 @@ }) @GetMapping(path = "/getone/{id}") @SsoAop() - public BaseResponse<PrDivide> getOneDivide(@PathVariable("id") Long id){ + //public BaseResponse<PrDivide> getOneDivide(@PathVariable("id") Long id){ + public BaseResponse<VoDivideDetails> getOneDivide(@PathVariable("id") Long id){ try { - PrDivide res = divideSv.getOneDivide(id); - if(res != null) { - return BaseResponseUtils.buildSuccess(res); - }else { - return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_DIVIDES.getMessage()); - } + //PrDivide res = divideSv.getOneDivide(id); + //if(res != null) { + // return BaseResponseUtils.buildSuccess(res); + //}else { + // return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_DIVIDES.getMessage()); + //} + return BaseResponseUtils.buildSuccess(divideSv.getDivideDetails(id)); } catch (Exception e) { log.error("鏌ヨ鍐滄埛寮傚父", e); return BaseResponseUtils.buildException(e.getMessage()) ; -- Gitblit v1.8.0