Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@@ -227,7 +227,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
      * @return
      */
     @PostMapping("import")
-    public Result importExcel(MultipartFile file) {
+    public Result importExcel(@LoginUser TokenDto tokenDto, MultipartFile file) {
         String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
 
         // 1.暂存文件
@@ -271,7 +271,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
                 "行程上报导入失败");
 
         // 3.执行导入
-        icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId());
+        icTripReportRecordService.execAsyncExcelImport(fileSavePath, rstData.getTaskId(),tokenDto.getCustomerId(),tokenDto.getUserId());
         return new Result();
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java

@@ -23,12 +23,12 @@ public class IcVaccineImportExcelData implements Serializable {
 
     @NotBlank(message = "手机号为必填项")
     @ExcelProperty("手机号")
-    @Length(max = 15, message = "手机号长度不正确，应小于15位")
+    @Length(max = 15, message = "手机号长度不正确")
     private String mobile;
 
     @NotBlank(message = "身份证号为必填项")
     @ExcelProperty("身份证号")
-    @Length(max = 18, message = "身份证号长度不正确，应小于18位")
+    @Length(max = 18, message = "身份证号长度不正确")
     private String idCard;
 
     @NotNull(message = "接种时间为必填项")

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java

@@ -99,5 +99,5 @@ public interface IcTripReportRecordService extends BaseService<IcTripReportRecor
      * 执行Excel导入
      * @param filePath
      */
-    void execAsyncExcelImport(Path filePath, String importTaskId);
+    void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId);
 }

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
-    private UserService userService;
+    //@Autowired
+    //private UserService userService;
 
     /**
      * @Author sun
@@ -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;
@@ -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,7 +539,7 @@ 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位");
         }

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
-    private IcNatService icNatService;
+    //@Resource
+    //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

@@ -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,14 +334,10 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
         }).collect(Collectors.toList());
     }
 
-    @Async
+    @Async("executorService")
     @Override
-    public void execAsyncExcelImport(Path filePath, String importTaskId) {
-        String userId = null;
-        String customerId=null;
+    public void execAsyncExcelImport(Path filePath, String importTaskId,String customerId,String userId) {
         try {
-            userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
-            customerId = EpmetRequestHolder.getHeader(AppClientConstant.CUSTOMER_ID);
             //获取当前登录用户所属组织id
             CustomerStaffInfoCacheResult staffInfo= queryCurrentStaff(customerId,userId);
 
@@ -421,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;