From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期二, 19 八月 2025 09:28:07 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh --- server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java index 147c29f..b738729 100644 --- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java +++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java @@ -4,6 +4,8 @@ import com.doumee.config.annotation.EncryptionReq; import com.doumee.config.annotation.EncryptionResp; import com.doumee.config.annotation.LoginRequired; +import com.doumee.core.annotation.pr.PreventRepeat; +import com.doumee.core.constants.Constants; import com.doumee.core.constants.ResponseStatus; import com.doumee.core.exception.BusinessException; import com.doumee.core.model.ApiResponse; @@ -17,6 +19,7 @@ import com.doumee.service.business.ManagersService; import com.doumee.service.business.MemberService; import com.doumee.service.business.WorkorderService; +import com.github.xiaoymin.knife4j.core.util.CollectionUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.java.Log; @@ -54,6 +57,7 @@ @LoginRequired @ApiOperation("椋庨櫓涓婃姤") @PostMapping("/create") + @PreventRepeat @EncryptionReq @EncryptionResp public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { @@ -109,6 +113,7 @@ @LoginRequired @ApiOperation("宸ュ崟鍏抽棴") @PostMapping("/closeWorkOrder") + @PreventRepeat @EncryptionReq @EncryptionResp public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { @@ -130,6 +135,7 @@ @LoginRequired @ApiOperation("宸ュ崟鎸囨淳") @PostMapping("/passOn") + @PreventRepeat @EncryptionReq @EncryptionResp public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { @@ -150,6 +156,7 @@ @LoginRequired @ApiOperation("宸ュ崟鍌績") @GetMapping("/urge") + @PreventRepeat @EncryptionReq @EncryptionResp public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { @@ -167,6 +174,7 @@ @LoginRequired @ApiOperation("宸ュ崟鎶勯��") + @PreventRepeat @PostMapping("/sendCopy") @EncryptionReq @EncryptionResp @@ -212,7 +220,8 @@ try { Member member = jwtTokenUtil.getUserInfoByToken(token); pageWrap.getModel().setQwId(member.getQwId()); - return ApiResponse.success(workorderService.findPage(pageWrap)); + PageData<Workorder> pageData = workorderService.findPage(pageWrap); + return ApiResponse.success(pageData); }catch (BusinessException e){ return ApiResponse.failed(e.getCode(),e.getMessage()); }catch (Exception e){ -- Gitblit v1.9.3