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 | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 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 4d19e88..b738729 100644 --- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java +++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java @@ -1,7 +1,11 @@ package com.doumee.api.web; import com.doumee.config.Jwt.JwtTokenUtil; +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; @@ -15,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; @@ -52,6 +57,9 @@ @LoginRequired @ApiOperation("椋庨櫓涓婃姤") @PostMapping("/create") + @PreventRepeat + @EncryptionReq + @EncryptionResp public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { Member user = jwtTokenUtil.getUserInfoByToken(token); @@ -69,6 +77,8 @@ @LoginRequired @ApiOperation("閫氱煡浜烘煡璇�") @PostMapping("/managersList") + @EncryptionReq + @EncryptionResp public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { @@ -85,9 +95,10 @@ @LoginRequired @ApiOperation("椋庨櫓涓婃姤璇︽儏") @GetMapping("/detail") + @EncryptionReq + @EncryptionResp public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { - return ApiResponse.success(workorderService.getDetail(id,jwtTokenUtil.getUserInfoByToken(token))); }catch (BusinessException e){ return ApiResponse.failed(e.getCode(),e.getMessage()); @@ -102,6 +113,9 @@ @LoginRequired @ApiOperation("宸ュ崟鍏抽棴") @PostMapping("/closeWorkOrder") + @PreventRepeat + @EncryptionReq + @EncryptionResp public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token)); @@ -121,9 +135,11 @@ @LoginRequired @ApiOperation("宸ュ崟鎸囨淳") @PostMapping("/passOn") + @PreventRepeat + @EncryptionReq + @EncryptionResp public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { - passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token)); workorderService.passOn(passOnDTO); return ApiResponse.success("鎿嶄綔鎴愬姛"); @@ -140,9 +156,11 @@ @LoginRequired @ApiOperation("宸ュ崟鍌績") @GetMapping("/urge") + @PreventRepeat + @EncryptionReq + @EncryptionResp public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { - workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token)); return ApiResponse.success("鎿嶄綔鎴愬姛"); }catch (BusinessException e){ @@ -156,10 +174,12 @@ @LoginRequired @ApiOperation("宸ュ崟鎶勯��") + @PreventRepeat @PostMapping("/sendCopy") - public ApiResponse sendCopy(@RequestParam SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { + @EncryptionReq + @EncryptionResp + public ApiResponse sendCopy(@RequestBody SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { - sendCopyDTO.setMember(jwtTokenUtil.getUserInfoByToken(token)); workorderService.sendCopy(sendCopyDTO); return ApiResponse.success("鎿嶄綔鎴愬姛"); @@ -176,6 +196,8 @@ @LoginRequired @ApiOperation("SHE銆佽穼缁婃粦鎶ヨ〃") @PostMapping("/getWorkOrderData") + @EncryptionReq + @EncryptionResp public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { try { @@ -189,23 +211,25 @@ } - @LoginRequired @ApiOperation("鍒嗛〉鏌ヨ") @PostMapping("/page") + @EncryptionReq + @EncryptionResp public ApiResponse<PageData<Workorder>> findPage (@RequestBody PageWrap<Workorder> pageWrap,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token) { 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){ e.printStackTrace(); return ApiResponse.failed(ResponseStatus.SERVER_ERROR); } - - } + + } -- Gitblit v1.9.3