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

mt
2024年11月7日10:10:37

@@ -2,15 +2,14 @@ package com.fedex.connect.customer.controller.base;
 
 
 
 
 import com.fedex.connect.common.dependencies.common.BasicController;
 import com.fedex.connect.common.dependencies.common.BasicController;
-import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import com.fedex.connect.common.dependencies.enums.ResponseCode;
-import com.fedex.connect.common.dependencies.exception.OpErrorException;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
-import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.customer.service.biz.IAttachmentQueryService;
 import com.fedex.connect.customer.service.biz.IAttachmentService;
 import com.fedex.connect.customer.service.biz.IAttachmentService;
+import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.validate.controller.biz.AttachmentValidate;
 import com.fedex.connect.customer.validate.controller.biz.AttachmentValidate;
+import com.fedex.connect.customer.validate.controller.biz.ConsignmentInfoValidate;
 import com.fedex.connect.customer.validate.controller.biz.ConsignmentValidate;
 import com.fedex.connect.customer.validate.controller.biz.ConsignmentValidate;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,14 +29,23 @@ public class BaseController extends BasicController {
     protected IConsignmentService consignmentService;
     protected IConsignmentService consignmentService;
 
 
     @Autowired
     @Autowired
+    protected IConsignmentQueryService consignmentQueryService;
+
+    @Autowired
     protected IAttachmentService attachmentService;
     protected IAttachmentService attachmentService;
 
 
     @Autowired
     @Autowired
+    protected IAttachmentQueryService attachmentQueryService;
+
+    @Autowired
     protected AttachmentValidate attachmentValidate;
     protected AttachmentValidate attachmentValidate;
 
 
     @Autowired
     @Autowired
     protected ConsignmentValidate consignmentValidate;
     protected ConsignmentValidate consignmentValidate;
 
 
+    @Autowired
+    protected ConsignmentInfoValidate consignmentInfoValidate;
+
     public User getCurrentUserInfo(){
     public User getCurrentUserInfo(){
         User user = this.getUserInfo(localeMessageUtil);
         User user = this.getUserInfo(localeMessageUtil);
         return user;
         return user;

@@ -5,7 +5,6 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
 import com.fedex.connect.common.dependencies.util.CurrentUserInfo;
 import com.fedex.connect.customer.controller.base.BaseController;
 import com.fedex.connect.customer.controller.base.BaseController;
-import com.fedex.connect.customer.controller.biz.IAttachmentController;
 import com.fedex.connect.customer.controller.biz.IAttachmentQueryController;
 import com.fedex.connect.customer.controller.biz.IAttachmentQueryController;
 import com.fedex.connect.customer.data.bo.LongBo;
 import com.fedex.connect.customer.data.bo.LongBo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -43,7 +42,7 @@ public class AttachmentQueryController extends BaseController implements IAttach
             log.error(LogShowModel.showException("Exception", e));
             log.error(LogShowModel.showException("Exception", e));
             return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
             return ResponseVo.fail(localeMessageUtil.getMessage(ResponseCode.TOKEN_FORMAT_ERROR.getMsg()));
         }
         }
-        return attachmentService.findHistory(userId,bo.getId());
+        return attachmentQueryService.findHistory(userId,bo.getId());
     }
     }
 
 
 }
 }

@@ -37,7 +37,7 @@ public class ConsignmentQueryController extends BaseController implements IConsi
         ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
         ConsignmentQuery query = ConsignmentQuery.dataProcessing(consignmentQuery);
         query.setUserId(user.getId());
         query.setUserId(user.getId());
         query.setUuid(user.getUserUuid());
         query.setUuid(user.getUserUuid());
-        return consignmentService.findConsignments(query);
+        return consignmentQueryService.findConsignments(query);
     }
     }
 
 
     @PostMapping("/info/{id}")
     @PostMapping("/info/{id}")
@@ -49,11 +49,13 @@ public class ConsignmentQueryController extends BaseController implements IConsi
          */
          */
         User user = this.getCurrentUserInfo();
         User user = this.getCurrentUserInfo();
 
 
+        consignmentInfoValidate.validateConsignmentId(id);
+
         ConsignmentInfoQuery detailQuery = new ConsignmentInfoQuery();
         ConsignmentInfoQuery detailQuery = new ConsignmentInfoQuery();
         detailQuery.setUserId(user.getId());
         detailQuery.setUserId(user.getId());
         detailQuery.setUuid(user.getUserUuid());
         detailQuery.setUuid(user.getUserUuid());
         detailQuery.setConsignmentId(id);
         detailQuery.setConsignmentId(id);
-//        return consignmentService.findConsignmentInfo(detailQuery);
+//        return consignmentQueryService.findConsignmentInfo(detailQuery);
         return null;
         return null;
     }
     }
 }
 }

+package com.fedex.connect.customer.service.biz;
+
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+
+public interface IAttachmentQueryService {
+    ResponseVo findHistory(Long userId, Long bizId);
+}

 package com.fedex.connect.customer.service.biz;
 package com.fedex.connect.customer.service.biz;
 
 
-import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-
 public interface IAttachmentService {
 public interface IAttachmentService {
-    ResponseVo findHistory(Long userId, Long bizId);
 }
 }

+package com.fedex.connect.customer.service.biz;
+
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+
+public interface IConsignmentQueryService {
+    /**
+      * @Author Szl
+      * @Description 功能说明 运单查询
+      * @Date 2024/11/5
+      * @param query
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
+      */
+    ResponseVo findConsignments(ConsignmentQuery query);
+}

@@ -3,17 +3,8 @@ package com.fedex.connect.customer.service.biz;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.bo.AddBo;
-import com.fedex.connect.customer.data.query.ConsignmentQuery;
 
 
 public interface IConsignmentService {
 public interface IConsignmentService {
-    /**
-      * @Author Szl
-      * @Description 功能说明 运单查询
-      * @Date 2024/11/5
-      * @param query
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
-      */
-    ResponseVo findConsignments(ConsignmentQuery query);
 
 
     /**
     /**
       * @Author Szl
       * @Author Szl

+package com.fedex.connect.customer.service.biz.impl;
+
+import com.fedex.connect.common.dependencies.contants.DigitConstants;
+import com.fedex.connect.common.dependencies.date.vo.PageResult;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
+import com.fedex.connect.customer.service.base.BaseService;
+import com.fedex.connect.customer.service.biz.IAttachmentQueryService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+  * @Author Szl
+  * @Description 类说明 附件查询相关service
+  * @Date 2024/11/4
+  */
+@Service
+public class AttachmentQueryServiceImpl extends BaseService implements IAttachmentQueryService {
+    /**
+      * @Author Szl
+      * @Description 功能说明 查询该运单历史数据
+      * @Date 2024/11/5
+      * @param userId
+      * @param bizId
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
+      */
+    public ResponseVo findHistory(Long userId, Long bizId) {
+        List<AttachmentHistoryDto> history = attachmentRepository.findHistory(bizId);
+
+        if (history != null) {
+            history.forEach(attachmentHistoryDto ->
+                    attachmentHistoryDto.setCreatorFlag(
+                            (attachmentHistoryDto.getUploadUserId() != null &&
+                                    attachmentHistoryDto.getUploadUserId().equals(userId)) ?
+                                    DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
+                    )
+            );
+        }
+
+        PageResult pageResult = new PageResult();
+        pageResult.setList(history != null ? history : Collections.emptyList());
+
+        return ResponseVo.succ(pageResult);
+    }
+
+}

 package com.fedex.connect.customer.service.biz.impl;
 package com.fedex.connect.customer.service.biz.impl;
 
 
-import com.fedex.connect.common.dependencies.contants.DigitConstants;
-import com.fedex.connect.common.dependencies.date.vo.PageResult;
-import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import com.fedex.connect.customer.data.dto.AttachmentHistoryDto;
 import com.fedex.connect.customer.service.base.BaseService;
 import com.fedex.connect.customer.service.base.BaseService;
 import com.fedex.connect.customer.service.biz.IAttachmentService;
 import com.fedex.connect.customer.service.biz.IAttachmentService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.Collections;
-import java.util.List;
-
 /**
 /**
   * @Author Szl
   * @Author Szl
-  * @Description 类说明 附件相关service
+  * @Description 类说明 附件操作相关service
   * @Date 2024/11/4
   * @Date 2024/11/4
   */
   */
 @Service
 @Service
 public class AttachmentServiceImpl extends BaseService implements IAttachmentService {
 public class AttachmentServiceImpl extends BaseService implements IAttachmentService {
-    /**
-      * @Author Szl
-      * @Description 功能说明 查询该运单历史数据
-      * @Date 2024/11/5
-      * @param userId
-      * @param bizId
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
-      */
-    public ResponseVo findHistory(Long userId, Long bizId) {
-        List<AttachmentHistoryDto> history = attachmentRepository.findHistory(bizId);
-
-        if (history != null) {
-            history.forEach(attachmentHistoryDto ->
-                    attachmentHistoryDto.setCreatorFlag(
-                            (attachmentHistoryDto.getUploadUserId() != null &&
-                                    attachmentHistoryDto.getUploadUserId().equals(userId)) ?
-                                    DigitConstants.DIGIT_ONE : DigitConstants.DIGIT_ZERO
-                    )
-            );
-        }
-
-        PageResult pageResult = new PageResult();
-        pageResult.setList(history != null ? history : Collections.emptyList());
-
-        return ResponseVo.succ(pageResult);
-    }
 
 
 }
 }

+package com.fedex.connect.customer.service.biz.impl;
+
+import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
+import com.fedex.connect.common.dependencies.date.vo.PageResult;
+import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
+import com.fedex.connect.customer.data.query.ConsignmentQuery;
+import com.fedex.connect.customer.service.base.BaseService;
+import com.fedex.connect.customer.service.biz.IConsignmentQueryService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+  * @Author Szl
+  * @Description 类说明 运单查询相关service
+  * @Date 2024/10/31
+  */
+@Service
+public class ConsignmentQueryServiceImpl extends BaseService implements IConsignmentQueryService {
+    /**
+      * @Author Szl
+      * @Description 功能说明 运单查询
+      * @Date 2024/11/5
+      * @param query
+      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
+      */
+    public ResponseVo findConsignments(ConsignmentQuery query) {
+
+        List<String> consignmentCodeList = query.getConsignmentCodeList();
+        if (Utils.isNotEmpty(consignmentCodeList) && consignmentCodeList.size() > GlobalConstantFedex.DECLARE_COUNT) {
+            return ResponseVo.fail(localeMessageUtil.getMessage("conl_cus_declare_count_max"));
+        }
+
+        //查询数量
+        Long total = consignmentExtRepository.findAllCount(query);
+
+        PageResult pageResult = new PageResult();
+        pageResult.setTotal(total);
+        pageResult.setPage(query.getPage());
+        pageResult.setSize(query.getSize());
+        if (total != null && total > 0) {
+            List<FindConsignmentsDto> consignments = consignmentExtRepository.findConsignments(query);
+            pageResult.setList(consignments);
+        }
+        return ResponseVo.succ(pageResult);
+    }
+}

 package com.fedex.connect.customer.service.biz.impl;
 package com.fedex.connect.customer.service.biz.impl;
 
 
-import com.fedex.connect.common.dependencies.contants.GlobalConstantFedex;
-import com.fedex.connect.common.dependencies.date.vo.PageResult;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.biz.Consignment;
 import com.fedex.connect.common.model.biz.Consignment;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.customer.data.bo.AddBo;
 import com.fedex.connect.customer.data.bo.AddBo;
-import com.fedex.connect.customer.data.dto.FindConsignmentsDto;
-import com.fedex.connect.customer.data.query.ConsignmentQuery;
 import com.fedex.connect.customer.service.base.BaseService;
 import com.fedex.connect.customer.service.base.BaseService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.service.biz.IConsignmentService;
 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
 import com.fedex.connect.customer.util.service.biz.ConsignmentUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.List;
-
 /**
 /**
   * @Author Szl
   * @Author Szl
-  * @Description 类说明 运单相关service
+  * @Description 类说明 运单操作相关service
   * @Date 2024/10/31
   * @Date 2024/10/31
   */
   */
 @Service
 @Service
@@ -30,34 +23,6 @@ public class ConsignmentServiceImpl extends BaseService implements IConsignmentS
 
 
     /**
     /**
       * @Author Szl
       * @Author Szl
-      * @Description 功能说明 运单查询
-      * @Date 2024/11/5
-      * @param query
-      * @return com.fedex.connect.common.dependencies.date.vo.ResponseVo
-      */
-    public ResponseVo findConsignments(ConsignmentQuery query) {
-
-        List<String> consignmentCodeList = query.getConsignmentCodeList();
-        if (Utils.isNotEmpty(consignmentCodeList) && consignmentCodeList.size() > GlobalConstantFedex.DECLARE_COUNT) {
-            return ResponseVo.fail(localeMessageUtil.getMessage("conl_cus_declare_count_max"));
-        }
-
-        //查询数量
-        Long total = consignmentExtRepository.findAllCount(query);
-
-        PageResult pageResult = new PageResult();
-        pageResult.setTotal(total);
-        pageResult.setPage(query.getPage());
-        pageResult.setSize(query.getSize());
-        if (total != null && total > 0) {
-            List<FindConsignmentsDto> consignments = consignmentExtRepository.findConsignments(query);
-            pageResult.setList(consignments);
-        }
-        return ResponseVo.succ(pageResult);
-    }
-
-    /**
-      * @Author Szl
       * @Description 功能说明 新增运单
       * @Description 功能说明 新增运单
       * @Date 2024/11/5
       * @Date 2024/11/5
       * @param bo
       * @param bo

@@ -4,10 +4,8 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.enums.ResponseCode;
 import com.fedex.connect.common.dependencies.exception.OpErrorException;
 import com.fedex.connect.common.dependencies.exception.OpErrorException;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
-import com.fedex.connect.customer.data.bo.AddBo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 
 import java.util.Objects;
 import java.util.Objects;