Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_temp

# Conflicts:
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
#	epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -161,7 +161,16 @@ public enum EpmetErrorCode {
 	OPEN_API_SIGN_ERROR(10104, "签名错误"),
 	OPEN_API_PARAMS_APPID_DIFF(10105, "app_id不一致"), // app_id在请求参数中和在token中不一致
 	OPEN_API_REQUEST_EXPIRED(10106, "请求过期"),
-	OPEN_API_REQUEST_REPEAT(10107, "请求重复");
+	OPEN_API_REQUEST_REPEAT(10107, "请求重复"),
+
+	//楼院小组89
+	GROUP_ACT_CANCELED_CAN_NOT_EDIT(8901,"活动已取消，不能编辑"),
+	GROUP_ACT_CLOSED_CAN_NOT_EDIT(8902,"活动已关闭，不能编辑"),
+	PLEASE_INPUT_ACT_CONTENT(8903,"请输入活动内容,或添加图片"),
+	GROUP_ACT_CONTENT_MAX(8904,"活动内容至多输入1000字"),
+	GROUP_ACT_IMG_MAX(8905,"最多可添加3张图片"),
+	PARTY_MEMBER_CREATE_BRANCH_GROUP(8906,"您不是党员，不能创建支部小组");
+
 
 	private int code;
 	private String msg;

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/UserMessageFormDTO.java

@@ -58,7 +58,7 @@ public class UserMessageFormDTO implements Serializable {
 	private String readFlag;
 
 	/**
-	 * 调用者
+	 * 调用者 【分内部调用和外部调用，内部调用值为空，外部默认为：外挂-站内信】
 	 */
 	private String referer;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridInfoResultDTO.java

@@ -87,5 +87,10 @@ public class GridInfoResultDTO implements Serializable {
      * 网格所属机关名称
      */
     private String parentAgencyName;
+
+    /**
+     * 网格的所有上级组织
+     */
+    private String pids;
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -486,6 +486,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         gridInfoResultDTO.setGridName(customerGridDTO.getGridName());
         gridInfoResultDTO.setParentAgencyId(customerGridDTO.getPid());
         gridInfoResultDTO.setParentAgencyName(customerAgencyService.get(customerGridDTO.getPid()).getOrganizationName());
+        gridInfoResultDTO.setPids(customerGridDTO.getPids());
         String pids=customerGridDTO.getPids();
         String[] pidArray = pids.split(":");
         for(String agencyId:pidArray){

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActCategoryDictDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 活动类别名称；eg：支部建设、联建共建
+     */
+	private String categoryName;
+
+    /**
+     * 等级1,2......
+     */
+	private Integer level;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 上级类别编码
+     */
+	private String parentCode;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java

@@ -15,22 +15,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dataaggre.dto.resigroup;
-
-import lombok.Data;
+package com.epmet.resi.group.dto.act;
 
 import java.io.Serializable;
 import java.util.Date;
+import lombok.Data;
 
 
 /**
- * 
+ * 活动评论表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
+ * @since v1.0.0 2021-04-16
  */
 @Data
-public class EnterGroupSwitchDTO implements Serializable {
+public class ActCommentDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -45,19 +44,19 @@ public class EnterGroupSwitchDTO implements Serializable {
 	private String customerId;
 
     /**
-     * 小组所属网格id
+     * group_act_info.id
      */
-	private String gridId;
+	private String groupActId;
 
     /**
-     * 小组id
+     * 评论人id
      */
-	private String groupId;
+	private String commentUserId;
 
     /**
-     * open开启； close关闭
+     * 评论内容；目前限制500字
      */
-	private String auditSwitch;
+	private String commentContent;
 
     /**
      * 删除标记 0：未删除，1：已删除
@@ -70,12 +69,12 @@ public class EnterGroupSwitchDTO implements Serializable {
 	private Integer revision;
 
     /**
-     * 创建人（customer_user.id）
+     * 创建人，评论人Id，来自user
      */
 	private String createdBy;
 
     /**
-     * 创建时间(邀请时间)
+     * 创建时间
      */
 	private Date createdTime;
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java

@@ -0,0 +1,99 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 活动操作表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActOperationRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键（签到成功后插入此表）
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 操作人id
+     */
+	private String operateUserId;
+
+    /**
+     * 操作类型：发布：publish;
+取消：cancel；
+变更：change；
+关闭：close
+     */
+	private String operationType;
+
+    /**
+     * 备注；取消理由
+     */
+	private String note;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 活动已读记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActReadRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键(发布活动后后台自动初始化记录)
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 已读:  read未读：un_read；查看活动详情后修改此表，或者插入一条新的已读记录
+     */
+	private String read;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * yes：应读；no: 新入群的人已读
+     */
+	private String shouldBeRead;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInCodeDTO.java

@@ -0,0 +1,87 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActSignInCodeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 签到码url
+     */
+	private String url;
+
+    /**
+     * 删除标志
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInRecordDTO.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActSignInRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键（签到成功后插入此表）
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 签到用户id
+     */
+	private String signUserId;
+
+    /**
+     * 签到地点
+     */
+	private String signInAddress;
+
+    /**
+     * 签到地点-经度
+     */
+	private BigDecimal longitude;
+
+    /**
+     * 签到地点-纬度
+     */
+	private BigDecimal latitude;
+
+    /**
+     * 逻辑删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryContentDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 活动总结内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActSummaryContentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 总结内容
+     */
+	private String content;
+
+    /**
+     * 内容类型: 文字：text；图片：img
+     */
+	private String contentType;
+
+    /**
+     * 内容顺序 从1开始
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java

@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 活动总结
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class ActSummaryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键（确认提交后插入此表）
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 应参加人数：来源于group_act_info
+     */
+	private Integer shouldAttend;
+
+    /**
+     * 已签到人数
+     */
+	private Integer signedInNum;
+
+    /**
+     * 已签到人员姓名列表、分隔
+     */
+	private String signedInUsers;
+
+    /**
+     * 填写总结的人
+     */
+	private String userId;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java

@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 组织活动内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class GroupActContentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 活动内容
+     */
+	private String content;
+
+    /**
+     * 内容类型: 文字：text；图片：img
+     */
+	private String contentType;
+
+    /**
+     * 内容顺序 从1开始
+     */
+	private Integer sort;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActIdDTO.java

@@ -0,0 +1,17 @@
+package com.epmet.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 15:11
+ */
+@Data
+public class GroupActIdDTO implements Serializable {
+    private static final long serialVersionUID = -729672768113053794L;
+    private String groupActId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java

@@ -0,0 +1,187 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class GroupActInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * 小组所属的网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 网格的所有上级id
+     */
+	private String gridPids;
+
+    /**
+     * 活动标题；需内容审核
+     */
+	private String title;
+
+    /**
+     * 活动时间
+     */
+	private Date startTime;
+
+    /**
+     * 活动所属类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 上级类别编码
+     */
+	private String parentCode;
+
+    /**
+     * 活动类别名称；eg：支部建设-三会一课
+     */
+	private String allCategoryName;
+
+    /**
+     * 活动地点
+     */
+	private String address;
+
+    /**
+     * 活动地点-经度
+     */
+	private BigDecimal longitude;
+
+    /**
+     * 活动地点-纬度
+     */
+	private BigDecimal latitude;
+
+    /**
+     * 应参加人数组长填入；此列也是应签到人数；
+     */
+	private Integer shouldAttend;
+
+    /**
+     * 活动状态：已发布：published;已取消：canceled；已变更：changed；已关闭：closed
+     */
+	private String status;
+
+    /**
+     * 最后一次编辑时间；首次发布与CREATED_TIME一致
+     */
+	private Date changedTime;
+
+    /**
+     * 签到开始时间
+     */
+	private Date signInStartTime;
+
+    /**
+     * 签到截止时间
+     */
+	private Date signInEndTime;
+
+    /**
+     * 是否填写总结？1：已填写；0：未填写
+     */
+	private Integer summaryFlag;
+
+    /**
+     * 已签到人数（有人签到自动+1）
+     */
+	private Integer signedInNum;
+
+    /**
+     * 取消时间
+     */
+	private Date canceledTime;
+
+    /**
+     * 关闭时间
+     */
+	private Date closedTime;
+
+    /**
+     * 活动发布人用户id
+     */
+	private String publishUserId;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间（活动发布时间）
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActCategoryFormDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 002、活动类别下拉框查询
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 14:16
+ */
+@Data
+public class ActCategoryFormDTO implements Serializable {
+
+
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 组Id
+     */
+    @NotBlank(message = "categoryCode不能为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
+    private String categoryCode;
+
+    @NotBlank(message = "tokenDto获取customerId为空", groups = ActCategoryFormDTO.AddUserInternalGroup.class)
+    private String customerId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActDetailFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 004、活动详情
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 19:16
+ */
+@Data
+public class ActDetailFormDTO implements Serializable {
+    private static final long serialVersionUID = 9163803497503557861L;
+    public interface AddUserInternalGroup {
+    }
+    @NotBlank(message = "groupActId不能为空", groups = AddUserInternalGroup.class)
+    private String groupActId;
+
+    /**
+     * 当前用户id
+     */
+    @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
+    private String userId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/ActMenuFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.resi.group.dto.act.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 001、活动类别列表 入参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:13
+ */
+@Data
+public class ActMenuFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+
+    /**
+     * 组Id
+     */
+    @NotBlank(message = "groupId不能为空", groups =AddUserInternalGroup.class)
+    private String groupId;
+
+    @NotBlank(message = "tokenDto获取customerId为空", groups =AddUserInternalGroup.class)
+    private String customerId;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/form/PublishGroupActFormDTO.java

@@ -0,0 +1,104 @@
+package com.epmet.resi.group.dto.act.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 003、发布（编辑）组织活动
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 15:10
+ */
+@Data
+public class PublishGroupActFormDTO implements Serializable {
+    private static final long serialVersionUID = 3507465802034946254L;
+
+    public interface AddUserInternalGroup {
+    }
+
+    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    }
+
+    @NotBlank(message = "tokenDto获取customerId为空", groups = AddUserInternalGroup.class)
+    private String customerId;
+
+    /**
+     * 活动发布人用户id
+     */
+    @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class)
+    private String publishUserId;
+
+    @NotBlank(message = "groupId不能为空", groups = AddUserInternalGroup.class)
+    private String groupId;
+
+    /**
+     * 小组活动id,此列有值代表编辑
+     */
+    private String groupActId;
+
+    /**
+     * 类别编码
+     */
+    @NotBlank(message = "categoryCode不能为空", groups = AddUserInternalGroup.class)
+    private String categoryCode;
+
+    /**
+     * 类别编码所属的上一级编码
+     */
+    @NotBlank(message = "parentCode不能为空", groups = AddUserInternalGroup.class)
+    private String parentCode;
+
+    /**
+     * 活动标题
+     */
+    @NotBlank(message = "title不能为空,最多输入50个字", groups = AddUserShowGroup.class)
+    @Length(min = 1, max = 50, message = "title不能为空,最多输入50个字", groups = {AddUserShowGroup.class})
+    private String title;
+
+    /**
+     * 活动时间，格式：yyyy-MM-dd HH:mm
+     */
+    private String startTime;
+
+    /**
+     * 活动地点
+     */
+    @NotBlank(message = "活动地点不能为空", groups = AddUserShowGroup.class)
+    private String address;
+
+
+    /**
+     * 活动地点-经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 活动地点-纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 应参加人数组长填入；此列也是应签到人数；
+     */
+    @Min(value = 1, message = "应参加人数需大于0", groups = AddUserShowGroup.class)
+    private Integer shouldAttend;
+
+    /**
+     * 活动文本内容，目前只有一段，限制1000字
+     */
+    private List<String> textList;
+
+    /**
+     * 图片列表，最多3张
+     */
+    private List<String> imgList;
+
+    private String gridId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActDetailResultDTO.java

@@ -0,0 +1,10 @@
+package com.epmet.resi.group.dto.act.result;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 19:24
+ */
+public class ActDetailResultDTO {
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/ActMenuResultDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.resi.group.dto.act.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 001、活动类别列表 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:14
+ */
+@Data
+public class ActMenuResultDTO implements Serializable {
+    private static final long serialVersionUID = 7376609450780826924L;
+
+    /**
+     * 活动应参加人数
+     */
+    private Integer shouldAttend;
+
+    /**
+     * 一级菜单列表
+     */
+    private List<CategoryDTO> categoryList;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryCodeResultDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.resi.group.dto.act.result;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  002、活动类别下拉框查询 返参
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 14:18
+ */
+@Data
+public class CategoryCodeResultDTO implements Serializable {
+    private static final long serialVersionUID = 8615713807759844661L;
+    @JsonIgnore
+    private String customerId;
+    private String categoryCode;
+    private String categoryName;
+    private String parentCode;
+    private List<CategoryCodeResultDTO> children;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/result/CategoryDTO.java

@@ -0,0 +1,18 @@
+package com.epmet.resi.group.dto.act.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 001、活动类别列表 返参-一级类别信息
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:28
+ */
+@Data
+public class CategoryDTO implements Serializable {
+    private String categoryCode;
+    private String categoryName;
+    private String parentCode;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java

@@ -115,4 +115,8 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      */
 	private Date updatedTime;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupInfoRedisDTO.java

@@ -56,6 +56,11 @@ public class ResiGroupInfoRedisDTO implements Serializable{
      * */
     private String latestTopicPublishDate;
 
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
+
     /**
      * 组统计信息
      * */

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java

@@ -69,4 +69,10 @@ public class ApplyCreateGroupFormDTO implements Serializable {
      * 小组是否允许参观:允许：open;不允许：closed
      */
     private String visitSwitch;
+
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    @NotBlank(message = "小组类型不能为空")
+    private String groupType;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupResultDTO.java

@@ -45,6 +45,9 @@ public class ApplyingGroupResultDTO implements Serializable{
      * */
     private String messageText;
 
-
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
 
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupsInGridResultDTO.java

@@ -38,4 +38,9 @@ public class GroupsInGridResultDTO implements Serializable {
 	 * 当前状态审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed
 	 */
 	private String status;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/MyGroupResultDTO.java

@@ -52,4 +52,9 @@ public class MyGroupResultDTO implements Serializable {
 	 * 最新话题
 	 */
 	private LatestTopicDTO latestTopic;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java

@@ -43,4 +43,9 @@ public class RecommendGroupResultDTO implements Serializable {
 	 */
 	private String status="";
 
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
+
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/InvitationRecordDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.invitation;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+public class InvitationRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小组所属的网格id
+     */
+	private String gridId;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * act:活动;notice:通知
+     */
+	private String sourceType;
+
+    /**
+     * 活动id,或者通知id....
+     */
+	private String sourceId;
+
+    /**
+     * 分享人id
+     */
+	private String shareUserId;
+
+    /**
+     * 分享内容
+     */
+	private String inviteContent;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/ShareFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.resi.group.dto.invitation.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 小组通知、活动分享-接口入参
+ */
+@Data
+public class ShareFormDTO implements Serializable {
+	private static final long serialVersionUID = 7069116393380944951L;
+	/**
+	 * 通知或活动Id
+	 */
+	@NotBlank(message="通知或活动Id不能为空",groups = {ShareFormDTO.Add.class})
+	private String id;
+	/**
+	 * 类型(notice:通知  act:活动)
+	 */
+	@NotBlank(message = "类型(notice:通知  act:活动)不能为空",groups = {ShareFormDTO.Add.class})
+	private String type;
+	/**
+	 * token中用户Id
+	 */
+	private String userId;
+
+	public interface Add{}
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/ShareResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.resi.group.dto.invitation.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 小组通知、活动分享-接口返参
+ */
+@Data
+public class ShareResultDTO implements Serializable {
+	private static final long serialVersionUID = 6136787210623326830L;
+
+	/**
+	 * 分享Id
+	 */
+	private String invitationRecordId;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeAttachmentDTO.java

@@ -0,0 +1,121 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.notice;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小组通知附件表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-19
+ */
+@Data
+public class NoticeAttachmentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 通知Id
+     */
+	private String noticeId;
+
+    /**
+     * 文件名
+     */
+	private String fileName;
+
+    /**
+     * 附件名（uuid随机生成）
+     */
+	private String attachmentName;
+
+    /**
+     * 文件大小，单位b
+     */
+	private Integer attachmentSize;
+
+    /**
+     * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）
+     */
+	private String attachmentFormat;
+
+    /**
+     * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））
+     */
+	private String attachmentType;
+
+    /**
+     * 附件地址
+     */
+	private String attachmentUrl;
+
+    /**
+     * 排序字段
+     */
+	private Integer sort;
+
+    /**
+     * 语音或视频时长，秒
+     */
+	private Integer duration;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeCommentDTO.java

@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.notice;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小组通知评论表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-19
+ */
+@Data
+public class NoticeCommentDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 通知Id
+     */
+	private String noticeId;
+
+    /**
+     * 评论内容(最多300字符)
+     */
+	private String commentContent;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeDTO.java

@@ -0,0 +1,111 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.notice;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小组通知表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-19
+ */
+@Data
+public class NoticeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 组织机构Id
+     */
+	private String agencyId;
+
+    /**
+     * 小组所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 小组Id
+     */
+	private String groupId;
+
+    /**
+     * 通知标题
+     */
+	private String title;
+
+    /**
+     * 通知内容
+     */
+	private String content;
+
+    /**
+     * 是否变更过(是:yes 否:no)
+     */
+	private String isChange;
+
+    /**
+     * 通知变更时间，初始值为首次创建时间
+     */
+	private Date changeTime;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReafdRecordDTO.java

@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.notice;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 小组通知组成员阅读记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-19
+ */
+@Data
+public class NoticeReafdRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小组所属网格id
+     */
+	private String gridId;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * 通知Id
+     */
+	private String noticeId;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * read已读、unread未读
+     */
+	private String readFlag;
+
+    /**
+     * 删除标识
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/AddNoticeFormDTO.java

@@ -0,0 +1,44 @@
+package com.epmet.resi.group.dto.notice.form;
+
+import com.epmet.resi.group.dto.topic.form.FileDTO;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 小组通知保存-接口入参
+ */
+@Data
+public class AddNoticeFormDTO {
+
+    /**
+     * 小组Id
+     */
+    @NotBlank(message = "小组Id不能为空",groups = {AddNoticeFormDTO.Add.class})
+    private String groupId;
+    /**
+     * 通知标题
+     */
+    @NotBlank(message = "通知标题不能为空",groups = {AddNoticeFormDTO.Add.class})
+    @Length(max = 20, message = "通知标题不能超过20个字符")
+    private String title;
+    /**
+     * 通知内容
+     */
+    @NotBlank(message = "通知内容不能为空",groups = {AddNoticeFormDTO.Add.class})
+    @Length(max = 1000, message = "通知内容不能超过1000个字符")
+    private String content;
+    /**
+     * 图片附件集合
+     */
+    private List<FileDTO> imageList;
+    /**
+     * 文件附件url集合
+     */
+    private List<FileDTO> docList;
+
+    public interface Add{}
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/EditNoticeFormDTO.java

@@ -0,0 +1,42 @@
+package com.epmet.resi.group.dto.notice.form;
+
+import com.epmet.resi.group.dto.topic.form.FileDTO;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 小组通知编辑-接口入参
+ */
+@Data
+public class EditNoticeFormDTO {
+
+    /**
+     * 通知Id
+     */
+    @NotBlank(message = "通知Id不能为空",groups = {EditNoticeFormDTO.Edit.class})
+    private String noticeId;
+    /**
+     * 通知标题
+     */
+    @Length(max = 20, message = "通知标题不能超过20个字符")
+    private String title;
+    /**
+     * 通知内容
+     */
+    @Length(max = 1000, message = "通知内容不能超过1000个字符")
+    private String content;
+    /**
+     * 图片附件集合
+     */
+    private List<FileDTO> imageList;
+    /**
+     * 文件附件url集合
+     */
+    private List<FileDTO> docList;
+
+    public interface Edit{}
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeDetailFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.resi.group.dto.notice.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author sun
+ * @Description 小组通知详情-接口入参
+ */
+@Data
+public class NoticeDetailFormDTO {
+
+    /**
+     * 通知Id
+     */
+    @NotBlank(message = "通知Id不能为空",groups = {NoticeDetailFormDTO.Detail.class})
+    private String noticeId;
+
+    public interface Detail{}
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/form/NoticeReadListFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.resi.group.dto.notice.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author sun
+ * @Description 通知已读未读列表查询-接口入参
+ */
+@Data
+public class NoticeReadListFormDTO {
+
+    /**
+     * 通知Id
+     */
+    @NotBlank(message = "通知Id不能为空",groups = {NoticeReadListFormDTO.List.class})
+    private String noticeId;
+
+    public interface List{}
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeDetailResultDTO.java

@@ -0,0 +1,71 @@
+package com.epmet.resi.group.dto.notice.result;
+
+import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO;
+import com.epmet.resi.group.dto.topic.form.FileDTO;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 小组通知详情-接口返参
+ */
+@Data
+public class NoticeDetailResultDTO implements Serializable {
+	private static final long serialVersionUID = 6136787210623326830L;
+
+	/**
+	 * 通知Id
+	 */
+	private String noticeId;
+	/**
+	 * 通知标题
+	 */
+	private String title;
+	/**
+	 * 通知内容
+	 */
+	private String content;
+	/**
+	 * 是否变更过(是:yes 否:no)
+	 */
+	private String isChange;
+	/**
+	 * 发布时间yyyy-MM-dd HH:mm
+	 */
+	private String releaseTime;
+	/**
+	 * 发布人头像
+	 */
+	private String releaseUserHeadPhoto;
+	/**
+	 * 发布人名称
+	 */
+	private String releaseUserName;
+	/**
+	 * 图片附件集合
+	 */
+	private List<File> imageList;
+	/**
+	 * 文件附件url集合
+	 */
+	private List<File> docList;
+
+
+	@NoArgsConstructor
+	@Data
+	public static class File {
+		private String name;
+		private String url;
+		private String type;
+		private String format;
+		private Integer size;
+		private Integer duration;
+	}
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/NoticeReadListResultDTO.java

@@ -0,0 +1,51 @@
+package com.epmet.resi.group.dto.notice.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author sun
+ * @Description 通知已读未读列表查询-接口返参
+ */
+@Data
+public class NoticeReadListResultDTO implements Serializable {
+	private static final long serialVersionUID = 6136787210623326830L;
+
+	/**
+	 * 已读人员数
+	 */
+	private Integer readCount;
+	/**
+	 * 未读人员数
+	 */
+	private Integer unReadCount;
+	/**
+	 * 已读列表
+	 */
+	private List<NoticeReafdRecord> readList = new ArrayList<>();
+	/**
+	 * 未读列表
+	 */
+	private List<NoticeReafdRecord> unReadList = new ArrayList<>();
+
+	@NoArgsConstructor
+	@Data
+	public static class NoticeReafdRecord {
+		/**
+		 * 用户Id
+		 */
+		private String userId;
+		/**
+		 * 用户姓名(真实姓名)
+		 */
+		private String userName;
+		/**
+		 * 用户头像
+		 */
+		private String userHeadPhoto;
+	}
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCategoryDictController.java

@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+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.act.service.ActCategoryDictService;
+import com.epmet.resi.group.dto.act.form.ActCategoryFormDTO;
+import com.epmet.resi.group.dto.act.form.ActMenuFormDTO;
+import com.epmet.resi.group.dto.act.result.ActMenuResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@RestController
+@RequestMapping("actdict")
+public class ActCategoryDictController {
+    
+    @Autowired
+    private ActCategoryDictService actCategoryDictService;
+
+
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActMenuResultDTO>
+     * @author yinzuomei
+     * @description 001、活动类别列表
+     * @Date 2021/4/19 13:25
+     **/
+    @PostMapping("menulist")
+    public Result<ActMenuResultDTO> queryMenuList(@LoginUser TokenDto tokenDto, @RequestBody ActMenuFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, ActMenuFormDTO.AddUserInternalGroup.class);
+        return new Result<ActMenuResultDTO>().ok(actCategoryDictService.queryMenuList(formDTO));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO>>
+     * @param tokenDto
+     * @param formDTO
+     * @author yinzuomei
+     * @description 002、活动类别下拉框查询
+     * @Date 2021/4/19 14:22 
+     **/
+    @PostMapping("categorylist")
+    public Result<List<CategoryCodeResultDTO>> queryCategoryList(@LoginUser TokenDto tokenDto, @RequestBody ActCategoryFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        ValidatorUtils.validateEntity(formDTO, ActCategoryFormDTO.AddUserInternalGroup.class);
+        return new Result<List<CategoryCodeResultDTO>>().ok(actCategoryDictService.queryCategoryList(formDTO));
+    }
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.modules.act.service.ActCommentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 活动评论表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@RestController
+@RequestMapping("actcomment")
+public class ActCommentController {
+    
+    @Autowired
+    private ActCommentService actCommentService;
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.modules.act.service.ActSignInRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@RestController
+@RequestMapping("actsign")
+public class ActSignInRecordController {
+    
+    @Autowired
+    private ActSignInRecordService actSignInRecordService;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.modules.act.service.ActSummaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 活动总结
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@RestController
+@RequestMapping("actsummary")
+public class ActSummaryController {
+    
+    @Autowired
+    private ActSummaryService actSummaryService;
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java

@@ -0,0 +1,80 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+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.act.service.GroupActInfoService;
+import com.epmet.resi.group.dto.act.GroupActIdDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@RestController
+@RequestMapping("act")
+public class GroupActInfoController {
+    
+    @Autowired
+    private GroupActInfoService groupActInfoService;
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.GroupActIdDTO>
+     * @param tokenDto
+     * @param formDTO
+     * @author yinzuomei
+     * @description 003、发布（编辑）组织活动
+     * @Date 2021/4/19 15:16 
+     **/
+    @PostMapping("publish")
+    public Result<GroupActIdDTO> publishGroupAct(@LoginUser TokenDto tokenDto, @RequestBody PublishGroupActFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setPublishUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,PublishGroupActFormDTO.AddUserShowGroup.class,PublishGroupActFormDTO.AddUserInternalGroup.class);
+        return new Result<GroupActIdDTO>().ok(groupActInfoService.publishGroupAct(formDTO));
+    }
+
+    /**
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.act.result.ActDetailResultDTO>
+     * @param tokenDto
+     * @param actDetailFormDTO
+     * @author yinzuomei
+     * @description 004、活动详情
+     * @Date 2021/4/19 19:25 
+     **/
+    @PostMapping("actdetail")
+    public Result<ActDetailResultDTO> queryActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActDetailFormDTO actDetailFormDTO){
+        actDetailFormDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(actDetailFormDTO,ActDetailFormDTO.AddUserInternalGroup.class);
+        return new Result<ActDetailResultDTO>().ok(groupActInfoService.queryActDetail(actDetailFormDTO));
+    }
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCategoryDictDao.java

@@ -0,0 +1,59 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActCategoryDictEntity;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryDTO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActCategoryDictDao extends BaseDao<ActCategoryDictEntity> {
+
+    /**
+     * 查询一级类别
+     *
+     * @param customerId
+     * @return com.epmet.resi.group.dto.act.result.CategoryDTO
+     */
+    List<CategoryDTO> selectFirstLevelCategory(String customerId);
+
+    /**
+     * 查询一级类别
+     *
+     * @param parentCode
+     * @param customerId
+     * @return com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO
+     */
+    List<CategoryCodeResultDTO> selectCategoryList(@Param("parentCode") String parentCode,
+                                                   @Param("customerId") String customerId);
+
+    int selectCountByCustomerId(String customerId);
+
+    ActCategoryDictEntity selectByCode(@Param("categoryCode")String categoryCode, @Param("customerId")String customerId);
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/EnterGroupSwitchDao.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentDao.java

@@ -15,19 +15,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dataaggre.dao.resigroup;
+package com.epmet.modules.act.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dataaggre.entity.resigroup.EnterGroupSwitchEntity;
+import com.epmet.modules.act.entity.ActCommentEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 
+ * 活动评论表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
+ * @since v1.0.0 2021-04-16
  */
 @Mapper
-public interface EnterGroupSwitchDao extends BaseDao<EnterGroupSwitchEntity> {
+public interface ActCommentDao extends BaseDao<ActCommentEntity> {
 	
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActOperationRecordDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActOperationRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 活动操作表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActOperationRecordDao extends BaseDao<ActOperationRecordEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActReadRecordDao.java

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActReadRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 活动已读记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActReadRecordDao extends BaseDao<ActReadRecordEntity> {
+
+    int deleteByActId(String groupActId);
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInCodeDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActSignInCodeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActSignInCodeDao extends BaseDao<ActSignInCodeEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActSignInRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActSignInRecordDao extends BaseDao<ActSignInRecordEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryContentDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActSummaryContentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 活动总结内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActSummaryContentDao extends BaseDao<ActSummaryContentEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActSummaryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 活动总结
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActSummaryDao extends BaseDao<ActSummaryEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActContentDao.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.GroupActContentEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * 组织活动内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface GroupActContentDao extends BaseDao<GroupActContentEntity> {
+
+    int updateToDel(@Param("groupActId") String groupActId, @Param("userId") String userId);
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface GroupActInfoDao extends BaseDao<GroupActInfoEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCategoryDictEntity.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_category_dict")
+public class ActCategoryDictEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 活动类别名称；eg：支部建设、联建共建
+     */
+	private String categoryName;
+
+    /**
+     * 等级1,2......
+     */
+	private Integer level;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 上级类别编码
+     */
+	private String parentCode;
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/EnterGroupSwitchEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentEntity.java

@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.dataaggre.entity.resigroup;
+package com.epmet.modules.act.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -23,15 +23,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 
+ * 活动评论表
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-12-25
+ * @since v1.0.0 2021-04-16
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("enter_group_switch")
-public class EnterGroupSwitchEntity extends BaseEpmetEntity {
+@TableName("act_comment")
+public class ActCommentEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -41,18 +41,18 @@ public class EnterGroupSwitchEntity extends BaseEpmetEntity {
 	private String customerId;
 
     /**
-     * 小组所属网格id
+     * group_act_info.id
      */
-	private String gridId;
+	private String groupActId;
 
     /**
-     * 小组id
+     * 评论人id
      */
-	private String groupId;
+	private String commentUserId;
 
     /**
-     * open开启； close关闭
+     * 评论内容；目前限制500字
      */
-	private String auditSwitch;
+	private String commentContent;
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActOperationRecordEntity.java

@@ -0,0 +1,66 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 活动操作表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_operation_record")
+public class ActOperationRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 操作人id
+     */
+	private String operateUserId;
+
+    /**
+     * 操作类型：发布：publish;
+取消：cancel；
+变更：change；
+关闭：close
+     */
+	private String operationType;
+
+    /**
+     * 备注；取消理由
+     */
+	private String note;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 活动已读记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_read_record")
+public class ActReadRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 已读:  read未读：un_read；查看活动详情后修改此表，或者插入一条新的已读记录
+     */
+	private String read;
+
+    /**
+     * 用户id
+     */
+	private String userId;
+
+    /**
+     * yes：应读；no: 新入群的人已读
+     */
+	private String shouldBeRead;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSignInCodeEntity.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_sign_in_code")
+public class ActSignInCodeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 签到码url
+     */
+	private String url;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSignInRecordEntity.java

@@ -0,0 +1,70 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_sign_in_record")
+public class ActSignInRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 签到用户id
+     */
+	private String signUserId;
+
+    /**
+     * 签到地点
+     */
+	private String signInAddress;
+
+    /**
+     * 签到地点-经度
+     */
+	private BigDecimal longitude;
+
+    /**
+     * 签到地点-纬度
+     */
+	private BigDecimal latitude;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryContentEntity.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 活动总结内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_summary_content")
+public class ActSummaryContentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 总结内容
+     */
+	private String content;
+
+    /**
+     * 内容类型: 文字：text；图片：img
+     */
+	private String contentType;
+
+    /**
+     * 内容顺序 从1开始
+     */
+	private Integer sort;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryEntity.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 活动总结
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("act_summary")
+public class ActSummaryEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 应参加人数：来源于group_act_info
+     */
+	private Integer shouldAttend;
+
+    /**
+     * 已签到人数
+     */
+	private Integer signedInNum;
+
+    /**
+     * 已签到人员姓名列表、分隔
+     */
+	private String signedInUsers;
+
+    /**
+     * 填写总结的人
+     */
+	private String userId;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActContentEntity.java

@@ -0,0 +1,63 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 组织活动内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("group_act_content")
+public class GroupActContentEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * group_act_info.id
+     */
+	private String groupActId;
+
+    /**
+     * 活动内容
+     */
+	private String content;
+
+    /**
+     * 内容类型: 文字：text；图片：img
+     */
+	private String contentType;
+
+    /**
+     * 内容顺序 从1开始
+     */
+	private Integer sort;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActInfoEntity.java

@@ -0,0 +1,156 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("group_act_info")
+public class GroupActInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * 小组所属的网格id
+     */
+	private String gridId;
+
+    /**
+     * 网格所属的组织id
+     */
+	private String agencyId;
+
+    /**
+     * 网格的所有上级id
+     */
+	private String gridPids;
+
+    /**
+     * 活动标题；需内容审核
+     */
+	private String title;
+
+    /**
+     * 活动时间
+     */
+	private Date startTime;
+
+    /**
+     * 活动所属类别编码
+     */
+	private String categoryCode;
+
+    /**
+     * 上级类别编码
+     */
+	private String parentCode;
+
+    /**
+     * 活动类别名称；eg：支部建设-三会一课
+     */
+	private String allCategoryName;
+
+    /**
+     * 活动地点
+     */
+	private String address;
+
+    /**
+     * 活动地点-经度
+     */
+	private BigDecimal longitude;
+
+    /**
+     * 活动地点-纬度
+     */
+	private BigDecimal latitude;
+
+    /**
+     * 应参加人数组长填入；此列也是应签到人数；
+     */
+	private Integer shouldAttend;
+
+    /**
+     * 活动状态：已发布：published;已取消：canceled；已变更：changed；已关闭：closed
+     */
+	private String status;
+
+    /**
+     * 最后一次编辑时间；首次发布与CREATED_TIME一致
+     */
+	private Date changedTime;
+
+    /**
+     * 签到开始时间
+     */
+	private Date signInStartTime;
+
+    /**
+     * 签到截止时间
+     */
+	private Date signInEndTime;
+
+    /**
+     * 是否填写总结？1：已填写；0：未填写
+     */
+	private Integer summaryFlag;
+
+    /**
+     * 已签到人数（有人签到自动+1）
+     */
+	private Integer signedInNum;
+
+    /**
+     * 取消时间
+     */
+	private Date canceledTime;
+
+    /**
+     * 关闭时间
+     */
+	private Date closedTime;
+
+    /**
+     * 活动发布人用户id
+     */
+	private String publishUserId;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCategoryDictService.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActCategoryDictEntity;
+import com.epmet.resi.group.dto.act.form.ActCategoryFormDTO;
+import com.epmet.resi.group.dto.act.form.ActMenuFormDTO;
+import com.epmet.resi.group.dto.act.result.ActMenuResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+
+import java.util.List;
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActCategoryDictService extends BaseService<ActCategoryDictEntity> {
+
+    /**
+     * 001、活动类别列表
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActMenuResultDTO
+     */
+    ActMenuResultDTO queryMenuList(ActMenuFormDTO formDTO);
+
+    /**
+     * 002、活动类别下拉框查询
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO
+     */
+    List<CategoryCodeResultDTO> queryCategoryList(ActCategoryFormDTO formDTO);
+
+    /**
+     * 查询类别编码的全路径名称
+     *
+     * @param categoryCode
+     * @param customerId
+     * @return 支部建设-三会一课
+     */
+    String queryAllCategoryName(String categoryCode,String customerId);
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActCommentEntity;
+
+/**
+ * 活动评论表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActCommentService extends BaseService<ActCommentEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActOperationRecordService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActOperationRecordEntity;
+
+/**
+ * 活动操作表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActOperationRecordService extends BaseService<ActOperationRecordEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActReadRecordService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActReadRecordEntity;
+
+/**
+ * 活动已读记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActReadRecordService extends BaseService<ActReadRecordEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInCodeService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActSignInCodeEntity;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActSignInCodeService extends BaseService<ActSignInCodeEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInRecordService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActSignInRecordEntity;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActSignInRecordService extends BaseService<ActSignInRecordEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryContentService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActSummaryContentEntity;
+
+/**
+ * 活动总结内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActSummaryContentService extends BaseService<ActSummaryContentEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActSummaryEntity;
+
+/**
+ * 活动总结
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActSummaryService extends BaseService<ActSummaryEntity> {
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActContentService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.GroupActContentEntity;
+
+/**
+ * 组织活动内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface GroupActContentService extends BaseService<GroupActContentEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.resi.group.dto.act.GroupActIdDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface GroupActInfoService extends BaseService<GroupActInfoEntity> {
+
+    /**
+     * 003、发布（编辑）组织活动
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.GroupActIdDTO
+     */
+    GroupActIdDTO publishGroupAct(PublishGroupActFormDTO formDTO);
+
+    /**
+     * 004、活动详情
+     *
+     * @param actDetailFormDTO
+     * @return com.epmet.resi.group.dto.act.result.ActDetailResultDTO
+     */
+    ActDetailResultDTO queryActDetail(ActDetailFormDTO actDetailFormDTO);
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java

@@ -0,0 +1,118 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.modules.act.dao.ActCategoryDictDao;
+import com.epmet.modules.act.entity.ActCategoryDictEntity;
+import com.epmet.modules.act.service.ActCategoryDictService;
+import com.epmet.modules.constant.GroupActConstant;
+import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.resi.group.dto.act.form.ActCategoryFormDTO;
+import com.epmet.resi.group.dto.act.form.ActMenuFormDTO;
+import com.epmet.resi.group.dto.act.result.ActMenuResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO;
+import com.epmet.resi.group.dto.act.result.CategoryDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Slf4j
+@Service
+public class ActCategoryDictServiceImpl extends BaseServiceImpl<ActCategoryDictDao, ActCategoryDictEntity> implements ActCategoryDictService {
+
+    @Autowired
+    private ResiGroupMemberService resiGroupMemberService;
+
+
+    /**
+     * 001、活动类别列表
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.ActMenuResultDTO
+     */
+    @Override
+    public ActMenuResultDTO queryMenuList(ActMenuFormDTO formDTO) {
+        ActMenuResultDTO resultDTO = new ActMenuResultDTO();
+        resultDTO.setShouldAttend(resiGroupMemberService.selectCountMember(formDTO.getGroupId()));
+        List<CategoryDTO> categoryList = baseDao.selectFirstLevelCategory(formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(categoryList)) {
+            categoryList = baseDao.selectFirstLevelCategory(GroupActConstant.DEFAULT_CUSTOMER_ID);
+        }
+        resultDTO.setCategoryList(categoryList);
+        return resultDTO;
+    }
+
+    /**
+     * 002、活动类别下拉框查询
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.result.CategoryCodeResultDTO
+     */
+    @Override
+    public List<CategoryCodeResultDTO> queryCategoryList(ActCategoryFormDTO formDTO) {
+        List<CategoryCodeResultDTO> list = baseDao.selectCategoryList(formDTO.getCategoryCode(), formDTO.getCustomerId());
+        if (CollectionUtils.isEmpty(list)) {
+            list = baseDao.selectCategoryList(formDTO.getCategoryCode(), GroupActConstant.DEFAULT_CUSTOMER_ID);
+        }
+        return list;
+    }
+
+    /**
+     * 查询类别编码的全路径名称
+     *
+     * @param categoryCode
+     * @param customerId
+     * @return 支部建设-三会一课
+     */
+    @Override
+    public String queryAllCategoryName(String categoryCode, String customerId) {
+        if (baseDao.selectCountByCustomerId(customerId) == NumConstant.ZERO) {
+            customerId = GroupActConstant.DEFAULT_CUSTOMER_ID;
+        }
+        ActCategoryDictEntity entity = baseDao.selectByCode(categoryCode, customerId);
+        if (null == entity) {
+            log.warn(String.format("根据categoryCode:%s,查询act_category_dict表为null", categoryCode));
+            return StrConstant.EPMETY_STR;
+        }
+        List<String> nameList = new ArrayList<>();
+        for (int i = NumConstant.ONE; i <= entity.getLevel(); i++) {
+            int length = i * NumConstant.THREE;
+            String categoryCodeStr = categoryCode.substring(NumConstant.ZERO, length);
+            ActCategoryDictEntity actCategoryDictEntity = baseDao.selectByCode(categoryCodeStr, customerId);
+            nameList.add(actCategoryDictEntity.getCategoryName());
+        }
+        String allCategoryName = StringUtils.strip(nameList.toString(), "[]").replace(", ", StrConstant.HYPHEN);
+        String.format("categoryCode:%s,allCategoryName:%s", categoryCode, allCategoryName);
+        return allCategoryName;
+    }
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActCommentDao;
+import com.epmet.modules.act.entity.ActCommentEntity;
+import com.epmet.modules.act.service.ActCommentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动评论表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActCommentServiceImpl extends BaseServiceImpl<ActCommentDao, ActCommentEntity> implements ActCommentService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActOperationRecordServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActOperationRecordDao;
+import com.epmet.modules.act.entity.ActOperationRecordEntity;
+import com.epmet.modules.act.service.ActOperationRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动操作表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActOperationRecordServiceImpl extends BaseServiceImpl<ActOperationRecordDao, ActOperationRecordEntity> implements ActOperationRecordService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActReadRecordServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActReadRecordDao;
+import com.epmet.modules.act.entity.ActReadRecordEntity;
+import com.epmet.modules.act.service.ActReadRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动已读记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActReadRecordServiceImpl extends BaseServiceImpl<ActReadRecordDao, ActReadRecordEntity> implements ActReadRecordService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInCodeServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActSignInCodeDao;
+import com.epmet.modules.act.entity.ActSignInCodeEntity;
+import com.epmet.modules.act.service.ActSignInCodeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActSignInCodeServiceImpl extends BaseServiceImpl<ActSignInCodeDao, ActSignInCodeEntity> implements ActSignInCodeService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActSignInRecordDao;
+import com.epmet.modules.act.entity.ActSignInRecordEntity;
+import com.epmet.modules.act.service.ActSignInRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordDao, ActSignInRecordEntity> implements ActSignInRecordService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryContentServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActSummaryContentDao;
+import com.epmet.modules.act.entity.ActSummaryContentEntity;
+import com.epmet.modules.act.service.ActSummaryContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动总结内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActSummaryContentServiceImpl extends BaseServiceImpl<ActSummaryContentDao, ActSummaryContentEntity> implements ActSummaryContentService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java

@@ -0,0 +1,35 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActSummaryDao;
+import com.epmet.modules.act.entity.ActSummaryEntity;
+import com.epmet.modules.act.service.ActSummaryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动总结
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActSummaryServiceImpl extends BaseServiceImpl<ActSummaryDao, ActSummaryEntity> implements ActSummaryService {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActContentServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.GroupActContentDao;
+import com.epmet.modules.act.entity.GroupActContentEntity;
+import com.epmet.modules.act.service.GroupActContentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织活动内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class GroupActContentServiceImpl extends BaseServiceImpl<GroupActContentDao, GroupActContentEntity> implements GroupActContentService {
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -0,0 +1,367 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.Constant;
+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.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
+import com.epmet.dto.result.GridInfoResultDTO;
+import com.epmet.feign.GovOrgOpenFeignClient;
+import com.epmet.modules.act.dao.ActOperationRecordDao;
+import com.epmet.modules.act.dao.ActReadRecordDao;
+import com.epmet.modules.act.dao.GroupActContentDao;
+import com.epmet.modules.act.dao.GroupActInfoDao;
+import com.epmet.modules.act.entity.ActOperationRecordEntity;
+import com.epmet.modules.act.entity.ActReadRecordEntity;
+import com.epmet.modules.act.entity.GroupActContentEntity;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.modules.act.service.ActCategoryDictService;
+import com.epmet.modules.act.service.GroupActInfoService;
+import com.epmet.modules.constant.GroupActConstant;
+import com.epmet.modules.group.service.ResiGroupService;
+import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.resi.group.dto.act.GroupActIdDTO;
+import com.epmet.resi.group.dto.act.form.ActDetailFormDTO;
+import com.epmet.resi.group.dto.act.form.PublishGroupActFormDTO;
+import com.epmet.resi.group.dto.act.result.ActDetailResultDTO;
+import com.epmet.resi.group.dto.group.ResiGroupDTO;
+import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Slf4j
+@Service
+public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, GroupActInfoEntity> implements GroupActInfoService {
+    @Autowired
+    private ResiGroupMemberService resiGroupMemberService;
+    @Autowired
+    private ResiGroupService resiGroupService;
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
+    @Value("${openapi.scan.method.imgSyncScan}")
+    private String imgSyncScanMethod;
+    @Autowired
+    private ActOperationRecordDao actOperationRecordDao;
+    @Autowired
+    private ActCategoryDictService actCategoryDictService;
+    @Autowired
+    private GovOrgOpenFeignClient govOrgOpenFeignClient;
+    @Autowired
+    private GroupActContentDao groupActContentDao;
+    @Autowired
+    private ActReadRecordDao actReadRecordDao;
+
+    /**
+     * 003、发布（编辑）组织活动
+     *
+     * @param formDTO
+     * @return com.epmet.resi.group.dto.act.GroupActIdDTO
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public GroupActIdDTO publishGroupAct(PublishGroupActFormDTO formDTO) {
+
+        ResiGroupDTO groupDTO = resiGroupService.get(formDTO.getGroupId());
+        formDTO.setGridId(groupDTO.getGridId());
+        //参数校验
+        this.checkPublishGroupActFormDTO(formDTO);
+        //内容审核
+        this.scanActContent(formDTO.getTitle(), formDTO.getTextList(), formDTO.getImgList());
+
+        //返参
+        GroupActIdDTO result=new GroupActIdDTO();
+
+        //组织活动信息
+        GroupActInfoEntity groupActInfoEntity = constructGroupActInfoEntity(formDTO);
+        //1、插入活修改活动信息表
+        if (StringUtils.isNotBlank(groupActInfoEntity.getId())) {
+            //删除group_act_content、删除act_read_record
+            groupActContentDao.updateToDel(groupActInfoEntity.getId(), formDTO.getPublishUserId());
+            actReadRecordDao.deleteByActId(groupActInfoEntity.getId());
+            baseDao.updateById(groupActInfoEntity);
+        } else {
+            baseDao.insert(groupActInfoEntity);
+        }
+        //要放在插入或者更新之后，才能拿到插入的主键
+        //构造操作日志
+        ActOperationRecordEntity operRecEntity = constructOperRec(groupActInfoEntity.getId(), formDTO);
+        //构造活动内容表
+        List<GroupActContentEntity> contentList = constructText(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getTextList());
+        List<GroupActContentEntity> imgList = constructImg(groupActInfoEntity.getId(), formDTO.getCustomerId(), formDTO.getImgList());
+        List<ActReadRecordEntity> readRecordEntityList=constructReadRec(groupActInfoEntity.getId(),
+                        formDTO.getCustomerId(),
+                        formDTO.getGroupId(),
+                        formDTO.getPublishUserId());
+        //2、插入活动内容
+        contentList.forEach(textContentEntity->{
+            groupActContentDao.insert(textContentEntity);
+        });
+        imgList.forEach(imgContent->{
+            groupActContentDao.insert(imgContent);
+        });
+        //3、插入操作日志
+        actOperationRecordDao.insert(operRecEntity);
+        //4、插入应读记录表
+        readRecordEntityList.forEach(readRecordEntity->{
+            actReadRecordDao.insert(readRecordEntity);
+        });
+
+        result.setGroupActId(groupActInfoEntity.getId());
+        return result;
+    }
+
+    private List<ActReadRecordEntity> constructReadRec(String groupActId, String customerId, String groupId,String publishUserId) {
+        List<ActReadRecordEntity> list=new ArrayList<>();
+        List<ResiGroupMemberDTO> memberDTOList=resiGroupMemberService.getMemberList(groupId);
+        memberDTOList.forEach(memberDTO->{
+            ActReadRecordEntity actReadRecordEntity=new ActReadRecordEntity();
+            actReadRecordEntity.setCustomerId(customerId);
+            actReadRecordEntity.setGroupActId(groupActId);
+            if(publishUserId.equals(memberDTO.getCustomerUserId())){
+                //发布人默认是已读
+                actReadRecordEntity.setRead(GroupActConstant.READ);
+            }else{
+                actReadRecordEntity.setRead(GroupActConstant.UN_READ);
+            }
+            actReadRecordEntity.setUserId(memberDTO.getCustomerUserId());
+            actReadRecordEntity.setShouldBeRead(Constant.YES);
+            list.add(actReadRecordEntity);
+        });
+        return list;
+    }
+
+    private GroupActInfoEntity constructGroupActInfoEntity(PublishGroupActFormDTO formDTO) {
+        GroupActInfoEntity entity = ConvertUtils.sourceToTarget(formDTO, GroupActInfoEntity.class);
+        entity.setId(formDTO.getGroupActId());
+        entity.setAllCategoryName(actCategoryDictService.queryAllCategoryName(formDTO.getCategoryCode(), formDTO.getCustomerId()));
+        String startTimeStr = formDTO.getStartTime().concat(":00");
+        entity.setStartTime(DateUtils.parse(startTimeStr, DateUtils.DATE_TIME_PATTERN));
+
+        if (StringUtils.isNotBlank(formDTO.getGroupActId())) {
+            entity.setStatus(GroupActConstant.CHANGED);
+            entity.setChangedTime(new Date());
+            GroupActInfoEntity orginalEntity=baseDao.selectById(formDTO.getGroupActId());
+            entity.setSignInStartTime(orginalEntity.getSignInStartTime());
+            entity.setSignInEndTime(orginalEntity.getSignInEndTime());
+            entity.setSummaryFlag(orginalEntity.getSummaryFlag());
+            entity.setSignedInNum(orginalEntity.getSignedInNum());
+        } else {
+            //发布新活动
+            entity.setStatus(GroupActConstant.PUBLISHED);
+            entity.setChangedTime(new Date());
+            entity.setSummaryFlag(NumConstant.ZERO);
+            entity.setSignedInNum(NumConstant.ZERO);
+        }
+
+        Result<GridInfoResultDTO> gridInfoRes = govOrgOpenFeignClient.queryGridInfo(formDTO.getGridId());
+        if (!gridInfoRes.success() || null == gridInfoRes.getData()) {
+            throw new RenException("网格信息查询失败,griId="+formDTO.getGridId());
+        }
+        entity.setAgencyId(gridInfoRes.getData().getParentAgencyId());
+        entity.setGridPids(gridInfoRes.getData().getPids());
+        return entity;
+    }
+
+
+    private void checkPublishGroupActFormDTO(PublishGroupActFormDTO formDTO) {
+        //只有组长才能发布、编辑活动
+        ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getLeaderMember(formDTO.getGroupId());
+        if (!formDTO.getPublishUserId().equals(groupMemberDTO.getCustomerUserId())) {
+            throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode(), EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg());
+        }
+        if (StringUtils.isNotBlank(formDTO.getGroupActId())) {
+            //已取消或者已关闭的活动不允许修改
+            GroupActInfoEntity originalAct = baseDao.selectById(formDTO.getGroupActId());
+            if (null == originalAct) {
+                throw new RenException(String.format("活动已删除,group_act_info.id=%s", formDTO.getGroupActId()));
+            }
+            if (GroupActConstant.CANCELED.equals(originalAct.getStatus())) {
+                throw new RenException(EpmetErrorCode.GROUP_ACT_CANCELED_CAN_NOT_EDIT.getCode(), EpmetErrorCode.GROUP_ACT_CANCELED_CAN_NOT_EDIT.getMsg());
+            }
+            if (GroupActConstant.CLOSED.equals(originalAct.getStatus())) {
+                throw new RenException(EpmetErrorCode.GROUP_ACT_CLOSED_CAN_NOT_EDIT.getCode(), EpmetErrorCode.GROUP_ACT_CLOSED_CAN_NOT_EDIT.getMsg());
+            }
+        }
+        //文本内容、图片列表至少选择一个
+        if (CollectionUtils.isEmpty(formDTO.getTextList()) && CollectionUtils.isEmpty(formDTO.getImgList())) {
+            throw new RenException(EpmetErrorCode.PLEASE_INPUT_ACT_CONTENT.getCode(), EpmetErrorCode.PLEASE_INPUT_ACT_CONTENT.getMsg());
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getTextList())) {
+            //活动文本内容，目前只有一段，限制1000字
+            if (formDTO.getTextList().get(NumConstant.ZERO).length() > 1000) {
+                throw new RenException(EpmetErrorCode.GROUP_ACT_CONTENT_MAX.getCode(), EpmetErrorCode.GROUP_ACT_CONTENT_MAX.getMsg());
+            }
+        }
+        if (!CollectionUtils.isEmpty(formDTO.getImgList())) {
+            //最多选择3张图片
+            if (formDTO.getTextList().get(NumConstant.ZERO).length() > NumConstant.THREE) {
+                throw new RenException(EpmetErrorCode.GROUP_ACT_IMG_MAX.getCode(), EpmetErrorCode.GROUP_ACT_IMG_MAX.getMsg());
+            }
+        }
+    }
+
+    /**
+     * @param title    活动标题
+     * @param textList 活动内容列表
+     * @param imgList  活动图片列表
+     * @return void
+     * @author yinzuomei
+     * @description
+     * @Date 2021/4/19 16:39
+     **/
+    private void scanActContent(String title, List<String> textList, List<String> imgList) {
+        //活动标题
+        if (StringUtils.isNotBlank(title)) {
+            //创建话题内容审核
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(title);
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    log.warn(String.format("活动标题审核失败【%s】", title));
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+        //活动内容
+        if (!CollectionUtils.isEmpty(textList)) {
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            textList.forEach(content -> {
+                TextTaskDTO taskDTO = new TextTaskDTO();
+                taskDTO.setContent(content);
+                taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                textScanParamDTO.getTasks().add(taskDTO);
+            });
+            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!textSyncScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!textSyncScanResult.getData().isAllPass()) {
+                    log.warn(String.format("活动内容审核失败【%s】", JSON.toJSONString(textList)));
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode(), EpmetErrorCode.TEXT_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+        //活动图片
+        if (!CollectionUtils.isEmpty(imgList)) {
+            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+            imgList.forEach(url -> {
+                ImgTaskDTO task = new ImgTaskDTO();
+                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                task.setUrl(url);
+                imgScanParamDTO.getTasks().add(task);
+            });
+            Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+            if (!imgScanResult.success()) {
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!imgScanResult.getData().isAllPass()) {
+                    log.warn("活动图片审核失败");
+                    throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode(), EpmetErrorCode.IMG_SCAN_FAILED.getMsg());
+                }
+            }
+        }
+    }
+
+    private ActOperationRecordEntity constructOperRec(String groupActId, PublishGroupActFormDTO formDTO) {
+        ActOperationRecordEntity actOperationRecordEntity = new ActOperationRecordEntity();
+        actOperationRecordEntity.setCustomerId(formDTO.getCustomerId());
+        actOperationRecordEntity.setOperateUserId(formDTO.getPublishUserId());
+        actOperationRecordEntity.setGroupActId(groupActId);
+        actOperationRecordEntity.setOperationType(StringUtils.isNotBlank(formDTO.getGroupActId()) ? GroupActConstant.CHANGE : GroupActConstant.PUBLISH);
+        return actOperationRecordEntity;
+    }
+
+    private List<GroupActContentEntity> constructImg(String groupActId, String customerId, List<String> imgList) {
+        List<GroupActContentEntity> list = new ArrayList<>();
+        int imgSort = NumConstant.ONE;
+        for (String img : imgList) {
+            GroupActContentEntity entity = new GroupActContentEntity();
+            entity.setGroupActId(groupActId);
+            entity.setContent(img);
+            entity.setContentType(GroupActConstant.IMG);
+            entity.setCustomerId(customerId);
+            entity.setSort(imgSort);
+            imgSort++;
+        }
+        return list;
+    }
+
+    private List<GroupActContentEntity> constructText(String groupActId, String customerId, List<String> textList) {
+        List<GroupActContentEntity> list = new ArrayList<>();
+        int textSort = NumConstant.ONE;
+        for (String text : textList) {
+            GroupActContentEntity entity = new GroupActContentEntity();
+            entity.setGroupActId(groupActId);
+            entity.setContent(text);
+            entity.setContentType(GroupActConstant.TEXT);
+            entity.setCustomerId(customerId);
+            entity.setSort(textSort);
+            textSort++;
+        }
+        return list;
+    }
+
+
+    /**
+     * 004、活动详情
+     *
+     * @param actDetailFormDTO
+     * @return com.epmet.resi.group.dto.act.result.ActDetailResultDTO
+     */
+    @Override
+    public ActDetailResultDTO queryActDetail(ActDetailFormDTO actDetailFormDTO) {
+        //todo
+        return null;
+    }
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/GroupActConstant.java

@@ -0,0 +1,36 @@
+package com.epmet.modules.constant;
+
+/**
+ * 描述一下
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/4/19 13:41
+ */
+public interface GroupActConstant {
+    String DEFAULT_CUSTOMER_ID = "default";
+
+    // 活动状态：已发布：published;已取消：canceled；已变更：changed；已关闭：closed
+    String PUBLISHED="published";
+    String CANCELED="canceled";
+    String CHANGED="changed";
+    String CLOSED="closed";
+
+    /**
+     * 操作类型：发布：publish;
+     取消：cancel；
+     变更：change；
+     关闭：close
+     */
+    String PUBLISH="publish";
+    String CANCEL="cancel";
+    String CHANGE="change";
+    String CLOSE="close";
+
+    // 内容类型: 文字：text；图片：img
+    String TEXT="text";
+    String IMG="img";
+
+    // 已读:  read未读：un_read
+    String READ="read";
+    String UN_READ="un_read";
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java

@@ -99,4 +99,13 @@ public interface UserMessageConstant {
      * 原组长下台
      * */
     String ORIGINAL_LEADER_DOWN="您已失去【%s】的组长身份，请查看。";
+
+    /**
+     * 小组通知发布
+     * */
+    String GROUP_NOTICE_ADD = "【%s】发布了%s通知，请查看。";
+    /**
+     * 小组通知变更
+     * */
+    String GROUP_NOTICE_EDIT = "【%s】变更了%s通知，请查看。";
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java

@@ -83,4 +83,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * VISIT_SWITCH 小组是否允许参观:允许：open;不允许：closed
 	 */
 	private String visitSwitch;
+
+	/**
+	 * 小组类型(ordinary:楼院小组  branch:支部小组)
+	 */
+	private String groupType;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -40,6 +40,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -147,6 +148,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private LoginUserUtil loginUserUtil;
 
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
 	@Value("${openapi.scan.server.url}")
 	private String scanApiUrl;
 
@@ -365,6 +369,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+		// 查看是不是支部小组，在查询创建者是不是党员，不是党员就不走下面逻辑了
+		if (applyCreateGroupFormDTO.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)){
+			Result<Boolean> booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(applyCreateGroupFormDTO.getUserId());
+			if (!booleanResult.success()){
+				throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
+			}
+			if (!booleanResult.getData()){
+				throw new RenException(EpmetErrorCode.PARTY_MEMBER_CREATE_BRANCH_GROUP.getCode());
+			}
+		}
 		//1、校验是否同名
 		List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
 		if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
@@ -518,6 +532,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupEntity.setCreatedBy(applyCreateGroupFormDTO.getUserId());
 		resiGroupEntity.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
 		resiGroupEntity.setVisitSwitch(StringUtils.isNotBlank(applyCreateGroupFormDTO.getVisitSwitch()) ? applyCreateGroupFormDTO.getVisitSwitch() : GroupStateConstant.CLOSED);
+		resiGroupEntity.setGroupType(applyCreateGroupFormDTO.getGroupType());
 		return resiGroupEntity;
 	}
 
@@ -787,6 +802,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					groupsInGridResultDTO.setStatus(group.getState());
 					groupsInGridResultDTO.setTotalMember(NumConstant.ZERO);
 					groupsInGridResultDTO.setTotalPartyMember(NumConstant.ZERO);
+					groupsInGridResultDTO.setGroupType(group.getGroupType());
 					resultList.add(groupsInGridResultDTO);
 			} else if(MemberStateConstant.APPROVED.equals(group.getState())) {
 				//缓存中获取组信息
@@ -797,6 +813,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				groupsInGridResultDTO.setStatus(resiGroupInfoRedisDTO.getGroupState());
 				groupsInGridResultDTO.setTotalMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalMembers());
 				groupsInGridResultDTO.setTotalPartyMember(resiGroupInfoRedisDTO.getGroupStatisticalInfo().getTotalPartyMembers());
+				if (StringUtils.isNotEmpty(resiGroupInfoRedisDTO.getGroupType())){
+					groupsInGridResultDTO.setGroupType(resiGroupInfoRedisDTO.getGroupType());
+				}else {
+					ResiGroupDTO resiGroupDTO = get(group.getId());
+					groupsInGridResultDTO.setGroupType(resiGroupDTO.getGroupType());
+				}
 				resultList.add(groupsInGridResultDTO);
 			}
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+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.invitation.service.InvitationRecordService;
+import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
+import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@RestController
+@RequestMapping("invitationrecord")
+public class InvitationRecordController {
+    
+    @Autowired
+    private InvitationRecordService invitationRecordService;
+
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 小组通知、活动分享
+     **/
+    @PostMapping(value = "share")
+    public Result<ShareResultDTO> share(@LoginUser TokenDto tokenDto, @RequestBody ShareFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, ShareFormDTO.Add.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<ShareResultDTO>().ok(invitationRecordService.share(formDTO));
+    }
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/InvitationRecordDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.invitation.entity.InvitationRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface InvitationRecordDao extends BaseDao<InvitationRecordEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/InvitationRecordEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("invitation_record")
+public class InvitationRecordEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 小组所属的网格id
+     */
+	private String gridId;
+
+    /**
+     * 小组id
+     */
+	private String groupId;
+
+    /**
+     * act:活动;notice:通知
+     */
+	private String sourceType;
+
+    /**
+     * 活动id,或者通知id....
+     */
+	private String sourceId;
+
+    /**
+     * 分享人id
+     */
+	private String shareUserId;
+
+    /**
+     * 分享内容
+     */
+	private String inviteContent;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.invitation.entity.InvitationRecordEntity;
+import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
+import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface InvitationRecordService extends BaseService<InvitationRecordEntity> {
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 小组通知、活动分享
+     **/
+    ShareResultDTO share(ShareFormDTO formDTO);
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.invitation.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.modules.act.dao.GroupActInfoDao;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.modules.invitation.dao.InvitationRecordDao;
+import com.epmet.modules.invitation.entity.InvitationRecordEntity;
+import com.epmet.modules.invitation.service.InvitationRecordService;
+import com.epmet.modules.notice.dao.NoticeDao;
+import com.epmet.modules.notice.dao.NoticeReafdRecordDao;
+import com.epmet.modules.notice.entity.NoticeEntity;
+import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
+import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class InvitationRecordServiceImpl extends BaseServiceImpl<InvitationRecordDao, InvitationRecordEntity> implements InvitationRecordService {
+
+    @Autowired
+    private NoticeDao noticeDao;
+    @Autowired
+    private GroupActInfoDao groupActInfoDao;
+
+
+    /**
+     * @param formDTO
+     * @return
+     * @Author sun
+     * @Description 小组通知、活动分享
+     **/
+    @Override
+    public ShareResultDTO share(ShareFormDTO formDTO) {
+        ShareResultDTO resultDTO = new ShareResultDTO();
+        //1.按类型查询通知或活动数据
+        InvitationRecordEntity entity = new InvitationRecordEntity();
+        NoticeEntity notice = null;
+        GroupActInfoEntity act = null;
+        if ("notice".equals(formDTO.getType())) {
+            notice = noticeDao.selectById(formDTO.getId());
+            if (null == notice) {
+                throw new RenException(String.format("通知分享，根据通知Id查询通知数据失败，通知Id->", formDTO.getId()));
+            }
+            entity.setCustomerId(notice.getCustomerId());
+            entity.setGridId(notice.getGridId());
+            entity.setGroupId(notice.getGroupId());
+            entity.setSourceId(formDTO.getId());
+            entity.setSourceType(formDTO.getType());
+            entity.setShareUserId(formDTO.getUserId());
+        } else if ("act".equals(formDTO.getType())) {
+            act = groupActInfoDao.selectById(formDTO.getId());
+            if (null == act) {
+                throw new RenException(String.format("活动分享，根据活动Id查询活动数据失败，活动Id->", formDTO.getId()));
+            }
+            entity.setCustomerId(act.getCustomerId());
+            entity.setGridId(act.getGridId());
+            entity.setGroupId(act.getGroupId());
+            entity.setSourceId(formDTO.getId());
+            entity.setSourceType(formDTO.getType());
+            entity.setShareUserId(formDTO.getUserId());
+        }
+        //2.新增分享数据，生成分享Id
+        baseDao.insert(entity);
+        resultDTO.setInvitationRecordId(entity.getId());
+
+        return resultDTO;
+    }
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@@ -144,4 +144,19 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Date 2021/4/6 12:50
 	 **/
     List<ResiGroupMemberDTO> queryMemberRemovedRecs(@Param("groupId")String groupId, @Param("userId")String userId);
+
+	/**
+	 * @Description  查询组内有效人员列表
+	 * @author sun
+	 */
+	List<ResiGroupMemberDTO> getMemberList(@Param("groupId") String groupId);
+
+    /**
+     * @return java.lang.Integer
+     * @param groupId
+     * @author yinzuomei
+     * @description 查询组内成员总数
+     * @Date 2021/4/19 13:54
+     **/
+	Integer selectCountMember(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java

@@ -225,4 +225,31 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
      * @Date 2021/4/6 12:48
      **/
     List<ResiGroupMemberDTO> queryMemberRemovedRecs(String groupId, String userId);
+
+    /**
+     * @return java.lang.Integer
+     * @param groupId
+     * @author yinzuomei
+     * @description 查询组内成员总数
+     * @Date 2021/4/19 13:53
+     **/
+    Integer selectCountMember(String groupId);
+
+    /**
+     * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+     * @param groupId
+     * @author yinzuomei
+     * @description 获取组长信息
+     * @Date 2021/4/19 19:14
+     **/
+    ResiGroupMemberDTO getLeaderMember(String groupId);
+
+    /**
+     * @return java.util.List<com.epmet.resi.group.dto.member.ResiGroupMemberDTO>
+     * @param groupId
+     * @author yinzuomei
+     * @description 查询组内有效人员列表
+     * @Date 2021/4/19 19:14
+     **/
+    List<ResiGroupMemberDTO> getMemberList(String groupId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -339,6 +339,28 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		return baseDao.queryMemberRemovedRecs(groupId,userId);
 	}
 
+	/**
+	 * @param groupId
+	 * @return java.lang.Integer
+	 * @author yinzuomei
+	 * @description 查询组内成员总数
+	 * @Date 2021/4/19 13:53
+	 **/
+	@Override
+	public Integer selectCountMember(String groupId) {
+		return baseDao.selectCountMember(groupId);
+	}
+
+	@Override
+	public ResiGroupMemberDTO getLeaderMember(String groupId) {
+		return baseDao.selectLeaderMember(groupId);
+	}
+
+	@Override
+	public List<ResiGroupMemberDTO> getMemberList(String groupId) {
+		return baseDao.getMemberList(groupId);
+	}
+
 	/**
 	 * @param groupMemberListFormDTO
 	 * @return com.epmet.commons.tools.utils.Result