From 17173772786845b12afc33b2e4e362d3a7c9ea09 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 May 2020 16:48:04 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7govis?= =?UTF-8?q?sue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index 5750aa5030..77c7547642 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.32 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.33 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index 503f8037ff..b4791a9d61 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.32 + 0.3.33 gov-issue com.epmet From 8b81ed5f23e40e7ec156b54a3eca6453656acf37 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 May 2020 16:51:44 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0:govi?= =?UTF-8?q?ssue|user|resihome|operaccess?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-test.yml | 2 +- .../oper-access-server/deploy/docker-compose-test.yml | 2 +- .../resi-home/resi-home-server/deploy/docker-compose-test.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml index 438ef16be4..5d3770678d 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.31 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.33 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml index 2dadf926ba..78eddcfe52 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.10 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-access-server:0.3.11 ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml index ac1d21801a..40cf9f0937 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.8 ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index 521097afaf..dd1663441c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.49 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 8275d5b1755a68fd532bc46e1137f9e053c465d1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 26 May 2020 17:07:46 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=A1=88?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=BA=BA=E5=91=98=E5=8E=BB?= =?UTF-8?q?=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ProjectRelatedPersonnelDao.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml index 9b8a16d319..18257b67f4 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectRelatedPersonnelDao.xml @@ -17,8 +17,10 @@ From 2782273c647fd3a23ff583ca96fed1e7be6e7c24 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 27 May 2020 14:27:04 +0800 Subject: [PATCH 20/23] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=88=87=E9=9D=A2=E5=92=8Cgateway=E7=9A=84FeignRequestFilter?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E4=BE=BF=E4=BA=8E=E6=97=A5=E5=BF=97=E8=BF=BD?= =?UTF-8?q?=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/aspect/BaseRequestLogAspect.java | 44 ++++++++++++------- .../tools/constant/AppClientConstant.java | 5 +++ .../com/epmet/filter/FeignRequestFilter.java | 6 ++- 3 files changed, 38 insertions(+), 17 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java index 7f9399c5e1..58c91650f3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java @@ -1,10 +1,12 @@ package com.epmet.commons.tools.aspect; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.utils.Result; +import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,6 +15,7 @@ import org.springframework.dao.DuplicateKeyException; import javax.servlet.http.HttpServletRequest; import java.time.Duration; import java.time.LocalDateTime; +import java.util.UUID; /** * 日志切面 @@ -47,56 +50,65 @@ public abstract class BaseRequestLogAspect { protected Object proceed(ProceedingJoinPoint point, HttpServletRequest request) throws Throwable { String requestURI = request.getRequestURI(); - long threadId = Thread.currentThread().getId(); + // 获取事务流水号 + String transactionSerial = request.getHeader(AppClientConstant.TRANSACTION_SERIAL_KEY); + //if (StringUtils.isEmpty(transactionSerial)) { + // transactionSerial = UUID.randomUUID().toString(); + //} + + // 将当前线程名称设置为事务流水号 + if (!StringUtils.isEmpty(transactionSerial)) { + Thread.currentThread().setName(transactionSerial); + } Object result; LocalDateTime startTime = LocalDateTime.now(); try { Object[] args = point.getArgs(); - log.info(">>>>>>>>请求信息>>>>>>>>:线程ID:{},url:{},请求参数:{}", threadId, requestURI, objectsToString(args)); + log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{},请求参数:{}", transactionSerial, requestURI, objectsToString(args)); result = point.proceed(); - resultInfoLog(threadId, getExecPeriod(startTime), result); + resultInfoLog(transactionSerial, getExecPeriod(startTime), result); } catch (RenException e) { result = handleRenException(e); - resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e)); + resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e)); } catch (ValidateException e) { result = handleValidateException(e); - resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e)); + resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMsg(), ExceptionUtils.getErrorStackTrace(e)); } catch (DuplicateKeyException e) { result = handlerDuplicateKeyException(e); - resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e)); + resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e)); } catch (RuntimeException re) { result = handlerRuntimeException(re); - resultErrorLog(threadId, getExecPeriod(startTime), result, re.getMessage(), ExceptionUtils.getErrorStackTrace(re)); + resultErrorLog(transactionSerial, getExecPeriod(startTime), result, re.getMessage(), ExceptionUtils.getErrorStackTrace(re)); } catch (Exception e) { result = handlerException(e); - resultErrorLog(threadId, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e)); + resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getMessage(), ExceptionUtils.getErrorStackTrace(e)); } return result; } /** * info日志 - * @param threadId + * @param transactionSerial * @param execTimeMillis * @param result */ - private void resultInfoLog(Long threadId, Long execTimeMillis, Object result) { - log.info("<<<<<<<<正常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}", - threadId, execTimeMillis, result == null ? result : result.toString()); + private void resultInfoLog(String transactionSerial, Long execTimeMillis, Object result) { + log.info("<<<<<<<<正常响应<<<<<<<<:事务流水号:{}, 执行时长:{}ms, 响应数据:{}", + transactionSerial, execTimeMillis, result == null ? result : result.toString()); } /** * 异常信息 - * @param threadId + * @param transactionSerial * @param execTimeMillis * @param result * @param exceptionMsg * @param exceptionDetail */ - private void resultErrorLog(Long threadId, Long execTimeMillis, Object result, String exceptionMsg, String exceptionDetail) { - log.error("<<<<<<<<异常响应<<<<<<<<:线程ID:{},执行时长:{}ms, 响应数据:{}, 异常信息:{}, 堆栈信息:{}", - threadId, execTimeMillis, result == null ? result : result.toString(), exceptionMsg, exceptionDetail); + private void resultErrorLog(String transactionSerial, Long execTimeMillis, Object result, String exceptionMsg, String exceptionDetail) { + log.error("<<<<<<<<异常响应<<<<<<<<:事务流水号:{}, 执行时长:{}ms, 响应数据:{}, 异常信息:{}, 堆栈信息:{}", + transactionSerial, execTimeMillis, result == null ? result : result.toString(), exceptionMsg, exceptionDetail); } /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java index e8167f2f21..1eca4a088b 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/AppClientConstant.java @@ -40,4 +40,9 @@ public interface AppClientConstant { * 客户端 * */ String CLIENT = "client"; + + /** + * 事务流水号，每次请求串起来的多个服务拥有相同的流水号,便于日志追踪 + */ + String TRANSACTION_SERIAL_KEY = "Transaction-Serial"; } diff --git a/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java index 1da14ce7ef..40a9e363ab 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; +import java.util.UUID; + /** * Feign调用发送请求的Filter * 目前用于封装用户相关信息到request，供上游微服务使用 @@ -55,7 +57,9 @@ public class FeignRequestFilter implements GlobalFilter, UserTokenFilter { if (baseTokenDto != null) { ServerHttpRequest build = exchange.getRequest().mutate() - .header(AppClientConstant.USER_ID, new String[]{baseTokenDto.getUserId()}).build(); + .header(AppClientConstant.USER_ID, new String[]{baseTokenDto.getUserId()}) + .header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{UUID.randomUUID().toString()}) + .build(); return chain.filter(exchange.mutate().request(build).build()); } From d4e879687a7945e5f2e7678328351bb4e2492180 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 27 May 2020 14:56:21 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E6=9C=AC=E7=BD=91=E6=A0=BC=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- .../group/service/impl/ResiGroupServiceImpl.java | 11 ++++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 309341c970..b07c33f2f7 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.42 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.43 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 7276b170b8..334f1cffde 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.42 + 0.3.43 com.epmet resi-group diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 8b7c28916d..72412d91cd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -667,20 +667,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl list = baseDao.selectGroupsByGridId(formDTO); list.forEach(group -> { - //缓存中获取组信息 - ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId()); GroupsInGridResultDTO groupsInGridResultDTO = new GroupsInGridResultDTO(); - if (null == resiGroupInfoRedisDTO) { - if (MemberStateConstant.REJECTED.equals(group.getState())) { + if (MemberStateConstant.REJECTED.equals(group.getState())) { groupsInGridResultDTO.setGroupId(group.getId()); groupsInGridResultDTO.setGroupName(group.getGroupName()); groupsInGridResultDTO.setGroupHeadPhoto(group.getGroupHeadPhoto()); groupsInGridResultDTO.setStatus(group.getState()); groupsInGridResultDTO.setTotalMember(NumConstant.ZERO); groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO); - } - - } else { + } else if(MemberStateConstant.APPROVED.equals(group.getState())) { + //缓存中获取组信息 + ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(group.getId()); groupsInGridResultDTO.setGroupId(resiGroupInfoRedisDTO.getGroupId()); groupsInGridResultDTO.setGroupName(resiGroupInfoRedisDTO.getGroupName()); groupsInGridResultDTO.setGroupHeadPhoto(resiGroupInfoRedisDTO.getGroupHeadPhoto()); From 15ebe5d3b3b8f2520c377b2d26aca3dde6eaa586 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 27 May 2020 15:09:07 +0800 Subject: [PATCH 22/23] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=E7=9A=84=E7=94=9F=E6=88=90=E8=A7=84?= =?UTF-8?q?=E5=88=99=EF=BC=8C=E4=B8=A4=E4=BD=8D=E9=9A=8F=E6=9C=BA=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=AF=8D+=E6=97=B6=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/filter/FeignRequestFilter.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java index 40a9e363ab..aeb3975b59 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/FeignRequestFilter.java @@ -17,8 +17,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; -import java.util.UUID; - /** * Feign调用发送请求的Filter * 目前用于封装用户相关信息到request，供上游微服务使用 @@ -58,11 +56,28 @@ public class FeignRequestFilter implements GlobalFilter, UserTokenFilter { if (baseTokenDto != null) { ServerHttpRequest build = exchange.getRequest().mutate() .header(AppClientConstant.USER_ID, new String[]{baseTokenDto.getUserId()}) - .header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{UUID.randomUUID().toString()}) + .header(AppClientConstant.TRANSACTION_SERIAL_KEY, new String[]{getTransactionSerial()}) .build(); return chain.filter(exchange.mutate().request(build).build()); } return chain.filter(exchange); } + + /** + * 获取事务流水号 + * @return + */ + public static String getTransactionSerial() { + String[] letterPool = {"a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n" + , "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"}; + + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 2; i++) { + sb.append(letterPool[(int) (Math.random() * 25)]); + } + + sb.append(System.currentTimeMillis()); + return sb.toString(); + } } From 6b80bbaffb1d4fb49807275ad74b72adf469fdbf Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 27 May 2020 18:07:56 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E6=88=90=E5=91=98=E5=8A=A0=E7=BB=84?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E5=85=9A=E5=91=98=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E6=95=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResiRolesOfGroupMemberFormDTO.java | 37 ++++++++++++ .../dto/member/form/ResiIdentityFormDTO.java | 45 +++++++++++++++ .../group/controller/ResiGroupController.java | 17 ++++++ .../group/dao/ResiGroupStatisticalDao.java | 12 ++++ .../modules/group/redis/ResiGroupRedis.java | 33 +++++++++++ .../service/ResiGroupStatisticalService.java | 10 ++++ .../impl/ResiGroupStatisticalServiceImpl.java | 57 +++++++++++++++++++ .../member/dao/ResiGroupMemberDao.java | 11 ++++ .../epmet/modules/utils/ModuleConstant.java | 4 ++ .../mapper/group/ResiGroupStatisticalDao.xml | 37 ++++++++++++ .../mapper/member/ResiGroupMemberDao.xml | 19 +++++++ .../partymember/dto/ResiIdentityFormDTO.java | 47 +++++++++++++++ .../modules/feign/ResiGroupFeignClient.java | 29 ++++++++++ .../ResiGroupFeignClientFallBack.java | 30 ++++++++++ .../impl/PartyMemberConfirmServiceImpl.java | 14 +++++ .../impl/ResiWarmheartedApplyServiceImpl.java | 11 ++++ 16 files changed, 413 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java new file mode 100644 index 0000000000..ee2d684b6b --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ResiRolesOfGroupMemberFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName ResiRolesOfGroupMemberFormDTO + * @Auth wangc + * @Date 2020-05-26 14:27 + */ +@Data +public class ResiRolesOfGroupMemberFormDTO implements Serializable { + private static final long serialVersionUID = 881671287108605309L; + + /** + * 组Id + * */ + private String groupId; + + + /** + * 热心居民标识 1：是 0：不是 网格级别 + * */ + private String warmFlag; + + /** + * 党员标识 1： 是 0：不是 + * */ + private String partyFlag; + + /** + * 修改人Id + * */ + private String updatedBy; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java new file mode 100644 index 0000000000..4be22d07e6 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/ResiIdentityFormDTO.java @@ -0,0 +1,45 @@ +package com.epmet.resi.group.dto.member.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description partymember服务调用传参，用户认证[党员、热心居民]成功后，更新组的缓存统计信息及组统计信息 + * @ClassName ResiIdentityFormDTO + * @Auth wangc + * @Date 2020-05-26 13:55 + */ +@Data +public class ResiIdentityFormDTO implements Serializable { + private static final long serialVersionUID = -6822310777491335787L; + /** + * 用户Id + * */ + private String userId; + + /** + * 网格Id + * */ + private String gridId; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 热心居民标识 1：是 0：不是 网格级别 + * */ + private String warmFlag; + + /** + * 党员标识 1： 是 0：不是 + * */ + private String partyFlag; + + /** + * 操作人的Id + * */ + private String operatorId; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 270df47002..afdce31da0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -23,9 +23,11 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.group.service.ResiGroupService; +import com.epmet.modules.group.service.ResiGroupStatisticalService; import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; +import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +45,8 @@ import java.util.List; public class ResiGroupController { @Autowired private ResiGroupService resiGroupService; + @Autowired + private ResiGroupStatisticalService resiGroupStatisticalService; /** * @param tokenDto @@ -342,4 +346,17 @@ public class ResiGroupController { public Result> recommendedList(@RequestBody RecommendedListFormDTO formDTO) { return new Result>().ok(resiGroupService.recommendedList(formDTO)); } + + /** + * @Description partymember服务审核通过热心居民、党员申请之后，需要遍历这个人所在的组进行组的缓存与数据库的更新 + * @param resiIdentityFormDTO + * @return + * @author wangc + * @date 2020.05.26 14:12 + **/ + @PostMapping("updatewhenauditedresirole") + public Result updateWhenAuditedResiRole(@RequestBody ResiIdentityFormDTO resiIdentityFormDTO){ + resiGroupStatisticalService.updateWhenAuditedResiRole(resiIdentityFormDTO); + return new Result(); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java index 589cfaeb27..dd75c99b96 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java @@ -19,9 +19,12 @@ package com.epmet.modules.group.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; +import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 群组统计信息表 * @@ -47,4 +50,13 @@ public interface ResiGroupStatisticalDao extends BaseDao list); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java index f5d0541ba8..e2d19f2a03 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java @@ -24,11 +24,13 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.constant.ResiGroupRedisKeys; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.modules.group.service.ResiGroupStatisticalService; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; import com.epmet.resi.group.dto.group.ResiGroupStatisticalInfoRedisDTO; +import com.epmet.resi.group.dto.group.form.ResiRolesOfGroupMemberFormDTO; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -209,4 +211,35 @@ public class ResiGroupRedis { } return auditingGroupCount; } + + /** + * @Description 增加群缓存信息中的热心居民数和党员数 + * @param list List + * @return + * @author wangc + * @date 2020.05.26 15:53 + **/ + public void increaseRolesCount(List list){ + list.forEach(o -> { + ResiGroupInfoRedisDTO cache = get(o.getGroupId()); + if(null != cache && null != cache.getGroupStatisticalInfo()){ + if(StringUtils.equals(NumConstant.ONE_STR,o.getPartyFlag())){ + cache.getGroupStatisticalInfo().setTotalPartyMembers( + null == cache.getGroupStatisticalInfo().getTotalPartyMembers() ? NumConstant.ONE : + cache.getGroupStatisticalInfo().getTotalPartyMembers() + NumConstant.ONE + ); + }else if(StringUtils.equals(NumConstant.ONE_STR,o.getWarmFlag())){ + cache.getGroupStatisticalInfo().setTotalEarnestMembers( + null == cache.getGroupStatisticalInfo().getTotalEarnestMembers() ? NumConstant.ONE : + cache.getGroupStatisticalInfo().getTotalEarnestMembers() + NumConstant.ONE + ); + } + cache.setGroupId(o.getGroupId()); + set(cache); + logger.debug(String.format(ModuleConstant.UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE,o.getGroupId())); + }else { + logger.warn(String.format(ModuleConstant.NO_GROUP_CACHE_LOG_TEMPLATE, o.getGroupId())); + } + }); + } } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java index 160c9eea05..a27e5d9531 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java @@ -24,6 +24,7 @@ import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; +import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO; import java.util.List; import java.util.Map; @@ -103,4 +104,13 @@ public interface ResiGroupStatisticalService extends BaseService page(Map params) { @@ -168,4 +179,50 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl groupIds = + resiGroupMemberDao.getGroupIdByUserIdAndGridId(resiIdentityFormDTO.getGridId(), + resiIdentityFormDTO.getUserId(), + StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag()) ? NumConstant.ONE_STR : NumConstant.THREE_STR + ); + if(null != groupIds && groupIds.size() > NumConstant.ZERO){ + List params = groupIds.stream().map(groupId -> { + ResiRolesOfGroupMemberFormDTO param = new ResiRolesOfGroupMemberFormDTO(); + param.setGroupId(groupId); + if(StringUtils.equals(NumConstant.ONE_STR,resiIdentityFormDTO.getWarmFlag())){ + param.setWarmFlag(NumConstant.ONE_STR); + }else{ + param.setPartyFlag(NumConstant.ONE_STR); + } + param.setUpdatedBy(resiIdentityFormDTO.getOperatorId()); + return param; + }).collect(Collectors.toList()); + baseDao.incryResiRoleMembersBatch(params); + resiGroupRedis.increaseRolesCount(params); + } + + return; + } + + + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index 57916ee6de..7e13eba2b4 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -108,4 +108,15 @@ public interface ResiGroupMemberDao extends BaseDao { Integer getMembersCountInGrid(@Param("gridId")String gridId); List getMembersCountInGrids(@Param("gridIds")List gridIds); + + /** + * @Description 根据用户Id和网格Id查询这个人所在的指定网格下所有的组Id + * @param gridId + * @param userId + * @param roleFlag 1:热心居民 其他：党员 + * @return List 组Id + * @author wangc + * @date 2020.05.26 14:22 + **/ + List getGroupIdByUserIdAndGridId(@Param("gridId")String gridId,@Param("userId")String userId,@Param("roleFlag")String roleFlag); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index f077980f7f..8fd8c6954f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -313,4 +313,8 @@ public interface ModuleConstant extends Constant { String GROUP_STATUS_UNDER_AUDITTING = "under_auditting"; String ALREADY_SHIFT_ISSUE = "话题已转议题，请勿重复操作"; + + String NO_GROUP_CACHE_LOG_TEMPLATE = "没有相应的组缓存信息，组Id:【%s】"; + + String UPDATE_GROUP_CACHE_SUCCESSFULLY_LOG_TEMPLATE = "更新组缓存信息成功，组Id:【%s】"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml index 995c637bb1..488f5a5bd7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml @@ -37,4 +37,41 @@ AND DEL_FLAG = '0' + + + update resi_group_statistical + + + + + when RESI_GROUP_ID=#{i.groupId} then TOTAL_PARTY_MEMBERS +1 + + + + + + + when RESI_GROUP_ID=#{i.groupId} then TOTAL_EARNEST_MEMEBERS + 1 + + + + + + + + when RESI_GROUP_ID=#{i.groupId} then #{i.updatedBy} + + + + updated_time = now() + + where + DEL_FLAG = '0' + + + RESI_GROUP_ID=#{i.groupId} + + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index ae8b7d8f14..407e42879f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -134,4 +134,23 @@ GROUP BY groupp.GRID_ID + + + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java new file mode 100644 index 0000000000..6709cc435d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/ResiIdentityFormDTO.java @@ -0,0 +1,47 @@ +package com.epmet.resi.partymember.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 调用resi_group服务，用户认证[党员、热心居民]成功后，更新组的缓存统计信息及组统计信息 + * @ClassName ResiIdentityFormDTO + * @Auth wangc + * @Date 2020-05-26 13:55 + */ +@Data +public class ResiIdentityFormDTO implements Serializable { + private static final long serialVersionUID = -6822310777491335787L; + /** + * 用户Id + * */ + @NotBlank(message = "用户Id不能为空") + private String userId; + + /** + * 网格Id + * */ + private String gridId; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 热心居民标识 1：是 0：不是 网格级别 + * */ + private String warmFlag; + + /** + * 党员标识 1： 是 0：不是 + * */ + private String partyFlag; + + /** + * 操作人的Id + * */ + private String operatorId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java new file mode 100644 index 0000000000..bbe89c5f91 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/ResiGroupFeignClient.java @@ -0,0 +1,29 @@ +package com.epmet.modules.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.feign.fallback.GovOrgFeignClientFallBack; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * @Description Feign调用resi-group模块 + * @ClassName ResiGroupFeignClient + * @Author wangc + */ + +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = GovOrgFeignClientFallBack.class) +public interface ResiGroupFeignClient { + + /** + * @Description partymember服务审核通过热心居民、党员申请之后，需要遍历这个人所在的组进行组的缓存与数据库的更新 + * @param resiIdentityFormDTO + * @return + * @author wangc + * @date 2020.05.26 14:12 + **/ + @PostMapping("/resi/group/group/updatewhenauditedresirole") + Result updateWhenAuditedResiRole(@RequestBody ResiIdentityFormDTO resiIdentityFormDTO); +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java new file mode 100644 index 0000000000..d3d098b764 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/ResiGroupFeignClientFallBack.java @@ -0,0 +1,30 @@ +package com.epmet.modules.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.feign.ResiGroupFeignClient; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; +import org.springframework.stereotype.Component; + + +/** + * @Description + * @ClassName ResiGroupFeignClientFallBack + * @Auth wangc + * @Date 2020-05-26 16:04 + */ +@Component +public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { + /** + * @Description partymember服务审核通过热心居民、党员申请之后，需要遍历这个人所在的组进行组的缓存与数据库的更新 + * @param resiIdentityFormDTO + * @return + * @author wangc + * @date 2020.05.26 14:12 + **/ + @Override + public Result updateWhenAuditedResiRole(ResiIdentityFormDTO resiIdentityFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "updateWhenAuditedResiRole",resiIdentityFormDTO); + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 837efc5901..c4c661debf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; +import com.epmet.modules.feign.ResiGroupFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -35,6 +36,7 @@ import com.epmet.redis.ResiPartyMemberRedis; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; @@ -89,6 +91,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private GovOrgFeignClient govOrgFeignClient; @Autowired private ResiPartyMemberRedis resiPartyMemberRedis; + @Autowired + private ResiGroupFeignClient resiGroupFeignClient; @Override @Transactional(rollbackFor = Exception.class) public Result init(PartyMemberInitFromDTO fromDto) { @@ -231,6 +235,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService epmetUserFeignClient.saveUserRole(userRole); //存入党员注册关系表 用于统计客户网格的认证党员数 saveRegisterRelation(partyMemberInfoDTO); + + ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO(); + identityParam.setUserId(partyMemberInfoDTO.getUserId()); + identityParam.setPartyFlag(NumConstant.ONE_STR); + resiGroupFeignClient.updateWhenAuditedResiRole(identityParam); } //将自动认证结果存入党员认证自动审核表 @@ -312,6 +321,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity, PartymemberInfoDTO.class)); auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_APPROVE_MSG); + + ResiIdentityFormDTO identityParam = new ResiIdentityFormDTO(); + identityParam.setUserId(partyMemberInfoEntity.getUserId()); + identityParam.setPartyFlag(NumConstant.ONE_STR); + resiGroupFeignClient.updateWhenAuditedResiRole(identityParam); } else { auditMessageToResi(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index fe5b9ab1bc..c00077dd1f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; @@ -41,6 +42,7 @@ import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetMessageFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; +import com.epmet.modules.feign.ResiGroupFeignClient; import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant; @@ -49,6 +51,7 @@ import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService; import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService; import com.epmet.redis.ResiPartyMemberRedis; +import com.epmet.resi.partymember.dto.ResiIdentityFormDTO; import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO; import com.epmet.resi.partymember.dto.warmhearted.form.*; import com.epmet.resi.partymember.dto.warmhearted.result.ResiProcessingCountResultDTO; @@ -90,6 +93,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl page(Map params) { @@ -401,6 +406,12 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl