kafka-cdnc-server | 修改 | 基础操作类名称调整

mt
2024年12月19日17:59:10

@@ -2,14 +2,13 @@ package com.fedex.connect.common.dependencies.repository.base;
 
 
 import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
 import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
 import com.fedex.connect.common.dao.log.OperationMapper;
 import com.fedex.connect.common.dao.log.OperationMapper;
-import com.fedex.connect.common.dao.sys.ParamConfigMapper;
 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
-import com.fedex.connect.common.dependencies.repository.dao.UserMapperExt;
+import com.fedex.connect.common.dependencies.repository.dao.UserBaseMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
 public class BaseDao {
 public class BaseDao {
     @Autowired
     @Autowired
-    protected UserMapperExt userMapperExt;
+    protected UserBaseMapper userBaseMapper;
     @Autowired
     @Autowired
     protected RedisSlabMapper redisSlabMapper;
     protected RedisSlabMapper redisSlabMapper;
     @Autowired
     @Autowired

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
 
 
 @Mapper
 @Mapper
-public interface UserMapperExt {
+public interface UserBaseMapper {
     @Select( "<script>" +
     @Select( "<script>" +
             "select * from T_SYS_USER where ID = #{id} AND STATUS = 1 " +
             "select * from T_SYS_USER where ID = #{id} AND STATUS = 1 " +
             "</script>")
             "</script>")

@@ -5,6 +5,6 @@ import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
 
 
 import java.util.List;
 import java.util.List;
 
 
-public interface IDictionaryEntriesRepository {
+public interface IDictionaryEntriesBaseRepository {
     List<DictionaryEntries> findAll(DictionaryEntriesExample example);
     List<DictionaryEntries> findAll(DictionaryEntriesExample example);
 }
 }

@@ -2,7 +2,7 @@ package com.fedex.connect.common.dependencies.repository.repo.bi.impl;
 
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
 import com.fedex.connect.common.dependencies.repository.base.BaseDao;
-import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesRepository;
+import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesBaseRepository;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
 import com.fedex.connect.common.model.bi.DictionaryEntriesExample;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-public class DictionaryEntriesImpl extends BaseDao implements IDictionaryEntriesRepository {
+public class DictionaryEntriesBaseImpl extends BaseDao implements IDictionaryEntriesBaseRepository {
 
 
     @Override
     @Override
     public List<DictionaryEntries> findAll(DictionaryEntriesExample example) {
     public List<DictionaryEntries> findAll(DictionaryEntriesExample example) {

@@ -5,7 +5,7 @@ import com.fedex.connect.common.model.sys.RedisSlabExample;
 
 
 import java.util.List;
 import java.util.List;
 
 
-public interface IRedisSlabRepository {
+public interface IRedisSlabBaseRepository {
     int insert(RedisSlab record);
     int insert(RedisSlab record);
 
 
     List<RedisSlab> selectByExample(RedisSlabExample example);
     List<RedisSlab> selectByExample(RedisSlabExample example);

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

 package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
 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.base.BaseDao;
-import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabBaseRepository;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import com.fedex.connect.common.model.sys.RedisSlabExample;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-public class RedisSlabRepositoryImpl extends BaseDao implements IRedisSlabRepository {
+public class RedisSlabBaseRepositoryImpl extends BaseDao implements IRedisSlabBaseRepository {
 
 
     @Override
     @Override
     public int insert(RedisSlab record) {
     public int insert(RedisSlab record) {

 package com.fedex.connect.common.dependencies.repository.repo.sys.impl;
 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.base.BaseDao;
-import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IUserBaseRepository;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
 @Repository
-public class UserRepositoryImpl extends BaseDao implements IUserRepository {
+public class UserBaseRepositoryImpl extends BaseDao implements IUserBaseRepository {
 
 
     @Override
     @Override
     public User findOne(Long id){
     public User findOne(Long id){
-        return this.userMapperExt.findOne(id);
+        return this.userBaseMapper.findOne(id);
     }
     }
 }
 }

 package com.fedex.connect.common.dependencies.service.base;
 package com.fedex.connect.common.dependencies.service.base;
 
 
-import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
-import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabBaseRepository;
+import com.fedex.connect.common.dependencies.repository.repo.bi.IDictionaryEntriesBaseRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
 /**
@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
   */
   */
 public class BaseService {
 public class BaseService {
     @Autowired
     @Autowired
-    protected IRedisSlabRepository redisSlabRepository;
+    protected IRedisSlabBaseRepository redisSlabRepository;
     @Autowired
     @Autowired
-    protected IDictionaryEntriesRepository dictionaryEntriesRepository;
+    protected IDictionaryEntriesBaseRepository dictionaryEntriesRepository;
 }
 }
\ No newline at end of file

@@ -3,7 +3,7 @@ package com.fedex.connect.common.dependencies.util;
 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.authentication.SecurityConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.contants.RedisConstants;
 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
 import com.fedex.connect.common.dependencies.date.dto.SecurityUserDetails;
-import com.fedex.connect.common.dependencies.repository.repo.sys.IUserRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IUserBaseRepository;
 import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.User;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.Jwts;
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  */
  */
 public class JwtTokenUtils {
 public class JwtTokenUtils {
 
 
-    private static final IUserRepository userRepository = SpringBeanUtil.getBean(IUserRepository.class);
+    private static final IUserBaseRepository userRepository = SpringBeanUtil.getBean(IUserBaseRepository.class);
 
 
     /**
     /**
      * 生成足够的安全随机密钥，以适合符合规范的签名
      * 生成足够的安全随机密钥，以适合符合规范的签名

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Repository;
   * @Date 2024/12/19
   * @Date 2024/12/19
   */
   */
 @Repository
 @Repository
-public class UserExtRepositoryImpl extends BaseRepository implements IUserRepository {
+public class UserRepositoryImpl extends BaseRepository implements IUserRepository {
     /**
     /**
       * @Author mt
       * @Author mt
       * @Description 根据uuid查找用户信息
       * @Description 根据uuid查找用户信息

@@ -213,7 +213,7 @@ public class Dm501Util {
             /**
             /**
              * 根据uuid查找运单信息
              * 根据uuid查找运单信息
              */
              */
-            User user = userRepository.findUserByUUid(consignment.getUserUuid());
+            User user = userRepository.findUserByUUid(resultConsignment.getUserUuid());
             if(Objects.nonNull(user)){
             if(Objects.nonNull(user)){
                 resultConsignment.setCreateUserId(user.getId());
                 resultConsignment.setCreateUserId(user.getId());
                 resultConsignment.setCreateUserName(user.getUserName());
                 resultConsignment.setCreateUserName(user.getUserName());

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-public class RedisSlabExtImpl extends AbstractDaoRepository implements IRedisSlabRepository {
+public class RedisSlabRepositoryImpl extends AbstractDaoRepository implements IRedisSlabRepository {
 
 
     @Override
     @Override
     public int insert(RedisSlab record) {
     public int insert(RedisSlab record) {

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-public class UserExtRepositoryImpl extends AbstractDaoRepository implements IUserRepository {
+public class UserRepositoryImpl extends AbstractDaoRepository implements IUserRepository {
 
 
     @Override
     @Override
     public List<User> selectByExample(UserExample example) {
     public List<User> selectByExample(UserExample example) {

 package com.fedex.connect.task.service.base;
 package com.fedex.connect.task.service.base;
 
 
-import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabRepository;
+import com.fedex.connect.common.dependencies.repository.repo.sys.IRedisSlabBaseRepository;
 import com.fedex.connect.task.repository.repo.biz.IAttachmentRepository;
 import com.fedex.connect.task.repository.repo.biz.IAttachmentRepository;
 import com.fedex.connect.task.repository.repo.biz.IEmailRepository;
 import com.fedex.connect.task.repository.repo.biz.IEmailRepository;
 import com.fedex.connect.task.repository.repo.biz.IPushObDetailRepository;
 import com.fedex.connect.task.repository.repo.biz.IPushObDetailRepository;
@@ -22,7 +22,7 @@ public class BaseService {
     @Autowired
     @Autowired
     protected IKafkaStorageHistoryRepository kafkaStorageHistoryRepository;
     protected IKafkaStorageHistoryRepository kafkaStorageHistoryRepository;
     @Autowired
     @Autowired
-    protected IRedisSlabRepository redisSlabRepository;
+    protected IRedisSlabBaseRepository redisSlabRepository;
     @Autowired
     @Autowired
     protected IRedisSlabExtRepository redisRepository;
     protected IRedisSlabExtRepository redisRepository;
     @Autowired
     @Autowired