biz-customer | 修改 | 运单提交逻辑调整

mt
2024年12月19日16:59:44

@@ -6,6 +6,7 @@ import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt;
 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt;
 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt;
 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt;
+import com.fedex.connect.kafka.repository.dao.UserMapperExt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
 public class BaseRepository {
 public class BaseRepository {
@@ -21,4 +22,6 @@ public class BaseRepository {
     protected CeInfoMapperExt ceInfoMapperExt;
     protected CeInfoMapperExt ceInfoMapperExt;
     @Autowired
     @Autowired
     protected KafkaTemporaryStorageMapperExt kafkaTemporaryStorageMapperExt;
     protected KafkaTemporaryStorageMapperExt kafkaTemporaryStorageMapperExt;
+    @Autowired
+    protected UserMapperExt userMapperExt;
 }
 }
\ No newline at end of file

+package com.fedex.connect.kafka.repository.dao;
+
+import com.fedex.connect.common.model.sys.User;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+  * @Author mt
+  * @Description CE数据Mapper
+  * @Date 2024/4/22
+  */
+@Mapper
+public interface UserMapperExt {
+    /**
+     * 获取创建时间为1个月内CE数据
+     * @return
+     */
+    @Select( "<script>" +
+            "SELECT * FROM T_SYS_USER WHERE USER_UUID = #{uuid} AND ROWNUM &lt;= 1" +
+            "</script>")
+    User findUserByUUid(@Param("uuid") String uuid);
+}
\ No newline at end of file

+package com.fedex.connect.kafka.repository.repo;
+
+import com.fedex.connect.common.model.sys.User;
+
+public interface IUserRepository {
+    User findUserByUUid(String uuid);
+}

+package com.fedex.connect.kafka.repository.repo.impl;
+
+import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.kafka.repository.base.BaseRepository;
+import com.fedex.connect.kafka.repository.repo.IUserRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+  * @Author mt
+  * @Description 用户信息repository
+  * @Date 2024/12/19
+  */
+@Repository
+public class UserRepositoryImpl extends BaseRepository implements IUserRepository {
+    /**
+      * @Author mt
+      * @Description 根据uuid查找用户信息
+      * @Date 2024/12/19
+      * @param uuid
+      * @return com.fedex.connect.common.model.sys.User
+      */
+    @Override
+    public User findUserByUUid(String uuid) {
+        return userMapperExt.findUserByUUid(uuid);
+    }
+}

@@ -6,10 +6,12 @@ import com.fedex.connect.common.dependencies.util.DateUtil;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.biz.CeInfo;
 import com.fedex.connect.common.model.biz.CeInfo;
 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.kafka.constants.Constant;
 import com.fedex.connect.kafka.constants.Constant;
 import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501ConAddresses;
 import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501ConAddresses;
 import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501Consignments;
 import com.fedex.connect.kafka.data.dto.dm.dm501.Dm501Consignments;
 import com.fedex.connect.kafka.repository.repo.IConsignmentRepository;
 import com.fedex.connect.kafka.repository.repo.IConsignmentRepository;
+import com.fedex.connect.kafka.repository.repo.IUserRepository;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +29,8 @@ public class Dm501Util {
     CacheSystem cacheSystem;
     CacheSystem cacheSystem;
     @Autowired
     @Autowired
     IConsignmentRepository consignmentRepository;
     IConsignmentRepository consignmentRepository;
+    @Autowired
+    IUserRepository userRepository;
 
 
     /**
     /**
      * @Author mt
      * @Author mt
@@ -207,6 +211,14 @@ public class Dm501Util {
              */
              */
             this.initOriginCountryDestinationCountry(ceInfo,resultConsignment);
             this.initOriginCountryDestinationCountry(ceInfo,resultConsignment);
             /**
             /**
+             * 根据uuid查找运单信息
+             */
+            User user = userRepository.findUserByUUid(consignment.getUserUuid());
+            if(Objects.nonNull(user)){
+                resultConsignment.setCreateUserId(user.getId());
+                resultConsignment.setCreateUserName(user.getUserName());
+            }
+            /**
              * 初始化表基础字段
              * 初始化表基础字段
              */
              */
             AssignmentFieldUtils.assignmentTableBaseField(resultConsignment);
             AssignmentFieldUtils.assignmentTableBaseField(resultConsignment);