kafka-cndc-server | 修改 | kafka501消息处理

mt
2024年11月1日10:32:43

 package com.fedex.connect.common.dependencies.date.dto;
 
+import com.fedex.connect.common.model.sys.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

 package com.fedex.connect.common.dependencies.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;

 package com.fedex.connect.common.dependencies.repository.repo.sys;
 
+import com.fedex.connect.common.model.sys.User;
+
 public interface IUserRepository {
     User findOne(Long id);
 }
\ No newline at end of file

@@ -2,6 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
 
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
+import com.fedex.connect.common.model.sys.User;
 import org.springframework.stereotype.Repository;
 
 @Repository

 package com.fedex.connect.common.dependencies.util;
 
 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
+import com.fedex.connect.common.model.sys.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -62,7 +63,7 @@ public class CurrentUserInfo {
      * @return
      */
     public static String getUserName() throws Exception {
-        return getUser().getAccNo() + " - " + getUser().getUserName();
+        return getUser().getLoginName() + " - " + getUser().getUserName();
     }
 
     /**
@@ -71,7 +72,7 @@ public class CurrentUserInfo {
      * @return
      */
     public static String getLoginName() throws Exception {
-        return getUser().getAccNo();
+        return getUser().getLoginName();
     }
 
     public static Long findUserId() {

@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
+import com.fedex.connect.common.model.sys.User;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;

 package com.fedex.connect.kafka.listener.dmlistener;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fedex.connect.common.model.sys.KafkaStorageHistory;
 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
 import com.fedex.connect.kafka.data.dto.DmProcessResults;
 import com.fedex.connect.kafka.listener.DmListenerInterface;

 package com.fedex.connect.kafka.repository.base;
 
+import com.fedex.connect.common.dao.biz.CeInfoMapper;
+import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt;
 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt;

 package com.fedex.connect.kafka.repository.dao;
 
+import com.fedex.connect.common.model.biz.CeInfo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

 package com.fedex.connect.kafka.repository.repo;
 
+import com.fedex.connect.common.model.biz.CeInfo;
+
 import java.util.List;
 
 /**

 package com.fedex.connect.kafka.repository.repo;
 
+import com.fedex.connect.common.model.sys.KafkaStorageHistory;
+
 import java.util.List;
 
 /**

 package com.fedex.connect.kafka.repository.repo.impl;
 
+import com.fedex.connect.common.model.biz.CeInfo;
 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
 import com.fedex.connect.kafka.repository.repo.ICeInfoRepository;
 import org.springframework.stereotype.Repository;

 package com.fedex.connect.kafka.repository.repo.impl;
 
+import com.fedex.connect.common.model.sys.KafkaStorageHistory;
 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
 import com.fedex.connect.kafka.repository.repo.IKafkaStorageHistoryRepository;
 import org.springframework.stereotype.Repository;

 package com.fedex.connect.kafka.service;
 
+import com.fedex.connect.common.model.sys.KafkaStorageHistory;
 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
 import com.fedex.connect.kafka.data.dto.DmProcessResults;
 

@@ -3,6 +3,7 @@ package com.fedex.connect.kafka.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.fedex.connect.common.dependencies.util.DateUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.common.model.biz.CeInfo;
 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
 import com.fedex.connect.kafka.constants.Constant;
 import com.fedex.connect.kafka.data.dto.DmProcessResults;
@@ -61,7 +62,7 @@ public class Dm501ServiceImpl extends BaseService implements IDm501Service {
       * @param dm501Consignment
       * @return com.fedex.connect.common.model.biz.CeInfo
       */
-    private CeInfo generateCeInfo(Date sendTime,Dm501Consignments dm501Consignment){
+    private CeInfo generateCeInfo(Date sendTime, Dm501Consignments dm501Consignment){
         CeInfo bizCeInfo = new CeInfo();
         bizCeInfo.setConsignmentCode(dm501Consignment.getTrackingNumber());
         bizCeInfo.setCreateTime(new Date());

@@ -2,6 +2,7 @@ package com.fedex.connect.kafka.service.impl;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fedex.connect.common.model.sys.KafkaStorageHistory;
 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
 import com.fedex.connect.kafka.data.dto.DmProcessResults;
 import com.fedex.connect.kafka.listener.DmListenerInterface;