From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 ba0b08a..06ad2fc 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,10 @@
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.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
@@ -15,6 +18,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,13 +56,13 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤")
@PostMapping("/create")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
-
Member user = jwtTokenUtil.getUserInfoByToken(token);
workorder.setMemberId(user.getId());
- workorderService.create(workorder);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ return ApiResponse.success(workorderService.create(workorder));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
@@ -71,6 +75,8 @@
@LoginRequired
@ApiOperation("閫氱煡浜烘煡璇�")
@PostMapping("/managersList")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
@@ -87,9 +93,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());
@@ -104,6 +111,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鍏抽棴")
@PostMapping("/closeWorkOrder")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
@@ -123,9 +132,10 @@
@LoginRequired
@ApiOperation("宸ュ崟鎸囨淳")
@PostMapping("/passOn")
+ @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("鎿嶄綔鎴愬姛");
@@ -142,9 +152,10 @@
@LoginRequired
@ApiOperation("宸ュ崟鍌績")
@GetMapping("/urge")
+ @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){
@@ -159,9 +170,10 @@
@LoginRequired
@ApiOperation("宸ュ崟鎶勯��")
@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("鎿嶄綔鎴愬姛");
@@ -178,6 +190,8 @@
@LoginRequired
@ApiOperation("SHE銆佽穼缁婃粦鎶ヨ〃")
@PostMapping("/getWorkOrderData")
+ @EncryptionReq
+ @EncryptionResp
public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
@@ -191,23 +205,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