From ea58523b67ad59002a1191c3c564258c5b81f6f2 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 17:35:16 +0800 Subject: [PATCH] Revert "1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。" --- pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java index f9f8936..7d64f28 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/allRound/Ar4BaseCtrl.java @@ -3,9 +3,8 @@ import com.dy.common.aop.SsoAop; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; -import com.dy.common.webUtil.QueryResultVo; import com.dy.common.webUtil.ResultCodeMsg; -import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase; +import com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -41,7 +40,7 @@ /** * 缁煎悎淇℃伅 * 鍙栨按鍙e熀鏈俊鎭� - * @return 鎵�鏈夌墖鍖烘暟鎹� + * @return 鍙栨按鍙e熀鏈俊鎭� */ @Operation(summary = "缁煎悎淇℃伅", description = "鍙栨按鍙e熀鏈俊鎭�") @ApiResponses(value = { @@ -54,11 +53,11 @@ }) @GetMapping(path = "intakeInfo") @SsoAop() - public BaseResponse<QueryResultVo<VoArIntakeBase>> intakeInfo(Long intakeId) { + public BaseResponse<VoArIntakeBase> intakeInfo(Long intakeId) { if (intakeId == null || intakeId.longValue() == 0L) { return BaseResponseUtils.buildException("鍙栨按鍙d涓嶈兘涓虹┖"); } - QueryResultVo<VoArIntakeBase> res = this.sv.intakeInfo(intakeId); + VoArIntakeBase res = this.sv.intakeInfo(intakeId); return BaseResponseUtils.buildSuccess(res); } } -- Gitblit v1.8.0