From 83ee1078a82799e987b8355cdf6ee0b61f55efdd Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Fri, 30 Oct 2020 10:38:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E2=80=9C=E6=82=A8=E5=A5=BD=E2=80=9D=E5=AD=97=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/modules/constant/UserMessageConstant.java | 4 ++-- .../java/com/epmet/constant/PartyMemberMessageConstant.java | 4 ++-- .../warmhearted/constant/ResiWarmUserMessageConstant.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java index 880efbac70..d7da80088c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java @@ -37,12 +37,12 @@ public interface UserMessageConstant { /** * 建组审核驳回时消息模板 * */ - String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已被驳回，原因：%s。"; + String DISAGREE_CREATING_GROUP_MSG_TEMPLATE = "您申请的%s，已被驳回，原因：%s。"; /** * 建组审核同意时消息模板 * */ - String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您好，您申请的%s，已审核通过。"; + String AGREE_CREATING_GROUP_MSG_TEMPLATE = "您申请的%s，已审核通过。"; /** * 审核建组申请消息名称 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 index 7e22178bec..86223a328c 100644 --- 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 @@ -19,12 +19,12 @@ public interface PartyMemberMessageConstant { /** * 党员申请审核通过给申请人发送消息：您好，您申请的党员已审核通过，请查看。 */ - String AUDIT_APPROVE_MSG = "您好，您申请的%s党员已审核通过，请查看。"; + String AUDIT_APPROVE_MSG = "您申请的%s党员已审核通过，请查看。"; /** * 党员申请审核驳回给申请人发送消息：您好，您申请的党员，由于不符合条件的原因，已被驳回。 */ - String AUDIT_REJECT_MSG = "您好，您申请的%s党员，由于不符合条件的原因，已被驳回。"; + String AUDIT_REJECT_MSG = "您申请的%s党员，由于不符合条件的原因，已被驳回。"; /** * 党员申请behavior diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java index 13e1231a2a..1f7b6d6959 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmUserMessageConstant.java @@ -19,12 +19,12 @@ public interface ResiWarmUserMessageConstant { /** * 热心居民申请审核通过给申请人发送消息：您好，您申请的第三网格热心居民已审核通过，请查看。 */ - String AUDIT_APPROVE_MSG = "您好，您申请的%s热心居民已审核通过，请查看。"; + String AUDIT_APPROVE_MSG = "您申请的%s热心居民已审核通过，请查看。"; /** * 热心居民申请审核驳回给申请人发送消息：您好，您申请的第三网格热心居民，已被驳回，原因：不符合要求。 */ - String AUDIT_REJECT_MSG = "您好，您申请的%s热心居民，已被驳回，原因：%s"; + String AUDIT_REJECT_MSG = "您申请的%s热心居民，已被驳回，原因：%s"; /** * 热心居民申请-微信订阅behavior From 8d140a8162a97895473ec364c3ba92b44c3212da Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Fri, 30 Oct 2020 12:35:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E9=80=81=E8=AE=A2=E9=98=85bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GroupInvitationServiceImpl.java | 17 +++++++++++++---- .../impl/ResiGroupMemberServiceImpl.java | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index bb02b51d0d..606eb75fbe 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -28,10 +28,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ReadFlagConstant; -import com.epmet.dto.form.UserEnterGridFormDTO; -import com.epmet.dto.form.UserInvitationFormDTO; -import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; @@ -438,6 +435,18 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); + msgList.add(wxSubscribeMessageFormDTO); + epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList); if (result.success()) { logger.info("通知群主有新成员入群成功"); } else { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 9b65fd0ddf..97b6030b74 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -277,7 +277,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl Date: Fri, 30 Oct 2020 13:29:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/service/impl/ResiGroupMemberServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 97b6030b74..318989299c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -550,6 +550,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); msgList.add(wxSubscribeMessageFormDTO); From 70d6796f02e2a24899bc8b5dbbc8d143dcff7d9c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 30 Oct 2020 13:44:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E8=AE=A2=E9=98=85sql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.3.12.2__wxmp_message_template.sql | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__wxmp_message_template.sql diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__wxmp_message_template.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__wxmp_message_template.sql new file mode 100644 index 0000000000..4e707a0d3f --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__wxmp_message_template.sql @@ -0,0 +1,98 @@ +CREATE TABLE `wxmp_template_msg_subscribe_status` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', + `CLIENT_TYPE` varchar(64) NOT NULL COMMENT '所属端类型 居民端:resi 工作端:gov', + `USER_ID` varchar(64) NOT NULL COMMENT '用户Id ', + `TEMPLATE_ID` varchar(64) DEFAULT NULL COMMENT '模板id', + `ALWAYS_VISIT` varchar(32) DEFAULT NULL COMMENT '是否总是访问 是:yes 否:no', + `SUBSCRIBE_STATUS` varchar(32) DEFAULT NULL COMMENT '订阅状态(订阅:subscribe 取消订阅:unsubscribe)', + `WX_ALWAYS_VISIT` varchar(32) DEFAULT NULL COMMENT 'wx是否总是访问 是:yes 否:no', + `WX_SUBSCRIBE_STATUS` varchar(32) DEFAULT NULL COMMENT 'wx订阅状态 (订阅:subscribe 取消订阅:unsubscribe)', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户模板消息订阅授权状态表（记录我们自己和微信的授权页用户勾选的状态）'; + + +CREATE TABLE `wxmp_user_subscribe_record` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', + `TEMPLATE_ID` varchar(64) NOT NULL COMMENT '消息模板Id ', + `USER_ID` varchar(64) NOT NULL COMMENT '用户Id ', + `WX_OPEN_ID` varchar(64) NOT NULL COMMENT 'openId ', + `BEHAVIOR_TYPE` varchar(128) DEFAULT NULL COMMENT '行为类型 (入组申请、党员认证)等', + `WX_ALWAYS_VISIT` varchar(32) DEFAULT NULL COMMENT 'wx是否总是访问 是:yes 否:no', + `WX_SUBSCRIBE_STATUS` varchar(32) DEFAULT NULL COMMENT 'wx订阅状态(订阅:subscribe 取消订阅:unsubscribe)', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户触发订阅的行为记录表（同时记录微信授权页每次勾选的状态）'; + + +CREATE TABLE `wxmp_resi_user_subscribe` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', + `TEMPLATE_ID` varchar(64) NOT NULL COMMENT '消息模板Id', + `USER_ID` varchar(64) NOT NULL COMMENT '用户Id', + `WX_OPEN_ID` varchar(64) NOT NULL COMMENT 'openId ', + `WX_SUBSCRIBE_STATUS` varchar(32) DEFAULT NULL COMMENT 'wx订阅状态,只记录用户最后一次操作的勾选状态 (订阅:subscribe 取消订阅:unsubscribe)', + `COUNT` int(11) DEFAULT NULL COMMENT '可用推送次数', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民端用户订阅模板消息次数记录表'; + + +CREATE TABLE `wxmp_work_user_subscribe` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', + `TEMPLATE_ID` varchar(64) NOT NULL COMMENT '消息模板Id ', + `USER_ID` varchar(64) NOT NULL COMMENT '用户Id ', + `WX_OPEN_ID` varchar(64) NOT NULL COMMENT 'openId ', + `WX_SUBSCRIBE_STATUS` varchar(32) DEFAULT NULL COMMENT 'wx订阅状态,只记录用户最后一次操作的勾选状态 (订阅:subscribe 取消订阅:unsubscribe)', + `COUNT` int(11) DEFAULT NULL COMMENT '可用推送次数 ', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='工作端用户订阅模板消息有效次数记录表 '; + + +CREATE TABLE `wxmp_msg_send_record` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id ', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格Id （居民端跟网格有关的则有值，工作端以及一些居民端和网格没关的存*）', + `CLIENT_TYPE` varchar(64) NOT NULL COMMENT '所属端类型 居民端:resi 工作端:gov', + `TEMPLATE_ID` varchar(64) NOT NULL COMMENT '消息模板Id ', + `USER_ID` varchar(64) NOT NULL COMMENT '用户Id', + `WX_OPEN_ID` varchar(64) NOT NULL COMMENT 'openId ', + `BEHAVIOR_TYPE` varchar(128) NOT NULL COMMENT '行为类型(存title字段的中间值) 入组申请、党员认证等', + `TITLE` varchar(128) NOT NULL COMMENT '消息标题 ', + `MESSAGE_CONTENT` varchar(1024) NOT NULL COMMENT '消息内容 ', + `MESSAGE_TIME` datetime NOT NULL COMMENT '消息时间 ', + `RESULT` varchar(32) NOT NULL COMMENT '发送结果(成功：success 失败：error)', + `REASON` varchar(1024) DEFAULT NULL COMMENT '发送失败的原因，成功可以不记录', + `DEL_FLAG` int(11) NOT NULL COMMENT '删除标识', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='消息发送记录表'; +