From 4d4394311a96e15ea204e2cae03dda00750d0fdd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/web/WebWorkOrderController.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 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 b4d14cc..ba0b08a 100644
--- a/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
+++ b/server/src/main/java/com/doumee/api/web/WebWorkOrderController.java
@@ -5,12 +5,12 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Managers;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Workorder;
-import com.doumee.dao.web.dto.CloseDTO;
-import com.doumee.dao.web.dto.PassOnDTO;
-import com.doumee.dao.web.dto.UpdEmailDTO;
+import com.doumee.dao.web.dto.*;
import com.doumee.dao.web.vo.WorkOrderDataVO;
import com.doumee.service.business.ManagersService;
import com.doumee.service.business.MemberService;
@@ -18,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.java.Log;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.server.ServerWebExchange;
@@ -51,9 +52,9 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤")
@PostMapping("/create")
- public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse create (@RequestBody Workorder workorder, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
Member user = jwtTokenUtil.getUserInfoByToken(token);
workorder.setMemberId(user.getId());
workorderService.create(workorder);
@@ -70,9 +71,9 @@
@LoginRequired
@ApiOperation("閫氱煡浜烘煡璇�")
@PostMapping("/managersList")
- public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
return ApiResponse.success(managersService.findList(model));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
@@ -86,10 +87,10 @@
@LoginRequired
@ApiOperation("椋庨櫓涓婃姤璇︽儏")
@GetMapping("/detail")
- public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse<Workorder> detail (@RequestParam Integer id, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
- return ApiResponse.success(workorderService.getDetail(id));
+
+ return ApiResponse.success(workorderService.getDetail(id,jwtTokenUtil.getUserInfoByToken(token)));
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
@@ -103,9 +104,8 @@
@LoginRequired
@ApiOperation("宸ュ崟鍏抽棴")
@PostMapping("/closeWorkOrder")
- public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse closeWorkOrder(@RequestBody CloseDTO closeDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
closeDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.closeWorkOrder(closeDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -123,9 +123,9 @@
@LoginRequired
@ApiOperation("宸ュ崟鎸囨淳")
@PostMapping("/passOn")
- public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse passOn(@RequestBody PassOnDTO passOnDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
passOnDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
workorderService.passOn(passOnDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -142,9 +142,9 @@
@LoginRequired
@ApiOperation("宸ュ崟鍌績")
@GetMapping("/urge")
- public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ public ApiResponse urge(@RequestParam Integer workorderId, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
workorderService.urge(workorderId,jwtTokenUtil.getUserInfoByToken(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
@@ -155,13 +155,16 @@
}
}
+
@LoginRequired
- @ApiOperation("鎶ヨ〃")
- @GetMapping("/getWorkOrderData")
- public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestParam Integer queryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
+ @ApiOperation("宸ュ崟鎶勯��")
+ @PostMapping("/sendCopy")
+ public ApiResponse sendCopy(@RequestParam SendCopyDTO sendCopyDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
- return ApiResponse.success(workorderService.getWorkOrderData(queryType));
+
+ sendCopyDTO.setMember(jwtTokenUtil.getUserInfoByToken(token));
+ workorderService.sendCopy(sendCopyDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
}catch (BusinessException e){
return ApiResponse.failed(e.getCode(),e.getMessage());
}catch (Exception e){
@@ -172,5 +175,39 @@
+ @LoginRequired
+ @ApiOperation("SHE銆佽穼缁婃粦鎶ヨ〃")
+ @PostMapping("/getWorkOrderData")
+ public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
+ try {
+
+ return ApiResponse.success(workorderService.getWorkOrderData(orderDataDTO));
+ }catch (BusinessException e){
+ return ApiResponse.failed(e.getCode(),e.getMessage());
+ }catch (Exception e){
+ e.printStackTrace();
+ return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
+ }
+ }
+
+
+
+ @LoginRequired
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ 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));
+ }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