Merge remote-tracking branch 'origin/dev' into dev

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java

@@ -1,5 +1,6 @@
 package com.epmet.commons.tools.config;
 
+import com.alibaba.ttl.TtlRunnable;
 import com.alibaba.ttl.threadpool.TtlExecutors;
 import org.slf4j.MDC;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -64,8 +65,9 @@ public class AsyncConfig {
         executor.setKeepAliveSeconds(keepAliveSeconds);
         // 设置装饰器，使用MDC将runnable进行装饰，实现日志上下文传递到子线程
         executor.setTaskDecorator((Runnable r) -> {
+            // 1.mdc包装，日志追踪
             Map<String, String> copyOfContextMap = MDC.getCopyOfContextMap();
-            return () -> {
+            Runnable rr = () -> {
                 try {
                     if (copyOfContextMap != null && copyOfContextMap.size() > 0) {
                         MDC.setContextMap(copyOfContextMap);
@@ -75,6 +77,9 @@ public class AsyncConfig {
                     MDC.clear();
                 }
             };
+
+            // 2.ttl包装，异步线程上下文透传
+            return TtlRunnable.get(rr);
         });
         executor.initialize();
         return executor;

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -85,8 +85,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
     private IcNatRelationDao icNatRelationDao;
     @Autowired
     private IcResiUserDao icResiUserDao;
-    @Autowired
+    //@Autowired
-    private UserService userService;
+    //private UserService userService;
 
     /**
      * @Author sun
@@ -310,7 +310,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         }
     }
 
-    @Async("executorService")
+    @Async
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId) {
         String userId = null;
@@ -320,7 +320,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             String app = EpmetRequestHolder.getHeader(AppClientConstant.APP);
             String client = EpmetRequestHolder.getHeader(AppClientConstant.CLIENT);
 
-            LoginUserDetailsResultDTO loginUserDetails = userService.getLoginUserDetails(app, client, userId);
+            LoginUserDetailsResultDTO loginUserDetails = SpringContextUtils.getBean(UserService.class).getLoginUserDetails(app, client, userId);
 
             String agencyId = loginUserDetails.getAgencyId();
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -539,14 +539,14 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         List<String> errors = new ArrayList<>();
 
-        if (idCard.length() > 18) {
+        if (StringUtils.isNotBlank(idCard) && idCard.length() > 18) {
             // 身份证号超长了哦，不可以的
-            errors.add("身份证号过长，限制18位");
+            errors.add("身份证号过长");
         }
 
         if (StringUtils.isNotBlank(mobile) && mobile.length() > 15) {
             // 手机号超长也是不可以的
-            errors.add("手机号过长，限制15位");
+            errors.add("手机号过长");
         }
 
         if (errors.size() > 0) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -120,8 +120,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private IcUserTransferRecordService icUserTransferRecordService;
     @Autowired
     private RedisTemplate redisTemplate;
-    @Resource
+    //@Resource
-    private IcNatService icNatService;
+    //private IcNatService icNatService;
     //@Resource
     //private IcVaccineService icVaccineService;
     @Resource
@@ -1354,7 +1354,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         IcResiUserEntity icResiUser = baseDao.selectById(formDTO.getId());
         if (null != icResiUser) {
             //核酸检测
-            List<NatListDTO> natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard());
+            List<NatListDTO> natList = SpringContextUtils.getBean(IcNatService.class).getNatList(formDTO.getCustomerId(), icResiUser.getIdCard());
             result.setNatList(natList);
             //疫苗接种
             List<VaccineListDTO> vaccineList = SpringContextUtils.getBean(IcVaccineService.class).getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -334,7 +334,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }).collect(Collectors.toList());
     }
 
-    @Async("executorService")
+    @Async
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) {
         try {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -160,7 +160,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
         }
     }
 
-    @Async("executorService")
+    @Async
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId) {
         String userId = null;