manager-server | 修改 | 运单、附件查询跟操作分开

mt
2024年11月6日15:26:31

 package com.fedex.connect.customer.controller.biz;
 package com.fedex.connect.customer.controller.biz;
 
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import com.fedex.connect.customer.data.bo.LongBo;
-import org.springframework.web.bind.annotation.RequestBody;
-
 public interface IAttachmentController {
 public interface IAttachmentController {
-    ResponseVo findHistory(@RequestBody LongBo bo);
 }
 }

@@ -2,11 +2,8 @@ package com.fedex.connect.customer.controller.biz;
 
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.bo.AddBo;
-import com.fedex.connect.customer.data.query.ConsignmentQuery;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
 public interface IConsignmentController {
 public interface IConsignmentController {
-    ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery);
-
     ResponseVo addConsignment(@RequestBody AddBo bo);
     ResponseVo addConsignment(@RequestBody AddBo bo);
 }
 }

+package com.fedex.connect.customer.controller.biz;
+
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public interface IConsignmentQueryController {
+    ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery);
+}

+package com.fedex.connect.customer.controller.biz.impl;
+
+import com.fedex.connect.common.dependencies.date.model.LogShowModel;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.dependencies.enums.ResponseCode;
+import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
+import com.fedex.connect.customer.controller.base.BaseController;
+import com.fedex.connect.customer.controller.biz.IAttachmentController;
+import com.fedex.connect.customer.data.bo.LongBo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+  * @Author Szl
+  * @Description 类说明 附件相关
+  * @Date 2024/11/4
+  */
+@Slf4j
+@RestController
+@RequestMapping(value = "/attachment", name = "附件操作相关")
+@Api(value = "AttachmentControllerImpl", tags = {"附件操作相关"})
+public class AttachmentController extends BaseController implements IAttachmentController {
+
+}

@@ -17,16 +17,16 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
   * @Author Szl
   * @Author Szl
-  * @Description 类说明 附件相关
+  * @Description 附件查询相关
   * @Date 2024/11/4
   * @Date 2024/11/4
   */
   */
 @Slf4j
 @Slf4j
 @RestController
 @RestController
-@RequestMapping(value = "/attachment", name = "附件相关")
-@Api(value = "AttachmentControllerImpl", tags = {"附件相关"})
-public class AttachmentControllerImpl extends BaseController implements IAttachmentController {
+@RequestMapping(value = "/attachment/query", name = "附件查询相关")
+@Api(value = "AttachmentQueryController", tags = {"附件查询相关"})
+public class AttachmentQueryController extends BaseController implements IAttachmentController {
 
 
-    @PostMapping("/find/history")
+    @PostMapping("/history")
     @ApiOperation(value = "历史上传记录查询")
     @ApiOperation(value = "历史上传记录查询")
     public ResponseVo findHistory(@RequestBody LongBo bo) {
     public ResponseVo findHistory(@RequestBody LongBo bo) {
         ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);
         ResponseVo responseResultVo = attachmentValidate.preCheckForFindHistory(bo);

@@ -8,7 +8,6 @@ import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.biz.IConsignmentController;
 import com.fedex.connect.customer.controller.biz.IConsignmentController;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.bo.AddBo;
-import com.fedex.connect.customer.data.query.ConsignmentQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -20,39 +19,18 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
   * @Author Szl
   * @Author Szl
-  * @Description 类说明 运单相关接口
+  * @Description 类说明 运单操作相关接口
   * @Date 2024/10/30
   * @Date 2024/10/30
   */
   */
 @RestController
 @RestController
-@RequestMapping(value = "/consignment", name = "运单相关")
-@Api(value = "ConsignmentController", tags = {"运单相关"})
-public class ConsignmentControllerImpl extends BaseController implements IConsignmentController {
-    private static final Logger logger = LoggerFactory.getLogger(ConsignmentControllerImpl.class);
-
-
-    @PostMapping("/find/list")
-    @ApiOperation(value = "运单查询")
-    public ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
-        User user = null;
-        try {
-            user = CurrentUserInfo.getUser();
-            //userId = 0L;
-        } catch (Exception e) {
-            logger.error(LogShowModel.showException("Exception", e));
-            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
-        }
-        if (user == null) {
-            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
-        }
-
-        ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
-        query.setUserId(user.getId());
-        query.setUuid(user.getUserUuid());
-        return consignmentService.findConsignments(query);
-    }
+@RequestMapping(value = "/consignment", name = "运单操作相关")
+@Api(value = "ConsignmentController", tags = {"运单操作相关"})
+public class ConsignmentController extends BaseController implements IConsignmentController {
+    private static final Logger logger = LoggerFactory.getLogger(ConsignmentController.class);
 
 
     @PostMapping("/add")
     @PostMapping("/add")
     @ApiOperation("上传运单")
     @ApiOperation("上传运单")
+//    @OperationMethodLog()
     public ResponseVo addConsignment(@RequestBody AddBo bo){
     public ResponseVo addConsignment(@RequestBody AddBo bo){
         ResponseVo responseResultVo = consignmentValidate.preCheckAdd(bo);
         ResponseVo responseResultVo = consignmentValidate.preCheckAdd(bo);
         if (responseResultVo != null){
         if (responseResultVo != null){

+package com.fedex.connect.customer.controller.biz.impl;
+
+import com.fedex.connect.common.dependencies.date.model.LogShowModel;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.dependencies.enums.ResponseCode;
+import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
+import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.customer.controller.base.BaseController;
+import com.fedex.connect.customer.controller.biz.IConsignmentQueryController;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+  * @Author Szl
+  * @Description 类说明 运单查询相关接口
+  * @Date 2024/10/30
+  */
+@RestController
+@RequestMapping(value = "/consignment/query", name = "运单查询相关")
+@Api(value = "ConsignmentQueryController", tags = {"运单查询相关"})
+public class ConsignmentQueryController extends BaseController implements IConsignmentQueryController {
+    private static final Logger logger = LoggerFactory.getLogger(ConsignmentQueryController.class);
+
+    @PostMapping("/list")
+    @ApiOperation(value = "运单查询")
+    public ResponseVo findConsignmentList(@RequestBody ConsignmentQuery consignmentQuery) {
+        User user = null;
+        try {
+            user = CurrentUserInfo.getUser();
+            //userId = 0L;
+        } catch (Exception e) {
+            logger.error(LogShowModel.showException("Exception", e));
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
+        }
+        if (user == null) {
+            return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.OVERDUE_TOKEN_CODE.getMsg()));
+        }
+
+        ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
+        query.setUserId(user.getId());
+        query.setUuid(user.getUserUuid());
+        return consignmentService.findConsignments(query);
+    }
+}

@@ -35,7 +35,7 @@ import java.util.*;
 @RestController
 @RestController
 @RequestMapping(value = "/auth", name = "权鉴操作相关请求")
 @RequestMapping(value = "/auth", name = "权鉴操作相关请求")
 @Api(value="SysAuthController",tags={"用户相关请求(无需token)"})
 @Api(value="SysAuthController",tags={"用户相关请求(无需token)"})
-public class SysAuthControllerImpl extends BaseController implements ISysAuthController {
+public class SysAuthController extends BaseController implements ISysAuthController {
 
 
 
 
     @Value("${fcl.interface.logurl}")
     @Value("${fcl.interface.logurl}")