From 3494dba9428eb4b8b5d32a189d32774823048c21 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 29 Apr 2020 16:46:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/PartyMemberMessageConstant.java | 28 +++++++++++++ .../impl/PartyMemberConfirmServiceImpl.java | 42 ++++++++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java new file mode 100644 index 0000000000..a64121d16e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberMessageConstant.java @@ -0,0 +1,28 @@ +package com.epmet.constant; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/4/29 13:41 + */ +public interface PartyMemberMessageConstant { + /** + * 消息标题 + */ + String GROUP_TITLE = "您有一条党员申请消息"; + + /** + * 党员提交申请时给网格长发送消息：XX街道-XX先生/女士申请成为党员，请审核。 + */ + String MEMBER_APPLY_MSG = "%s申请成为党员，请审核。"; + + /** + * 党员申请审核通过给申请人发送消息：您好，您申请的党员已审核通过，请查看。 + */ + String AUDIT_APPROVE_MSG = "您好，您申请的%s党员已审核通过，请查看。"; + + /** + * 党员申请审核驳回给申请人发送消息：您好，您申请的党员，由于不符合条件的原因，已被驳回。 + */ + String AUDIT_REJECT_MSG = "您好，您申请的%s党员，由于不符合条件的原因，已被驳回。"; +} 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 6718a6fb72..63483599b3 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 @@ -1,12 +1,18 @@ package com.epmet.modules.partymember.service.impl; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; +import com.epmet.constant.PartyMemberMessageConstant; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; +import com.epmet.dto.form.CustomerGridFormDTO; +import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.result.GridInfoResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; @@ -16,6 +22,8 @@ import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; +import com.epmet.modules.warmhearted.constant.ResiWarmUserMessageConstant; +import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; @@ -260,11 +268,12 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService partymemberConfirmManualService.insert(manualEntity); } - + auditMessage(ConvertUtils.sourceToTarget(partyMemberInfo, PartymemberInfoEntity.class), PartyMemberMessageConstant.MEMBER_APPLY_MSG); return new Result(); } @Override + @Transactional(rollbackFor = Exception.class) public Result manualConfirmResult(PartyMemberConfirmFromDTO fromDTO) { PartymemberConfirmManualEntity manualEntity = partymemberConfirmManualService.selectById(fromDTO.getManualId()); PartymemberInfoEntity partyMemberInfoEntity = partymemberInfoService.selectById(fromDTO.getPartyMemberId()); @@ -289,6 +298,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //存入党员注册关系表 用于统计客户网格的认证党员数 saveRegisterRelation(ConvertUtils.sourceToTarget(partyMemberInfoEntity, PartymemberInfoDTO.class)); + auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_APPROVE_MSG); + } else { + auditMessage(partyMemberInfoEntity, PartyMemberMessageConstant.AUDIT_REJECT_MSG); } return new Result(); @@ -532,4 +544,32 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return partymemberVisitEntity.getId(); } + /** + * 热心居民申请审核通过向申请人发送消息 + * @Author sun + * @param formDTO + * @param userMsg 消息模板 + */ + private Result auditMessage(PartymemberInfoEntity formDTO, String userMsg) { + UserMessageFormDTO userMessageFormDTO = new UserMessageFormDTO(); + userMessageFormDTO.setCustomerId(formDTO.getCustomerId()); + userMessageFormDTO.setGridId(formDTO.getGridId()); + userMessageFormDTO.setUserId(formDTO.getUserId()); + userMessageFormDTO.setApp(AppClientConstant.APP_RESI); + userMessageFormDTO.setTitle(PartyMemberMessageConstant.GROUP_TITLE); + //调用gov-org服务查询网格信息 + CustomerGridFormDTO customerGridFormDTO = new CustomerGridFormDTO(); + customerGridFormDTO.setGridId(formDTO.getGridId()); + Result result = govOrgFeignClient.getCustomerGridByGridId(customerGridFormDTO); + String gridName = null; + if (result.success() && null != result.getData()) { + gridName = result.getData().getGridName(); + } + String messageContent = String.format(userMsg, gridName); + userMessageFormDTO.setMessageContent(messageContent); + userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ); + //保存消息 + return messageFeignClient.saveUserMessage(userMessageFormDTO); + } + } From c2fc29611fa90d854c1d23fcc1792d0642230295 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 16:56:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A2=AB=E8=B0=83=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=82=E6=95=B0=E5=8A=A0@RequestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ResiGroupController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java index 128c08fa0a..e28a91d374 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java @@ -51,7 +51,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("groupsingrid") - public Result> getGroupsInGrid(GroupAuditedFromDTO formDTO) { + public Result> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupsInGrid(formDTO); } @@ -63,7 +63,7 @@ public class ResiGroupController { * @return Result */ @PostMapping("getgroupsummarize") - public Result getGroupSummarize(GovGroupSummarizeFromDTO formDTO) { + public Result getGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupSummarize(formDTO); } From dfb0afb088dddfc3b2ab258bcbc7b8a2eba429db Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 29 Apr 2020 16:59:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?epmet-group=E6=9C=8D=E5=8A=A1=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8A=A0@RequestBody?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/controller/ResiGroupController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 8d1e757349..84f5c4ad95 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 @@ -225,7 +225,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("audited") - public Result> audited(GroupAuditedFromDTO formDTO) { + public Result> audited(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.audited(formDTO); } @@ -237,7 +237,7 @@ public class ResiGroupController { * @return Result> */ @PostMapping("groupsingrid") - public Result> getGroupsInGrid(GroupAuditedFromDTO formDTO) { + public Result> getGroupsInGrid(@RequestBody GroupAuditedFromDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return resiGroupService.getGroupsInGrid(formDTO); } @@ -249,7 +249,7 @@ public class ResiGroupController { * @return Result */ @PostMapping("getgovgroupsummarize") - public Result getGovGroupSummarize(GovGroupSummarizeFromDTO formDTO) { + public Result getGovGroupSummarize(@RequestBody GovGroupSummarizeFromDTO formDTO) { return resiGroupService.getGovGroupSummarize(formDTO); } From a29ee9355404e4daa3188307065e0cc7792a1b91 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 29 Apr 2020 17:12:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81-?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=88=97=E8=A1=A8=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8E=86=E5=8F=B2=E6=8E=A5=E5=8F=A3bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/AuditedPartyMemberResultDTO.java | 2 +- .../com/epmet/dto/result/AuditingPartyMemberResultDTO.java | 2 +- .../com/epmet/service/impl/CustomerGridServiceImpl.java | 2 ++ .../dto/partymember/result/ReviewedParyMemberResultDTO.java | 2 +- .../partymember/result/UnderReviewParyMemberResultDTO.java | 2 +- .../resources/mapper/partymember/PartymemberBaseInfoDao.xml | 6 +++--- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java index 96cfa3ffe4..7324243e89 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java @@ -31,7 +31,7 @@ public class AuditedPartyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * auto_confirm_failed:自动认证失败,rejected :拒绝 diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java index b7fa6ff38d..21733fe9fb 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java @@ -32,7 +32,7 @@ public class AuditingPartyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * 提交网格：XXX街道-XXX社区-XXX网格 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index ab835da389..8f54c62f10 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -435,7 +435,9 @@ public class CustomerGridServiceImpl extends BaseServiceImpl(); } + gridInfoResultDTO.setGridId(gridId); gridInfoResultDTO.setCustomerId(customerGridDTO.getCustomerId()); + gridInfoResultDTO.setGridName(customerGridDTO.getGridName()); String pids=customerGridDTO.getPids(); String[] pidArray = pids.split(":"); for(String agencyId:pidArray){ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java index 704b9f9b7a..4b9d082184 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java @@ -29,7 +29,7 @@ public class ReviewedParyMemberResultDTO { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * auto_confirm_failed:自动认证失败,rejected :拒绝 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java index f625e3117c..bef4f48ad2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java @@ -32,7 +32,7 @@ public class UnderReviewParyMemberResultDTO implements Serializable { /** * 申请时间 */ - private Date applyTime; + private Long applyTime; /** * read已读unread未读 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml index 809493652a..2cbad32ae0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml @@ -60,7 +60,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pcm.READ_FLAG AS readFlag, pi.id as partyMemberId, pca.id as autoId, @@ -85,7 +85,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId, @@ -102,7 +102,7 @@ SELECT pi.USER_ID AS userId, concat( pi.SURNAME, pi.NAME ) AS realName, - pi.CREATED_TIME AS applyTime, + unix_timestamp(pi.CREATED_TIME) AS applyTime, pi.CONFIRM_RESULT AS status, pi.id as partyMemberId, pca.id as autoId,