From a50342c9f0272f7872c854e7ff807628ab7dde15 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 8 Apr 2022 17:22:15 +0800 Subject: [PATCH 1/4] =?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 2/4] - --- .../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位"); } From e53f12d80658302db0612a7d798fc8b49723da3a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Sat, 9 Apr 2022 14:08:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.ttl=E7=BA=BF=E7=A8=8B=E6=B1=A0=E5=8C=85?= =?UTF-8?q?=E8=A3=85->TtlRunnable.getRunnable()=E5=8C=85=E8=A3=85=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E5=BD=BB=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/config/AsyncConfig.java | 7 ++++++- .../main/java/com/epmet/service/impl/IcNatServiceImpl.java | 2 +- .../epmet/service/impl/IcTripReportRecordServiceImpl.java | 2 +- .../java/com/epmet/service/impl/IcVaccineServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java index 83c4758a63..c95c9f8ade 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/AsyncConfig.java +++ b/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 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; 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 7fcb95e700..5307df5cb1 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("executorService") + @Async @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/IcTripReportRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java index 0f4aa50de9..3766ee7baa 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 @@ -334,7 +334,7 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl Date: Sat, 9 Apr 2022 16:06:56 +0800 Subject: [PATCH 4/4] - --- .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 25ecff6838..44a6ee7a63 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 @@ -541,12 +541,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res 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) {