Merge remote-tracking branch 'origin/dev'

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

@@ -310,7 +310,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         }
     }
 
-    @Async
+    @Async("executorService")
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId) {
         String userId = null;

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -18,7 +17,10 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
-import com.epmet.commons.tools.utils.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.FileUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcTripReportRecordDao;
@@ -332,7 +334,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }).collect(Collectors.toList());
     }
 
-    @Async
+    @Async("executorService")
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) {
         try {
@@ -417,11 +419,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
      * @param entities
      */
     public void batchPersist(List<IcTripReportRecordEntity> entities) {
-        String currentUserId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
         entities.forEach(e -> {
             String id = IdWorker.getIdStr(e);
             e.setId(id);
-            e.setUpdatedBy(currentUserId);
             baseDao.insert(e);
         });
     }

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
+    @Async("executorService")
     @Override
     public void execAsyncExcelImport(Path filePath, String importTaskId) {
         String userId = null;