all | 修改 |

字段初始化赋值 mt 2025年5月29日17:51:45

all | 修改 |
字段初始化赋值 mt 2025年5月29日17:51:45
tao.mo
Commit 26f64f0f3ab0b7b1a74c1256747c3b18929e5d08 26f64f0f 1 parent 23a1cc91
Showing 7 changed files with 60 additions and 6 deletions
server/common-dependencies/src/main/java/com/fedex/connect/common/dependencies/data/bo/RedisSlabBo.java
server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/service/impl/KafkaDmServiceImpl.java
server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/util/Dm501Util.java
server/manager-server/src/main/java/com/fedex/connect/manager/data/dto/LogLoginDto.java
server/manager-server/src/main/java/com/fedex/connect/manager/service/sys/impl/SysUserRoleServiceImpl.java
server/manager-server/src/main/java/com/fedex/connect/manager/service/sys/impl/SysUserServiceImpl.java
server/task-schedule/src/main/java/com/fedex/connect/task/utils/biz/imp001/Imp001RecordLogUtil.java
--- a/server/common-dependencies/src/main/java/com/fedex/connect/common/dependencies/data/bo/RedisSlabBo.java
View file @26f64f0
+++ b/server/common-dependencies/src/main/java/com/fedex/connect/common/dependencies/data/bo/RedisSlabBo.java
View file @26f64f0
 package com.fedex.connect.common.dependencies.data.bo;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.dependencies.util.DateUtil;
 import com.fedex.connect.common.model.sys.RedisSlab;
@@ -13,11 +14,17 @@ public class RedisSlabBo {
         dao.setRedisMsg(value);
         dao.setValidDuration(validDuration != 0 ? Long.valueOf(validDuration) : 0L);
         dao.setDisTime(DateUtil.getHoursAgoTime(validDuration));
-        dao.setCreateTime(new Date());
+        try {
+            /**
+             * 初始化表基础字段
+             */
+            AssignmentFieldUtils.assignmentTableBaseField(dao);
+        }catch(Exception ex){
+            ex.printStackTrace();
+        }
         return dao;
     }
-
     /**
      * ID自增
      */
--- a/server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/service/impl/KafkaDmServiceImpl.java
View file @26f64f0
+++ b/server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/service/impl/KafkaDmServiceImpl.java
View file @26f64f0
@@ -3,12 +3,14 @@ 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.dependencies.enums.sys.KafkaStatusEnum;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 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;
 import com.fedex.connect.kafka.service.IKafkaDmService;
 import com.fedex.connect.kafka.service.base.BaseService;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -27,6 +29,7 @@ import java.util.Map;
  * mt
  * 2022年11月3日16:09:48
  */
+@Slf4j
 @Service
 public class KafkaDmServiceImpl extends BaseService implements ApplicationContextAware, IKafkaDmService {
     private Logger logger = LoggerFactory.getLogger(KafkaDmServiceImpl.class);
@@ -39,6 +42,16 @@ public class KafkaDmServiceImpl extends BaseService implements ApplicationContex
      */
     @Override
     public List<KafkaTemporaryStorage> saveKafkaTemporaryStorageAll(List<KafkaTemporaryStorage> kafkaTemporaryStorageList){
+        kafkaTemporaryStorageList.stream().forEach(p -> {
+            try {
+                /**
+                 * 初始化表基础字段
+                 */
+                AssignmentFieldUtils.assignmentTableBaseField(p);
+            }catch(Exception ex){
+                log.error("记录kafka历史表保存基础信息失败：",ex);
+            }
+        });
         return kafkaTemporaryStorageRepository.saveAll(kafkaTemporaryStorageList);
     }
@@ -48,6 +61,14 @@ public class KafkaDmServiceImpl extends BaseService implements ApplicationContex
      */
     @Override
     public KafkaStorageHistory saveKafkaStorageHistory(KafkaStorageHistory kafkaStorageHistory){
+        try {
+            /**
+             * 初始化表基础字段
+             */
+            AssignmentFieldUtils.assignmentTableBaseField(kafkaStorageHistory);
+        }catch(Exception ex){
+            log.error("记录kafka历史表保存基础信息失败：",ex);
+        }
         return kafkaStorageHistoryRepository.save(kafkaStorageHistory);
     }
--- a/server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/util/Dm501Util.java
View file @26f64f0
+++ b/server/kafka-cndc-server/src/main/java/com/fedex/connect/kafka/util/Dm501Util.java
View file @26f64f0
@@ -219,6 +219,8 @@ public class Dm501Util {
          */
         Consignment consignment = consignmentRepository.findThirtyDaysAgoConByCode(ceInfo.getConsignmentCode());
         if(Objects.isNull(consignment)){
+            //如果运单第一次获取，则不需要发送邮件
+            email = null;
             Consignment resultConsignment = new Consignment();
             BeanUtils.copyProperties(ceInfo,resultConsignment);
             /**
--- a/server/manager-server/src/main/java/com/fedex/connect/manager/data/dto/LogLoginDto.java
View file @26f64f0
+++ b/server/manager-server/src/main/java/com/fedex/connect/manager/data/dto/LogLoginDto.java
View file @26f64f0
@@ -54,7 +54,7 @@ public class LogLoginDto {
             /**
              * 初始化表基础字段
              */
-            AssignmentFieldUtils.assignmentTableBaseField(dto);
+            AssignmentFieldUtils.assignmentTableBaseField(log);
         }catch(Exception ex){
             ex.printStackTrace();
         }
--- a/server/manager-server/src/main/java/com/fedex/connect/manager/service/sys/impl/SysUserRoleServiceImpl.java
View file @26f64f0
+++ b/server/manager-server/src/main/java/com/fedex/connect/manager/service/sys/impl/SysUserRoleServiceImpl.java
View file @26f64f0
 package com.fedex.connect.manager.service.sys.impl;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.base.BaseService;
@@ -34,8 +35,14 @@ public class SysUserRoleServiceImpl extends BaseService implements ISysUserRoleS
             userRole.setUserId(userId);
             userRole.setRoleId(roleId);
             userRole.setStatus(DatabaseConstants.GLOBAL_STATUS_VALID);
-            userRole.setCreateTime(new Date());
+            try {
-            userRole.setModifyTime(new Date());
+                /**
+                 * 初始化表基础字段
+                 */
+                AssignmentFieldUtils.assignmentTableBaseField(userRole);
+            }catch(Exception ex){
+                ex.printStackTrace();
+            }
             return userRoleRepository.insert(userRole);
         } catch (Exception e){
             log.error(LogShowModel.showException("Exception",e));
--- a/server/manager-server/src/main/java/com/fedex/connect/manager/service/sys/impl/SysUserServiceImpl.java
View file @26f64f0
+++ b/server/manager-server/src/main/java/com/fedex/connect/manager/service/sys/impl/SysUserServiceImpl.java
View file @26f64f0
@@ -5,6 +5,7 @@ import com.fedex.connect.common.dependencies.authentication.EncryptProvider;
 import com.fedex.connect.common.dependencies.cache.CacheSystem;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.enums.sys.RoleEnum;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
@@ -132,6 +133,14 @@ public class SysUserServiceImpl extends BaseService implements ISysUserService {
     @Transactional(rollbackFor = Exception.class)
     public int saveSysUser(User user){
         try{
+            try {
+                /**
+                 * 初始化表基础字段
+                 */
+                AssignmentFieldUtils.assignmentTableBaseField(user);
+            }catch(Exception ex){
+                log.error("记录用户信息基础信息失败：",ex);
+            }
             return userRepository.insert(user);
         } catch (Exception e){
             log.error(LogShowModel.showException("Exception",e));
--- a/server/task-schedule/src/main/java/com/fedex/connect/task/utils/biz/imp001/Imp001RecordLogUtil.java
View file @26f64f0
+++ b/server/task-schedule/src/main/java/com/fedex/connect/task/utils/biz/imp001/Imp001RecordLogUtil.java
View file @26f64f0
 package com.fedex.connect.task.utils.biz.imp001;
 import com.fedex.connect.common.dependencies.contants.BaseSeparatorConstants;
+import com.fedex.connect.common.dependencies.util.AssignmentFieldUtils;
 import com.fedex.connect.common.dependencies.util.DateUtil;
 import com.fedex.connect.common.dependencies.util.NIOFileUtils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
@@ -133,7 +134,6 @@ public class Imp001RecordLogUtil {
                     nioFileUtils.moveFile(sPath, tPath);
                     //记录日志明细表
                     PushObDetail pushObDetail = new PushObDetail();
-                    pushObDetail.setCreateTime(new Date());
                     pushObDetail.setConsignmentId(tw001GenerateBo.getConsignmentId());
                     pushObDetail.setConsignmentCode(tw001GenerateBo.getConsignmentCode());
                     pushObDetail.setPushObId(obLog.getId());
@@ -144,6 +144,14 @@ public class Imp001RecordLogUtil {
                     pushObDetail.setFileName(fileInfo.getName());
                     pushObDetail.setPushTime(new Date());
                     pushObDetail.setRemark(remark);
+                    try {
+                        /**
+                         * 初始化表基础字段
+                         */
+                        AssignmentFieldUtils.assignmentTableBaseField(pushObDetail);
+                    }catch(Exception ex){
+                        ex.printStackTrace();
+                    }
                     pushObDetailList.add(pushObDetail);
                 }catch(Exception ex){
                     log.error("move file error : {} ",ex.getMessage(),ex);