Merge remote-tracking branch 'origin/master'

jiangping

2025-04-22 3dd12d913b5d9c2096e53f9d14475c534b813e6b

 server/src/main/java/com/doumee/api/web/WebWorkOrderController.java

@@ -1,6 +1,8 @@
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.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -52,13 +54,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 +73,8 @@
    @LoginRequired
    @ApiOperation("通知人查询")
    @PostMapping("/managersList")
    @EncryptionReq
    @EncryptionResp
    public ApiResponse<List<Managers>> managersList (@RequestBody Managers model, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
        try {

@@ -87,9 +91,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 +109,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 +130,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 +150,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 +168,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 +188,8 @@
    @LoginRequired
    @ApiOperation("SHE、跌绊滑报表")
    @PostMapping("/getWorkOrderData")
    @EncryptionReq
    @EncryptionResp
    public ApiResponse<List<WorkOrderDataVO>> getWorkOrderData(@RequestBody OrderDataDTO orderDataDTO, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token) {
        try {

@@ -191,10 +203,11 @@
    }



    @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);
@@ -206,8 +219,8 @@
            e.printStackTrace();
            return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
        }


    }



}