From 7dfbcb60cea4ee27bfc9e5890de833d62b50a3e6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 8 Apr 2022 16:22:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/data/IcVaccineImportExcelData.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java index f85b77091b..60a83b2582 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcVaccineImportExcelData.java +++ b/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 = "接种时间为必填项") From af5bd46923988b45a9adb807d1c163932301ee31 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 8 Apr 2022 16:48:33 +0800 Subject: [PATCH 2/7] tokenqu --- .../com/epmet/controller/IcTripReportRecordController.java | 4 ++-- .../java/com/epmet/service/IcTripReportRecordService.java | 2 +- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 6 +----- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java index 663b425f4e..f6b0df98cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java +++ b/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(); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java index 66ec0d9f9e..ffd9f3db8d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcTripReportRecordService.java @@ -99,5 +99,5 @@ public interface IcTripReportRecordService extends BaseService Date: Fri, 8 Apr 2022 17:02:49 +0800 Subject: [PATCH 3/7] @Async=>@Async("executorService") --- .../src/main/java/com/epmet/service/impl/IcNatServiceImpl.java | 2 +- .../main/java/com/epmet/service/impl/IcVaccineServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 5f2deb846e..715f820896 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -310,7 +310,7 @@ public class IcNatServiceImpl extends BaseServiceImpl imp } } - @Async + @Async("executorService") @Override public void execAsyncExcelImport(Path filePath, String importTaskId) { String userId = null; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java index ec33974bf8..29a0109fa2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java @@ -160,7 +160,7 @@ public class IcVaccineServiceImpl extends BaseServiceImpl Date: Fri, 8 Apr 2022 17:04:24 +0800 Subject: [PATCH 4/7] test --- .../com/epmet/service/impl/IcTripReportRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index e1d29a4a43..952622d69b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java @@ -332,7 +332,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Fri, 8 Apr 2022 17:06:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=A4=9A=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 952622d69b..0f4aa50de9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java +++ b/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; @@ -417,11 +419,9 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl 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); }); } From a50342c9f0272f7872c854e7ff807628ab7dde15 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 8 Apr 2022 17:22:15 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcNatServiceImpl.java | 6 +++--- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java index 715f820896..7fcb95e700 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java @@ -85,8 +85,8 @@ public class IcNatServiceImpl extends BaseServiceImpl imp private IcNatRelationDao icNatRelationDao; @Autowired private IcResiUserDao icResiUserDao; - @Autowired - private UserService userService; + //@Autowired + //private UserService userService; /** * @Author sun @@ -320,7 +320,7 @@ public class IcNatServiceImpl extends BaseServiceImpl 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(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 38d58ce001..e2a78205e9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -120,8 +120,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl natList = icNatService.getNatList(formDTO.getCustomerId(), icResiUser.getIdCard()); + List natList = SpringContextUtils.getBean(IcNatService.class).getNatList(formDTO.getCustomerId(), icResiUser.getIdCard()); result.setNatList(natList); //疫苗接种 List vaccineList = SpringContextUtils.getBean(IcVaccineService.class).getVaccineList(formDTO.getCustomerId(), icResiUser.getIdCard()); From 977ab776b2afe83eddc7abd31c85a8b3e6d6c050 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 8 Apr 2022 17:52:41 +0800 Subject: [PATCH 7/7] - --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 1d3c3b2cc8..25ecff6838 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/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 errors = new ArrayList<>(); - if (idCard.length() > 18) { + if (StringUtils.isNotBlank(idCard) && idCard.length() > 18) { // 身份证号超长了哦，不可以的 errors.add("身份证号过长，限制18位"); }