From 78dc00de477ec9681dc10f85d43c1da08e7d0bea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 16 Apr 2021 18:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=9D=E5=A7=8B=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../group/dto/act/ActCategoryDictDTO.java | 102 ++++++++++
.../resi/group/dto/act/ActCommentDTO.java} | 27 ++-
.../group/dto/act/ActOperationRecordDTO.java | 99 ++++++++++
.../resi/group/dto/act/ActReadRecordDTO.java | 96 +++++++++
.../resi/group/dto/act/ActSiginInCodeDTO.java | 86 ++++++++
.../group/dto/act/ActSiginInRecordDTO.java | 102 ++++++++++
.../group/dto/act/ActSummaryContentDTO.java | 96 +++++++++
.../resi/group/dto/act/ActSummaryDTO.java | 101 ++++++++++
.../group/dto/act/GroupActContentDTO.java | 96 +++++++++
.../resi/group/dto/act/GroupActInfoDTO.java | 187 ++++++++++++++++++
.../dto/invitation/InvitationRecordDTO.java | 107 ++++++++++
.../controller/ActCategoryDictController.java | 40 ++++
.../act/controller/ActCommentController.java | 40 ++++
.../ActSiginInRecordController.java | 39 ++++
.../act/controller/ActSummaryController.java | 40 ++++
.../controller/GroupActInfoController.java | 39 ++++
.../modules/act/dao/ActCategoryDictDao.java} | 10 +-
.../epmet/modules/act/dao/ActCommentDao.java | 33 ++++
.../act/dao/ActOperationRecordDao.java | 33 ++++
.../modules/act/dao/ActReadRecordDao.java | 33 ++++
.../modules/act/dao/ActSiginInCodeDao.java | 33 ++++
.../modules/act/dao/ActSiginInRecordDao.java | 33 ++++
.../modules/act/dao/ActSummaryContentDao.java | 33 ++++
.../epmet/modules/act/dao/ActSummaryDao.java | 33 ++++
.../modules/act/dao/GroupActContentDao.java | 33 ++++
.../modules/act/dao/GroupActInfoDao.java | 33 ++++
.../act/entity/ActCategoryDictEntity.java | 68 +++++++
.../modules/act/entity/ActCommentEntity.java} | 22 +--
.../act/entity/ActOperationRecordEntity.java | 66 +++++++
.../act/entity/ActReadRecordEntity.java | 63 ++++++
.../act/entity/ActSiginInCodeEntity.java | 53 +++++
.../act/entity/ActSiginInRecordEntity.java | 70 +++++++
.../act/entity/ActSummaryContentEntity.java | 63 ++++++
.../modules/act/entity/ActSummaryEntity.java | 68 +++++++
.../act/entity/GroupActContentEntity.java | 63 ++++++
.../act/entity/GroupActInfoEntity.java | 156 +++++++++++++++
.../act/service/ActCategoryDictService.java | 31 +++
.../act/service/ActCommentService.java | 31 +++
.../service/ActOperationRecordService.java | 31 +++
.../act/service/ActReadRecordService.java | 31 +++
.../act/service/ActSiginInCodeService.java | 31 +++
.../act/service/ActSiginInRecordService.java | 31 +++
.../act/service/ActSummaryContentService.java | 31 +++
.../act/service/ActSummaryService.java | 30 +++
.../act/service/GroupActContentService.java | 31 +++
.../act/service/GroupActInfoService.java | 31 +++
.../impl/ActCategoryDictServiceImpl.java | 36 ++++
.../service/impl/ActCommentServiceImpl.java | 36 ++++
.../impl/ActOperationRecordServiceImpl.java | 36 ++++
.../impl/ActReadRecordServiceImpl.java | 36 ++++
.../impl/ActSiginInCodeServiceImpl.java | 36 ++++
.../impl/ActSiginInRecordServiceImpl.java | 36 ++++
.../impl/ActSummaryContentServiceImpl.java | 36 ++++
.../service/impl/ActSummaryServiceImpl.java | 35 ++++
.../impl/GroupActContentServiceImpl.java | 36 ++++
.../service/impl/GroupActInfoServiceImpl.java | 36 ++++
.../InvitationRecordController.java | 40 ++++
.../invitation/dao/InvitationRecordDao.java | 33 ++++
.../entity/InvitationRecordEntity.java | 73 +++++++
.../service/InvitationRecordService.java | 31 +++
.../impl/InvitationRecordServiceImpl.java | 36 ++++
.../mapper/act/ActCategoryDictDao.xml} | 4 +-
.../resources/mapper/act/ActCommentDao.xml | 8 +
.../mapper/act/ActOperationRecordDao.xml | 8 +
.../resources/mapper/act/ActReadRecordDao.xml | 8 +
.../mapper/act/ActSiginInCodeDao.xml | 8 +
.../mapper/act/ActSiginInRecordDao.xml | 8 +
.../mapper/act/ActSummaryContentDao.xml | 8 +
.../resources/mapper/act/ActSummaryDao.xml | 8 +
.../mapper/act/GroupActContentDao.xml | 8 +
.../resources/mapper/act/GroupActInfoDao.xml | 8 +
.../mapper/invitation/InvitationRecordDao.xml | 8 +
72 files changed, 3230 insertions(+), 31 deletions(-)
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java
rename epmet-module/{data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java => resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java} (79%)
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInCodeDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInRecordDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryContentDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/InvitationRecordDTO.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCategoryDictController.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSiginInRecordController.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
rename epmet-module/{data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/EnterGroupSwitchDao.java => resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCategoryDictDao.java} (79%)
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActOperationRecordDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActReadRecordDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInCodeDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInRecordDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryContentDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActContentDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCategoryDictEntity.java
rename epmet-module/{data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/EnterGroupSwitchEntity.java => resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentEntity.java} (77%)
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActOperationRecordEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInCodeEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInRecordEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryContentEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActContentEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActInfoEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCategoryDictService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActOperationRecordService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActReadRecordService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInCodeService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInRecordService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryContentService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActContentService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActOperationRecordServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActReadRecordServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInCodeServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInRecordServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryContentServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActContentServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/InvitationRecordDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/InvitationRecordEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java
rename epmet-module/{data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/EnterGroupSwitchDao.xml => resi-group/resi-group-server/src/main/resources/mapper/act/ActCategoryDictDao.xml} (63%)
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActOperationRecordDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActReadRecordDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInCodeDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInRecordDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryContentDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActContentDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/InvitationRecordDao.xml
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCategoryDictDTO.java
new file mode 100644
index 0000000000..b8890d4368
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java
similarity index 79%
rename from epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java
rename to epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActCommentDTO.java
index 3cd065cf39..fec7eb8808 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/EnterGroupSwitchDTO.java
+++ b/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 .
*/
-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;
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActOperationRecordDTO.java
new file mode 100644
index 0000000000..08c8a4a729
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java
new file mode 100644
index 0000000000..78bbec055c
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInCodeDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInCodeDTO.java
new file mode 100644
index 0000000000..7d42b43e65
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInCodeDTO.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 ActSiginInCodeDTO 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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInRecordDTO.java
new file mode 100644
index 0000000000..7e002c177f
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInRecordDTO.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 ActSiginInRecordDTO 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 siginUserId;
+
+ /**
+ * 签到地点
+ */
+ private String siginInAddress;
+
+ /**
+ * 签到地点-经度
+ */
+ private BigDecimal longitude;
+
+ /**
+ * 签到地点-纬度
+ */
+ private BigDecimal latitude;
+
+ /**
+ * 逻辑删除标识
+ */
+ private String delFlag;
+
+ /**
+ * 乐观锁
+ */
+ private Integer revision;
+
+ /**
+ * 创建人
+ */
+ private String createdBy;
+
+ /**
+ * 创建时间
+ */
+ private Date createdTime;
+
+ /**
+ * 更新人
+ */
+ private String updatedBy;
+
+ /**
+ * 更新时间
+ */
+ private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryContentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryContentDTO.java
new file mode 100644
index 0000000000..eca0cc8fc2
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java
new file mode 100644
index 0000000000..60d56e9ee8
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 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 siginInNum;
+
+ /**
+ * 已签到人员姓名列表、分隔
+ */
+ 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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActContentDTO.java
new file mode 100644
index 0000000000..65ce8cf5e8
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java
new file mode 100644
index 0000000000..f34bc37bc3
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.resi.group.dto.act;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 组织活动信息
+ *
+ * @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 siginInStartTime;
+
+ /**
+ * 签到截止时间
+ */
+ private Date siginInEndTime;
+
+ /**
+ * 是否填写总结？1：已填写；0：未填写
+ */
+ private Integer summaryFlag;
+
+ /**
+ * 已签到人数（有人签到自动+1）
+ */
+ private Integer siginedInNum;
+
+ /**
+ * 取消时间
+ */
+ private Date canceldTime;
+
+ /**
+ * 关闭时间
+ */
+ 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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/InvitationRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/InvitationRecordDTO.java
new file mode 100644
index 0000000000..754fb585bd
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCategoryDictController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCategoryDictController.java
new file mode 100644
index 0000000000..b7d4908d91
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCategoryDictController.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.modules.act.service.ActCategoryDictService;
+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("actdict")
+public class ActCategoryDictController {
+
+ @Autowired
+ private ActCategoryDictService actCategoryDictService;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActCommentController.java
new file mode 100644
index 0000000000..331cf578ce
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSiginInRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSiginInRecordController.java
new file mode 100644
index 0000000000..40234f9352
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSiginInRecordController.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.modules.act.service.ActSiginInRecordService;
+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("actsigin")
+public class ActSiginInRecordController {
+
+ @Autowired
+ private ActSiginInRecordService actSiginInRecordService;
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSummaryController.java
new file mode 100644
index 0000000000..c9a9568799
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
new file mode 100644
index 0000000000..dfd248aad9
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/GroupActInfoController.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.controller;
+
+import com.epmet.modules.act.service.GroupActInfoService;
+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("act")
+public class GroupActInfoController {
+
+ @Autowired
+ private GroupActInfoService groupActInfoService;
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/EnterGroupSwitchDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCategoryDictDao.java
similarity index 79%
rename from epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/EnterGroupSwitchDao.java
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCategoryDictDao.java
index fa28a17e4a..953256d85c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resigroup/EnterGroupSwitchDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCategoryDictDao.java
@@ -15,19 +15,19 @@
* along with this program. If not, see .
*/
-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.ActCategoryDictEntity;
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 {
+public interface ActCategoryDictDao extends BaseDao {
}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentDao.java
new file mode 100644
index 0000000000..93a72a4913
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActCommentDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActCommentEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 活动评论表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActCommentDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActOperationRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActOperationRecordDao.java
new file mode 100644
index 0000000000..aa37d62b60
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActReadRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActReadRecordDao.java
new file mode 100644
index 0000000000..7627bf30d3
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActReadRecordDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInCodeDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInCodeDao.java
new file mode 100644
index 0000000000..e588c7be80
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInCodeDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActSiginInCodeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActSiginInCodeDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInRecordDao.java
new file mode 100644
index 0000000000..8ebfa22ce2
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInRecordDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.act.entity.ActSiginInRecordEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface ActSiginInRecordDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryContentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryContentDao.java
new file mode 100644
index 0000000000..146c31c225
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSummaryDao.java
new file mode 100644
index 0000000000..315c124d3f
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActContentDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActContentDao.java
new file mode 100644
index 0000000000..7f3b3129ee
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActContentDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+/**
+ * 组织活动内容
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Mapper
+public interface GroupActContentDao extends BaseDao {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActInfoDao.java
new file mode 100644
index 0000000000..85f243e608
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCategoryDictEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCategoryDictEntity.java
new file mode 100644
index 0000000000..5fff3d4a4a
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/EnterGroupSwitchEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentEntity.java
similarity index 77%
rename from epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/EnterGroupSwitchEntity.java
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActCommentEntity.java
index 998b777710..3871eaa1a1 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/resigroup/EnterGroupSwitchEntity.java
+++ b/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 .
*/
-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;
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActOperationRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActOperationRecordEntity.java
new file mode 100644
index 0000000000..ae49d5bbf1
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java
new file mode 100644
index 0000000000..ad7809400d
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInCodeEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInCodeEntity.java
new file mode 100644
index 0000000000..154e7a2f31
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInCodeEntity.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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_sigin_in_code")
+public class ActSiginInCodeEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * group_act_info.id
+ */
+ private String groupActId;
+
+ /**
+ * 签到码url
+ */
+ private String url;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInRecordEntity.java
new file mode 100644
index 0000000000..251f5ca3a9
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInRecordEntity.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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_sigin_in_record")
+public class ActSiginInRecordEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 客户id
+ */
+ private String customerId;
+
+ /**
+ * group_act_info.id
+ */
+ private String groupActId;
+
+ /**
+ * 签到用户id
+ */
+ private String siginUserId;
+
+ /**
+ * 签到地点
+ */
+ private String siginInAddress;
+
+ /**
+ * 签到地点-经度
+ */
+ private BigDecimal longitude;
+
+ /**
+ * 签到地点-纬度
+ */
+ private BigDecimal latitude;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryContentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryContentEntity.java
new file mode 100644
index 0000000000..74855472f6
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryEntity.java
new file mode 100644
index 0000000000..5fb0c98015
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 siginInNum;
+
+ /**
+ * 已签到人员姓名列表、分隔
+ */
+ private String signedInUsers;
+
+ /**
+ * 填写总结的人
+ */
+ private String userId;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActContentEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActContentEntity.java
new file mode 100644
index 0000000000..9a43b20cea
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActInfoEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActInfoEntity.java
new file mode 100644
index 0000000000..8edbccd090
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 siginInStartTime;
+
+ /**
+ * 签到截止时间
+ */
+ private Date siginInEndTime;
+
+ /**
+ * 是否填写总结？1：已填写；0：未填写
+ */
+ private Integer summaryFlag;
+
+ /**
+ * 已签到人数（有人签到自动+1）
+ */
+ private Integer siginedInNum;
+
+ /**
+ * 取消时间
+ */
+ private Date canceldTime;
+
+ /**
+ * 关闭时间
+ */
+ private Date closedTime;
+
+ /**
+ * 活动发布人用户id
+ */
+ private String publishUserId;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCategoryDictService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCategoryDictService.java
new file mode 100644
index 0000000000..5531847600
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCategoryDictService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActCategoryDictEntity;
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActCategoryDictService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActCommentService.java
new file mode 100644
index 0000000000..e8da2bae21
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActOperationRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActOperationRecordService.java
new file mode 100644
index 0000000000..dc2303e2f7
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActReadRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActReadRecordService.java
new file mode 100644
index 0000000000..71bdc78d93
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInCodeService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInCodeService.java
new file mode 100644
index 0000000000..99d562ee52
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInCodeService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActSiginInCodeEntity;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActSiginInCodeService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInRecordService.java
new file mode 100644
index 0000000000..b3d9c81bd6
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInRecordService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.ActSiginInRecordEntity;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface ActSiginInRecordService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryContentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryContentService.java
new file mode 100644
index 0000000000..e23ce2919b
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSummaryService.java
new file mode 100644
index 0000000000..d3c987bed7
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActContentService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActContentService.java
new file mode 100644
index 0000000000..7d45bd0871
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
new file mode 100644
index 0000000000..1a13bac8e8
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/GroupActInfoService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface GroupActInfoService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java
new file mode 100644
index 0000000000..0234447876
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCategoryDictServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActCategoryDictDao;
+import com.epmet.modules.act.entity.ActCategoryDictEntity;
+import com.epmet.modules.act.service.ActCategoryDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动类别字典
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActCategoryDictServiceImpl extends BaseServiceImpl implements ActCategoryDictService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActCommentServiceImpl.java
new file mode 100644
index 0000000000..6f4ea05296
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 implements ActCommentService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActOperationRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActOperationRecordServiceImpl.java
new file mode 100644
index 0000000000..3809653dc5
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 implements ActOperationRecordService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActReadRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActReadRecordServiceImpl.java
new file mode 100644
index 0000000000..e264402251
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 implements ActReadRecordService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInCodeServiceImpl.java
new file mode 100644
index 0000000000..632f271ed3
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInCodeServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActSiginInCodeDao;
+import com.epmet.modules.act.entity.ActSiginInCodeEntity;
+import com.epmet.modules.act.service.ActSiginInCodeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织活动签到码
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActSiginInCodeServiceImpl extends BaseServiceImpl implements ActSiginInCodeService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInRecordServiceImpl.java
new file mode 100644
index 0000000000..7daa9ce36e
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInRecordServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.ActSiginInRecordDao;
+import com.epmet.modules.act.entity.ActSiginInRecordEntity;
+import com.epmet.modules.act.service.ActSiginInRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织活动签到记录
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class ActSiginInRecordServiceImpl extends BaseServiceImpl implements ActSiginInRecordService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryContentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryContentServiceImpl.java
new file mode 100644
index 0000000000..df7187c1c7
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 implements ActSummaryContentService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSummaryServiceImpl.java
new file mode 100644
index 0000000000..6cd4a741d8
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 implements ActSummaryService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActContentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActContentServiceImpl.java
new file mode 100644
index 0000000000..2d22dc91d8
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 implements GroupActContentService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
new file mode 100644
index 0000000000..12b2186419
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.act.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.act.dao.GroupActInfoDao;
+import com.epmet.modules.act.entity.GroupActInfoEntity;
+import com.epmet.modules.act.service.GroupActInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织活动信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class GroupActInfoServiceImpl extends BaseServiceImpl implements GroupActInfoService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
new file mode 100644
index 0000000000..71e713a734
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/InvitationRecordController.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.invitation.controller;
+
+import com.epmet.modules.invitation.service.InvitationRecordService;
+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("invitationrecord")
+public class InvitationRecordController {
+
+ @Autowired
+ private InvitationRecordService invitationRecordService;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/InvitationRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/InvitationRecordDao.java
new file mode 100644
index 0000000000..607c4820f9
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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 {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/InvitationRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/InvitationRecordEntity.java
new file mode 100644
index 0000000000..d13568a121
--- /dev/null
+++ b/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
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java
new file mode 100644
index 0000000000..ebddafaa7f
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/InvitationRecordService.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.invitation.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.invitation.entity.InvitationRecordEntity;
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+public interface InvitationRecordService extends BaseService {
+
+}
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java
new file mode 100644
index 0000000000..4d873bba21
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.modules.invitation.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.invitation.dao.InvitationRecordDao;
+import com.epmet.modules.invitation.entity.InvitationRecordEntity;
+import com.epmet.modules.invitation.service.InvitationRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 分享记录(话题、通知...后续支持增加)
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-16
+ */
+@Service
+public class InvitationRecordServiceImpl extends BaseServiceImpl implements InvitationRecordService {
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/EnterGroupSwitchDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCategoryDictDao.xml
similarity index 63%
rename from epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/EnterGroupSwitchDao.xml
rename to epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCategoryDictDao.xml
index cdb6940650..66391dd3a9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resigroup/EnterGroupSwitchDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCategoryDictDao.xml
@@ -1,6 +1,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentDao.xml
new file mode 100644
index 0000000000..e04b803f59
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActCommentDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActOperationRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActOperationRecordDao.xml
new file mode 100644
index 0000000000..aa2a3e7679
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActOperationRecordDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActReadRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActReadRecordDao.xml
new file mode 100644
index 0000000000..2410bc9793
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActReadRecordDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInCodeDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInCodeDao.xml
new file mode 100644
index 0000000000..c536ac8cbd
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInCodeDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInRecordDao.xml
new file mode 100644
index 0000000000..0e985b9970
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInRecordDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryContentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryContentDao.xml
new file mode 100644
index 0000000000..1ec609cbdb
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryContentDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryDao.xml
new file mode 100644
index 0000000000..936bc6df1b
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSummaryDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActContentDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActContentDao.xml
new file mode 100644
index 0000000000..ccb7d49437
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActContentDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
new file mode 100644
index 0000000000..70b86b20e5
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/GroupActInfoDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/InvitationRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/InvitationRecordDao.xml
new file mode 100644
index 0000000000..00ed2225bb
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/InvitationRecordDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file