Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
tao.mo
a4de3ac5 1 parent 1c13aedd

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

mt
2024年11月1日10:32:43
Inline Side-by-side
Showing 16 changed files with 23 additions and 3 deletions
1 package com.fedex.connect.common.dependencies.date.dto; 1 package com.fedex.connect.common.dependencies.date.dto;
2 2
3 +import com.fedex.connect.common.model.sys.User;
3 import org.springframework.security.core.GrantedAuthority; 4 import org.springframework.security.core.GrantedAuthority;
4 import org.springframework.security.core.userdetails.UserDetails; 5 import org.springframework.security.core.userdetails.UserDetails;
5 6
......
1 package com.fedex.connect.common.dependencies.repository.dao; 1 package com.fedex.connect.common.dependencies.repository.dao;
2 2
3 +import com.fedex.connect.common.model.sys.User;
3 import org.apache.ibatis.annotations.Mapper; 4 import org.apache.ibatis.annotations.Mapper;
4 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
5 import org.apache.ibatis.annotations.Select; 6 import org.apache.ibatis.annotations.Select;
......
1 package com.fedex.connect.common.dependencies.repository.repo.sys; 1 package com.fedex.connect.common.dependencies.repository.repo.sys;
2 2
3 +import com.fedex.connect.common.model.sys.User;
4 +
3 public interface IUserRepository { 5 public interface IUserRepository {
4 User findOne(Long id); 6 User findOne(Long id);
5 } 7 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.sys.impl; ...@@ -2,6 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.repository.base.BaseDao; 3 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
4 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository; 4 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
5 +import com.fedex.connect.common.model.sys.User;
5 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
6 7
7 @Repository 8 @Repository
......
1 package com.fedex.connect.common.dependencies.util; 1 package com.fedex.connect.common.dependencies.util;
2 2
3 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails; 3 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
4 +import com.fedex.connect.common.model.sys.User;
4 import org.springframework.security.core.GrantedAuthority; 5 import org.springframework.security.core.GrantedAuthority;
5 import org.springframework.security.core.context.SecurityContextHolder; 6 import org.springframework.security.core.context.SecurityContextHolder;
6 import org.springframework.security.core.userdetails.UserDetails; 7 import org.springframework.security.core.userdetails.UserDetails;
...@@ -62,7 +63,7 @@ public class CurrentUserInfo { ...@@ -62,7 +63,7 @@ public class CurrentUserInfo {
62 * @return 63 * @return
63 */ 64 */
64 public static String getUserName() throws Exception { 65 public static String getUserName() throws Exception {
65 - return getUser().getAccNo() + " - " + getUser().getUserName(); 66 + return getUser().getLoginName() + " - " + getUser().getUserName();
66 } 67 }
67 68
68 /** 69 /**
...@@ -71,7 +72,7 @@ public class CurrentUserInfo { ...@@ -71,7 +72,7 @@ public class CurrentUserInfo {
71 * @return 72 * @return
72 */ 73 */
73 public static String getLoginName() throws Exception { 74 public static String getLoginName() throws Exception {
74 - return getUser().getAccNo(); 75 + return getUser().getLoginName();
75 } 76 }
76 77
77 public static Long findUserId() { 78 public static Long findUserId() {
......
...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.authentication.SecurityConstants; ...@@ -4,6 +4,7 @@ import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
4 import com.fedex.connect.common.dependencies.contants.RedisConstants; 4 import com.fedex.connect.common.dependencies.contants.RedisConstants;
5 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails; 5 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
6 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository; 6 import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
7 +import com.fedex.connect.common.model.sys.User;
7 import io.jsonwebtoken.Claims; 8 import io.jsonwebtoken.Claims;
8 import io.jsonwebtoken.Jwts; 9 import io.jsonwebtoken.Jwts;
9 import io.jsonwebtoken.SignatureAlgorithm; 10 import io.jsonwebtoken.SignatureAlgorithm;
......
1 package com.fedex.connect.kafka.listener.dmlistener; 1 package com.fedex.connect.kafka.listener.dmlistener;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 +import com.fedex.connect.common.model.sys.KafkaStorageHistory;
4 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 5 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
5 import com.fedex.connect.kafka.data.dto.DmProcessResults; 6 import com.fedex.connect.kafka.data.dto.DmProcessResults;
6 import com.fedex.connect.kafka.listener.DmListenerInterface; 7 import com.fedex.connect.kafka.listener.DmListenerInterface;
......
1 package com.fedex.connect.kafka.repository.base; 1 package com.fedex.connect.kafka.repository.base;
2 2
3 +import com.fedex.connect.common.dao.biz.CeInfoMapper;
4 +import com.fedex.connect.common.dao.sys.KafkaStorageHistoryMapper;
3 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper; 5 import com.fedex.connect.common.dao.sys.KafkaTemporaryStorageMapper;
4 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt; 6 import com.fedex.connect.kafka.repository.dao.CeInfoMapperExt;
5 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt; 7 import com.fedex.connect.kafka.repository.dao.KafkaTemporaryStorageMapperExt;
......
1 package com.fedex.connect.kafka.repository.dao; 1 package com.fedex.connect.kafka.repository.dao;
2 2
3 +import com.fedex.connect.common.model.biz.CeInfo;
3 import org.apache.ibatis.annotations.Mapper; 4 import org.apache.ibatis.annotations.Mapper;
4 import org.apache.ibatis.annotations.Param; 5 import org.apache.ibatis.annotations.Param;
5 import org.apache.ibatis.annotations.Select; 6 import org.apache.ibatis.annotations.Select;
......
1 package com.fedex.connect.kafka.repository.repo; 1 package com.fedex.connect.kafka.repository.repo;
2 2
3 +import com.fedex.connect.common.model.biz.CeInfo;
4 +
3 import java.util.List; 5 import java.util.List;
4 6
5 /** 7 /**
......
1 package com.fedex.connect.kafka.repository.repo; 1 package com.fedex.connect.kafka.repository.repo;
2 2
3 +import com.fedex.connect.common.model.sys.KafkaStorageHistory;
4 +
3 import java.util.List; 5 import java.util.List;
4 6
5 /** 7 /**
......
1 package com.fedex.connect.kafka.repository.repo.impl; 1 package com.fedex.connect.kafka.repository.repo.impl;
2 2
3 +import com.fedex.connect.common.model.biz.CeInfo;
3 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository; 4 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
4 import com.fedex.connect.kafka.repository.repo.ICeInfoRepository; 5 import com.fedex.connect.kafka.repository.repo.ICeInfoRepository;
5 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
......
1 package com.fedex.connect.kafka.repository.repo.impl; 1 package com.fedex.connect.kafka.repository.repo.impl;
2 2
3 +import com.fedex.connect.common.model.sys.KafkaStorageHistory;
3 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository; 4 import com.fedex.connect.kafka.repository.base.AbstractDaoRepository;
4 import com.fedex.connect.kafka.repository.repo.IKafkaStorageHistoryRepository; 5 import com.fedex.connect.kafka.repository.repo.IKafkaStorageHistoryRepository;
5 import org.springframework.stereotype.Repository; 6 import org.springframework.stereotype.Repository;
......
1 package com.fedex.connect.kafka.service; 1 package com.fedex.connect.kafka.service;
2 2
3 +import com.fedex.connect.common.model.sys.KafkaStorageHistory;
3 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 4 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
4 import com.fedex.connect.kafka.data.dto.DmProcessResults; 5 import com.fedex.connect.kafka.data.dto.DmProcessResults;
5 6
......
...@@ -3,6 +3,7 @@ package com.fedex.connect.kafka.service.impl; ...@@ -3,6 +3,7 @@ package com.fedex.connect.kafka.service.impl;
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.fedex.connect.common.dependencies.util.DateUtil; 4 import com.fedex.connect.common.dependencies.util.DateUtil;
5 import com.fedex.connect.common.dependencies.util.Utils; 5 import com.fedex.connect.common.dependencies.util.Utils;
6 +import com.fedex.connect.common.model.biz.CeInfo;
6 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 7 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
7 import com.fedex.connect.kafka.constants.Constant; 8 import com.fedex.connect.kafka.constants.Constant;
8 import com.fedex.connect.kafka.data.dto.DmProcessResults; 9 import com.fedex.connect.kafka.data.dto.DmProcessResults;
...@@ -61,7 +62,7 @@ public class Dm501ServiceImpl extends BaseService implements IDm501Service { ...@@ -61,7 +62,7 @@ public class Dm501ServiceImpl extends BaseService implements IDm501Service {
61 * @param dm501Consignment 62 * @param dm501Consignment
62 * @return com.fedex.connect.common.model.biz.CeInfo 63 * @return com.fedex.connect.common.model.biz.CeInfo
63 */ 64 */
64 - private CeInfo generateCeInfo(Date sendTime,Dm501Consignments dm501Consignment){ 65 + private CeInfo generateCeInfo(Date sendTime, Dm501Consignments dm501Consignment){
65 CeInfo bizCeInfo = new CeInfo(); 66 CeInfo bizCeInfo = new CeInfo();
66 bizCeInfo.setConsignmentCode(dm501Consignment.getTrackingNumber()); 67 bizCeInfo.setConsignmentCode(dm501Consignment.getTrackingNumber());
67 bizCeInfo.setCreateTime(new Date()); 68 bizCeInfo.setCreateTime(new Date());
......
...@@ -2,6 +2,7 @@ package com.fedex.connect.kafka.service.impl; ...@@ -2,6 +2,7 @@ package com.fedex.connect.kafka.service.impl;
2 2
3 import com.fasterxml.jackson.databind.ObjectMapper; 3 import com.fasterxml.jackson.databind.ObjectMapper;
4 import com.fasterxml.jackson.databind.node.ObjectNode; 4 import com.fasterxml.jackson.databind.node.ObjectNode;
5 +import com.fedex.connect.common.model.sys.KafkaStorageHistory;
5 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage; 6 import com.fedex.connect.common.model.sys.KafkaTemporaryStorage;
6 import com.fedex.connect.kafka.data.dto.DmProcessResults; 7 import com.fedex.connect.kafka.data.dto.DmProcessResults;
7 import com.fedex.connect.kafka.listener.DmListenerInterface; 8 import com.fedex.connect.kafka.listener.DmListenerInterface;
......