From f717ad3e0a712e823d61383f42de6faf917e7636 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 11 二月 2025 15:23:10 +0800 Subject: [PATCH] 远程模块websocket中,如果客户端id为空,系统设置其一id --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 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 053f427..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; @@ -96,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