From 1be49682d55ea2c4bfdeec9a757b381036cca2ff Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Sun, 29 Mar 2020 21:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0group=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3,=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84?=
=?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/epmet/dto/form/MymessageFormDTO.java | 43 +++
.../epmet/dto/result/MymessageResultDTO.java | 36 +++
.../constant/EnterGroupTypeConstant.java | 19 ++
.../group/constant/GroupStateConstant.java | 44 +++
.../group/constant/MemberStateConstant.java | 39 +++
.../resi/group/dto/group/ResiGroupDTO.java | 107 +++++++
.../dto/group/ResiGroupOperationDTO.java | 86 ++++++
.../group/form/ApplyCreateGroupFormDTO.java | 52 ++++
.../dto/group/form/ApplyJoinGroupFormDTO.java | 34 +++
.../group/dto/group/form/CreatedFormDTO.java | 46 +++
.../dto/group/form/GroupSummarizeFormDTO.java | 27 ++
.../dto/group/form/ModifyGroupFormDTO.java | 43 +++
.../group/dto/group/form/MyGroupFormDTO.java | 46 +++
.../dto/group/form/RecommendGroupFormDTO.java | 46 +++
.../dto/group/result/CreatedResultDTO.java | 44 +++
.../group/result/GroupSummarizeResultDTO.java | 60 ++++
.../dto/group/result/LatestTopicDTO.java | 24 ++
.../dto/group/result/MyGroupResultDTO.java | 55 ++++
.../group/result/RecommendGroupResultDTO.java | 41 +++
.../dto/member/GroupMemeberOperationDTO.java | 109 +++++++
.../group/dto/member/ResiGroupMemberDTO.java | 101 +++++++
.../group/controller/ResiGroupController.java | 164 ++++++++++
.../epmet/modules/group/dao/ResiGroupDao.java | 90 ++++++
.../group/dao/ResiGroupOperationDao.java | 33 +++
.../modules/group/entity/ResiGroupEntity.java | 77 +++++
.../entity/ResiGroupOperationEntity.java | 56 ++++
.../group/redis/ResiGroupOperationRedis.java | 47 +++
.../modules/group/redis/ResiGroupRedis.java | 47 +++
.../service/ResiGroupOperationService.java | 95 ++++++
.../group/service/ResiGroupService.java | 165 +++++++++++
.../epmet/modules/group/service/impl/.gitkeep | 0
.../impl/ResiGroupOperationServiceImpl.java | 104 +++++++
.../service/impl/ResiGroupServiceImpl.java | 280 ++++++++++++++++++
.../modules/invitation/controller}/.gitkeep | 0
.../epmet/modules/invitation/dao}/.gitkeep | 0
.../controller => invitation/entity}/.gitkeep | 0
.../{group/dao => invitation/excel}/.gitkeep | 0
.../service/impl}/.gitkeep | 0
.../epmet/modules/member/controller/.gitkeep | 0
.../controller/ResiGroupMemberController.java | 34 +++
.../com/epmet/modules/member/dao/.gitkeep | 0
.../member/dao/GroupMemeberOperationDao.java | 33 +++
.../member/dao/ResiGroupMemberDao.java | 33 +++
.../com/epmet/modules/member/entity/.gitkeep | 0
.../entity/GroupMemeberOperationEntity.java | 79 +++++
.../member/entity/ResiGroupMemberEntity.java | 71 +++++
.../com/epmet/modules/member/excel/.gitkeep | 0
.../redis/GroupMemeberOperationRedis.java | 47 +++
.../member/redis/ResiGroupMemberRedis.java | 47 +++
.../service/GroupMemeberOperationService.java | 95 ++++++
.../service/ResiGroupMemberService.java | 105 +++++++
.../modules/member/service/impl/.gitkeep | 0
.../GroupMemeberOperationServiceImpl.java | 104 +++++++
.../impl/ResiGroupMemberServiceImpl.java | 124 ++++++++
.../epmet/modules/utils/ModuleConstant.java | 33 +++
.../src/main/resources/mapper/group/.gitkeep | 0
.../resources/mapper/group/ResiGroupDao.xml | 160 ++++++++++
.../mapper/group/ResiGroupOperationDao.xml | 8 +
.../src/main/resources/mapper/member/.gitkeep | 0
.../member/GroupMemeberOperationDao.xml | 8 +
.../mapper/member/ResiGroupMemberDao.xml | 7 +
.../java/com/epmet/resi/mine/dto}/.gitkeep | 0
.../com/epmet/resi/mine/dto/form/.gitkeep | 0
.../com/epmet/resi/mine/dto/result/.gitkeep | 0
.../resi-mine/resi-mine-server/pom.xml | 12 +
.../src/main/java/com/epmet/dao/.gitkeep | 0
.../src/main/java/com/epmet/entity/.gitkeep | 0
.../src/main/java/com/epmet/excel/.gitkeep | 0
.../exception/ModuleErrorCode.java | 2 +-
.../feign/EpmetUserFeignClient.java | 4 +-
.../EpmetUserFeignClientFallBack.java | 4 +-
.../controller/ResiMineGridController.java | 4 +-
.../grid}/service/ResiMineGridService.java | 2 +-
.../service/impl/ResiMineGridServiceImpl.java | 8 +-
.../controller/UserMessageController.java | 69 +++++
.../message/service/UserMessageService.java | 9 +
.../service/impl/UserMessageServiceImpl.java | 13 +
.../{ => modules}/utils/ModuleConstant.java | 2 +-
.../src/main/resources/logback-spring.xml | 5 +-
79 files changed, 3366 insertions(+), 16 deletions(-)
create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/MymessageFormDTO.java
create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/EnterGroupTypeConstant.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/MemberStateConstant.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupOperationDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyJoinGroupFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/CreatedFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupSummarizeFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ModifyGroupFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/MyGroupFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/RecommendGroupFormDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/CreatedResultDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupSummarizeResultDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/LatestTopicDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/MyGroupResultDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/GroupMemeberOperationDTO.java
create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/ResiGroupMemberDTO.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupOperationDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupOperationEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupOperationRedis.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupRedis.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupOperationService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
rename epmet-module/resi-group/{resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form => resi-group-server/src/main/java/com/epmet/modules/invitation/controller}/.gitkeep (100%)
rename epmet-module/resi-group/{resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result => resi-group-server/src/main/java/com/epmet/modules/invitation/dao}/.gitkeep (100%)
rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/{group/controller => invitation/entity}/.gitkeep (100%)
rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/{group/dao => invitation/excel}/.gitkeep (100%)
rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/{group/entity => invitation/service/impl}/.gitkeep (100%)
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/ResiGroupMemberEntity.java
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/excel/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/GroupMemeberOperationRedis.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupOperationDao.xml
delete mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/.gitkeep
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml
create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
rename epmet-module/{resi-group/resi-group-server/src/main/java/com/epmet/modules/group/excel => resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto}/.gitkeep (100%)
delete mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep
delete mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep
delete mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep
delete mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep
delete mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules}/exception/ModuleErrorCode.java (92%)
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules}/feign/EpmetUserFeignClient.java (90%)
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules}/feign/fallback/EpmetUserFeignClientFallBack.java (90%)
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules/grid}/controller/ResiMineGridController.java (91%)
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules/grid}/service/ResiMineGridService.java (93%)
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules/grid}/service/impl/ResiMineGridServiceImpl.java (86%)
create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java
create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java
rename epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/{ => modules}/utils/ModuleConstant.java (94%)
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/MymessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/MymessageFormDTO.java
new file mode 100644
index 0000000000..5824b72884
--- /dev/null
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/MymessageFormDTO.java
@@ -0,0 +1,43 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 我的消息查询入参
+ * @Author yinzuomei
+ * @Date 2020/3/29 20:54
+ */
+@Data
+public class MymessageFormDTO implements Serializable {
+ private static final long serialVersionUID = -3043120833439129619L;
+
+ @NotBlank(message="当前用户id为空")
+ private String userId;
+
+ /**
+ * 用户当前访问的网格对应的客户id
+ */
+ @NotBlank(message="客户id不能为空")
+ private String customerId;
+
+ /**
+ * 用户当前访问的网格
+ */
+ @NotBlank(message="网格id不能为空")
+ private String gridId;
+
+ /**
+ * 页码
+ */
+ @Min(1)
+ private Integer pageNo;
+
+ /**
+ * 每页显示条数
+ */
+ private Integer pageSize = 20;
+}
diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java
new file mode 100644
index 0000000000..6e0d415251
--- /dev/null
+++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/MymessageResultDTO.java
@@ -0,0 +1,36 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 我的消息查询返参
+ * @Author yinzuomei
+ * @Date 2020/3/29 20:59
+ */
+@Data
+public class MymessageResultDTO implements Serializable {
+ private static final long serialVersionUID = 6856602932571839314L;
+
+ /**
+ * 消息主键
+ */
+ private String messageId;
+
+ /**
+ * 消息标题
+ */
+ private String messageTitle;
+
+ /**
+ * 消息内容
+ */
+ private String readFlag;
+
+ /**
+ * 发布消息时间
+ */
+ private Date noticeTime;
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/EnterGroupTypeConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/EnterGroupTypeConstant.java
new file mode 100644
index 0000000000..835cce231d
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/EnterGroupTypeConstant.java
@@ -0,0 +1,19 @@
+package com.epmet.resi.group.constant;
+
+/**
+ * @Description 入群方式
+ * @Author yinzuomei
+ * @Date 2020/3/29 20:23
+ */
+public interface EnterGroupTypeConstant {
+
+ /**
+ * 入群方式：（受邀请入群 - invited 、 主动加入 - join）
+ */
+ String INVITED = "invited";
+
+ /**
+ * 入群方式：（受邀请入群 - invited 、 主动加入 - join）
+ */
+ String JOIN = "join";
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java
new file mode 100644
index 0000000000..fcb2afc28f
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/GroupStateConstant.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.resi.group.constant;
+
+
+/**
+ * 群组状态常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface GroupStateConstant {
+
+ /**
+ * 群审核通过 - approved
+ */
+ String GROUP_APPROVED = "approved";
+
+ /**
+ * 群审核中 - under_auditting
+ */
+ String GROUP_UNDER_AUDITTING = "under_auditting";
+
+ /**
+ * 群审核未通过 - rejected
+ */
+ String GROUP_REJECTED = "rejected";
+
+ /**
+ * 群已屏蔽 - hidden
+ */
+ String GROUP_HIDDEN = "hidden";
+
+ /**
+ * 群已关闭 - closed
+ */
+ String GROUP_CLOSED = "closed";
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/MemberStateConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/MemberStateConstant.java
new file mode 100644
index 0000000000..00c89d92a3
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/MemberStateConstant.java
@@ -0,0 +1,39 @@
+package com.epmet.resi.group.constant;
+
+/**
+ * 成员状态常量
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+public interface MemberStateConstant {
+ /**
+ * 审核中 - under_auditting、
+ */
+ String UNDER_AUDITTING = "under_auditting";
+
+ /**
+ * 审核通过 - approved、
+ */
+ String APPROVED = "approved";
+
+ /**
+ * 入群被拒 - rejected 、
+ */
+ String REJECTED = "rejected";
+
+ /**
+ * 已禁言 - silent、
+ */
+ String SILENT = "silent";
+
+ /**
+ * 取消禁言-cancel_silent resi_group_member中status置为approved
+ */
+ String CANCEL_SILENT = "cancel_silent";
+
+ /**
+ * 被移出群 - removed 修改resi_group_member表del_flag=1
+ */
+ String REMOVED = "removed";
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java
new file mode 100644
index 0000000000..9045ac28ea
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.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
+ * 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
+ * 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
+ * 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
+ * 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 >
+ * @Author yinzuomei
+ * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
+ * @Date 2020/3/28 20:36
+ **/
+ @PostMapping("getmygroup")
+ public Result> getMyGroup(@LoginUser TokenDto tokenDto, @RequestBody MyGroupFormDTO myGroupFormDTO) {
+ myGroupFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(myGroupFormDTO);
+ return resiGroupService.getMyGroup(myGroupFormDTO);
+ }
+
+ /**
+ * @param tokenDto
+ * @param recommendGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 推荐组列表查询
+ * @Date 2020/3/28 19:52
+ **/
+ @PostMapping("getrecommendgroup")
+ public Result> getRecommendGroup(@LoginUser TokenDto tokenDto,
+ @RequestBody RecommendGroupFormDTO recommendGroupFormDTO) {
+ recommendGroupFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(recommendGroupFormDTO);
+ return resiGroupService.getRecommendGroup(recommendGroupFormDTO);
+ }
+
+ /**
+ * @param tokenDto
+ * @param createdFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 我创建的小组
+ * @Date 2020/3/28 21:59
+ **/
+ @PostMapping("getcreated")
+ public Result> getCreated(@LoginUser TokenDto tokenDto,
+ @RequestBody CreatedFormDTO createdFormDTO) {
+ createdFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(createdFormDTO);
+ return resiGroupService.getCreated(createdFormDTO);
+ }
+
+ /**
+ * @param tokenDto
+ * @param modifyGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 修改组信息
+ * @Date 2020/3/28 22:20
+ **/
+ @PostMapping("modifygroup")
+ public Result modifyGroup(@LoginUser TokenDto tokenDto, @RequestBody ModifyGroupFormDTO modifyGroupFormDTO) {
+ modifyGroupFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(modifyGroupFormDTO);
+ return resiGroupService.modifyGroup(modifyGroupFormDTO);
+ }
+
+ /**
+ * @param tokenDto
+ * @param groupSummarizeFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 查看小组管理界面信息
+ * @Date 2020/3/29 17:32
+ **/
+ @PostMapping("getgroupsummarize")
+ public Result getGroupSummarize(@LoginUser TokenDto tokenDto,
+ @RequestBody GroupSummarizeFormDTO groupSummarizeFormDTO) {
+ groupSummarizeFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(groupSummarizeFormDTO);
+ return resiGroupService.getGroupSummarize(groupSummarizeFormDTO);
+ }
+
+ /**
+ * @param tokenDto
+ * @param applyCreateGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 创建小组
+ * @Date 2020/3/29 19:26
+ **/
+ @PostMapping("applycreategroup")
+ public Result applyCreateGroup(@LoginUser TokenDto tokenDto,
+ @RequestBody ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+ applyCreateGroupFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(applyCreateGroupFormDTO);
+ return resiGroupService.applyCreateGroup(applyCreateGroupFormDTO);
+ }
+
+ /**
+ * @return com.epmet.commons.tools.utils.Result
+ * @param tokenDto
+ * @param applyJoinGroupFormDTO
+ * @Author yinzuomei
+ * @Description 申请加入小组
+ * @Date 2020/3/29 20:01
+ **/
+ @PostMapping("applyjoingroup")
+ public Result applyJoinGroup(@LoginUser TokenDto tokenDto,
+ @RequestBody ApplyJoinGroupFormDTO applyJoinGroupFormDTO){
+ applyJoinGroupFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(applyJoinGroupFormDTO);
+ return resiGroupService.applyJoinGroup(applyJoinGroupFormDTO);
+ }
+ //加入小组界面初始化
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
new file mode 100644
index 0000000000..4216affa22
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
@@ -0,0 +1,90 @@
+/**
+ * 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 {
+
+ /**
+ * @param myGroupFormDTO
+ * @return java.util.List
+ * @Author yinzuomei
+ * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
+ * @Date 2020/3/28 20:39
+ **/
+ List selectListMyGroup(MyGroupFormDTO myGroupFormDTO);
+
+ /**
+ * @return com.epmet.resi.group.dto.group.result.LatestTopicDTO
+ * @param groupId
+ * @Author yinzuomei
+ * @Description 查询当前组最新话题
+ * @Date 2020/3/28 21:15
+ **/
+ LatestTopicDTO selectLatestTopic(String groupId);
+
+ /**
+ * @param recommendGroupFormDTO
+ * @return java.util.List
+ * @Author yinzuomei
+ * @Description 推荐组列表查询
+ * @Date 2020/3/28 20:04
+ **/
+ List selectListRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO);
+
+ /**
+ * @return java.util.List
+ * @param createdFormDTO
+ * @Author yinzuomei
+ * @Description 我创建的小组
+ * @Date 2020/3/28 22:05
+ **/
+ List selectListMyCreated(CreatedFormDTO createdFormDTO);
+
+ /**
+ * @param modifyGroupFormDTO
+ * @return int
+ * @Author yinzuomei
+ * @Description 修改组信息
+ * @Date 2020/3/28 22:30
+ **/
+ int modifyGroupInfo(ModifyGroupFormDTO modifyGroupFormDTO);
+
+ /**
+ * @param groupSummarizeFormDTO
+ * @return com.epmet.resi.group.dto.group.result.GroupSummarizeResultDTO
+ * @Author yinzuomei
+ * @Description 查看小组管理界面信息
+ * @Date 2020/3/29 17:55
+ **/
+ GroupSummarizeResultDTO selectGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupOperationDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupOperationDao.java
new file mode 100644
index 0000000000..9575e72bd1
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupOperationDao.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 {
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
new file mode 100644
index 0000000000..0305fb7834
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
@@ -0,0 +1,77 @@
+/**
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-03-29
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-03-29
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return ResiGroupOperationDTO
+ * @author generator
+ * @date 2020-03-29
+ */
+ ResiGroupOperationDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void save(ResiGroupOperationDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void update(ResiGroupOperationDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void delete(String[] ids);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
new file mode 100644
index 0000000000..1c7023e8d5
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
@@ -0,0 +1,165 @@
+/**
+ * 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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-03-28
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-03-28
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return ResiGroupDTO
+ * @author generator
+ * @date 2020-03-28
+ */
+ ResiGroupDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-28
+ */
+ void save(ResiGroupDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-28
+ */
+ void update(ResiGroupDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-03-28
+ */
+ void delete(String[] ids);
+
+ /**
+ * @param myGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
+ * @Date 2020/3/28 20:37
+ **/
+ Result> getMyGroup(MyGroupFormDTO myGroupFormDTO);
+
+ /**
+ * @param recommendGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 推荐组列表查询
+ * @Date 2020/3/28 19:53
+ **/
+ Result> getRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO);
+
+ /**
+ * @param createdFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 我创建的小组
+ * @Date 2020/3/28 22:01
+ **/
+ Result> getCreated(CreatedFormDTO createdFormDTO);
+
+ /**
+ * @param modifyGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 修改组信息
+ * @Date 2020/3/28 22:27
+ **/
+ Result modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO);
+
+ /**
+ * @param groupSummarizeFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 查看小组管理界面信息
+ * @Date 2020/3/29 17:52
+ **/
+ Result getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO);
+
+ /**
+ * @param applyCreateGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 创建小组
+ * @Date 2020/3/29 19:26
+ **/
+ Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO);
+
+ /**
+ * @param applyJoinGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 申请加入小组
+ * @Date 2020/3/29 20:01
+ **/
+ Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java
new file mode 100644
index 0000000000..9fd6f83ba4
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupOperationServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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 implements ResiGroupOperationService {
+
+ @Autowired
+ private ResiGroupOperationRedis resiGroupOperationRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, ResiGroupOperationDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, ResiGroupOperationDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public ResiGroupOperationDTO get(String id) {
+ ResiGroupOperationEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, ResiGroupOperationDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(ResiGroupOperationDTO dto) {
+ ResiGroupOperationEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupOperationEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(ResiGroupOperationDTO dto) {
+ ResiGroupOperationEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupOperationEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
new file mode 100644
index 0000000000..4e1bacdf17
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -0,0 +1,280 @@
+/**
+ * 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 implements ResiGroupService {
+
+ @Autowired
+ private ResiGroupRedis resiGroupRedis;
+
+ @Autowired
+ private ResiGroupMemberService resiGroupMemberService;
+
+ @Autowired
+ private ResiGroupOperationService resiGroupOperationService;
+
+ @Autowired
+ private GroupMemeberOperationService groupMemeberOperationService;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, ResiGroupDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, ResiGroupDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params) {
+ String id = (String) params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public ResiGroupDTO get(String id) {
+ ResiGroupEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, ResiGroupDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(ResiGroupDTO dto) {
+ ResiGroupEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(ResiGroupDTO dto) {
+ ResiGroupEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * @param myGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 我的小组查询（包含我创建的小组+我加入的小组），以各组的最新话题时间有近到远排序）
+ * @Date 2020/3/28 20:37
+ **/
+ @Override
+ public Result> getMyGroup(MyGroupFormDTO myGroupFormDTO) {
+ int pageIndex = (myGroupFormDTO.getPageNo() - NumConstant.ONE) * myGroupFormDTO.getPageSize();
+ myGroupFormDTO.setPageNo(pageIndex);
+ List myGroupList = baseDao.selectListMyGroup(myGroupFormDTO);
+ return new Result>().ok(myGroupList);
+ }
+
+ /**
+ * @param recommendGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 推荐组列表查询
+ * @Date 2020/3/28 19:53
+ **/
+ @Override
+ public Result> getRecommendGroup(RecommendGroupFormDTO recommendGroupFormDTO) {
+ int pageIndex = (recommendGroupFormDTO.getPageNo() - NumConstant.ONE) * recommendGroupFormDTO.getPageSize();
+ recommendGroupFormDTO.setPageNo(pageIndex);
+ //显示当前网格内所有当前用户还未加入的组，以组的人数由高到低排序；如果人数相同，以最新话题的时间有近到远排序
+ List recommendGroupList = baseDao.selectListRecommendGroup(recommendGroupFormDTO);
+ return new Result>().ok(recommendGroupList);
+ }
+
+ /**
+ * @param createdFormDTO
+ * @return com.epmet.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 我创建的小组
+ * @Date 2020/3/28 22:01
+ **/
+ @Override
+ public Result> getCreated(CreatedFormDTO createdFormDTO) {
+ int pageIndex = (createdFormDTO.getPageNo() - NumConstant.ONE) * createdFormDTO.getPageSize();
+ createdFormDTO.setPageNo(pageIndex);
+ List createdResultDTOList = baseDao.selectListMyCreated(createdFormDTO);
+ return new Result>().ok(createdResultDTOList);
+ }
+
+ /**
+ * @param modifyGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 修改组信息
+ * @Date 2020/3/28 22:27
+ **/
+ @Override
+ public Result modifyGroup(ModifyGroupFormDTO modifyGroupFormDTO) {
+ //校验是否是群主
+ ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId());
+ if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) {
+ return new Result().error(ModuleConstant.REJECT_MODIFYGROUPINFO);
+ }
+ if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto())
+ && StringUtils.isBlank(modifyGroupFormDTO.getGroupName())
+ && StringUtils.isBlank(modifyGroupFormDTO.getGroupIntroduction())) {
+ return new Result();
+ }
+ int updatedRows = baseDao.modifyGroupInfo(modifyGroupFormDTO);
+ if (1 == updatedRows) {
+ return new Result().ok(ModuleConstant.UPDATE_SUCCESS);
+ }
+ return new Result().error(ModuleConstant.UPDATE_FAILED);
+ }
+
+ /**
+ * @param groupSummarizeFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 查看小组管理界面信息
+ * @Date 2020/3/29 17:52
+ **/
+ @Override
+ public Result getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) {
+ GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO);
+ if (null != groupSummarizeResultDTO) {
+ return new Result().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED);
+ }
+ //群主名称需要调用feign查询
+ groupSummarizeResultDTO.setLeaderName("测试");
+ return new Result().ok(groupSummarizeResultDTO);
+ }
+
+ /**
+ * @param applyCreateGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 创建小组
+ * @Date 2020/3/29 19:26
+ **/
+ @Override
+ public Result applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+ //1、插入一条待审核的组信息
+ ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
+ insert(resiGroupEntity);
+ //2、插入一条待审核的操作记录
+ ResiGroupOperationDTO resiGroupOperation = new ResiGroupOperationDTO();
+ resiGroupOperation.setResiGroupId(resiGroupEntity.getId());
+ resiGroupOperation.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
+ resiGroupOperation.setCreatedBy(applyCreateGroupFormDTO.getUserId());
+ resiGroupOperationService.save(resiGroupOperation);
+ return new Result();
+ }
+
+ /**
+ * @param applyJoinGroupFormDTO
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 申请加入小组
+ * @Date 2020/3/29 20:01
+ **/
+ @Override
+ public Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
+ ResiGroupDTO resiGroupDTO = this.get(applyJoinGroupFormDTO.getGroupId());
+ if (null == resiGroupDTO) {
+ return new Result().error(ModuleConstant.QUERY_GROUPINFO_FAILED);
+ }
+ //插入一条待审核的记录
+ GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
+ groupMemeberOperation.setGroupId(resiGroupDTO.getId());
+ groupMemeberOperation.setCustomerUserId(resiGroupDTO.getCustomerId());
+ groupMemeberOperation.setGroupId(applyJoinGroupFormDTO.getGroupId());
+ groupMemeberOperation.setOperateDes(applyJoinGroupFormDTO.getOperateDes());
+ groupMemeberOperation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
+ groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.JOIN);
+ groupMemeberOperation.setCreatedBy(applyJoinGroupFormDTO.getUserId());
+ groupMemeberOperationService.save(groupMemeberOperation);
+ return new Result();
+ }
+
+ private ResiGroupEntity structureResiGroupEntity(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+ ResiGroupEntity resiGroupEntity = new ResiGroupEntity();
+ resiGroupEntity.setCustomerId(applyCreateGroupFormDTO.getCustomerId());
+ resiGroupEntity.setGridId(applyCreateGroupFormDTO.getGridId());
+ resiGroupEntity.setGroupHeadPhoto(applyCreateGroupFormDTO.getGroupHeadPhoto());
+ resiGroupEntity.setGroupName(applyCreateGroupFormDTO.getGroupName());
+ resiGroupEntity.setGroupIntroduction(applyCreateGroupFormDTO.getGroupIntroduction());
+ resiGroupEntity.setCreatedBy(applyCreateGroupFormDTO.getUserId());
+ resiGroupEntity.setState(GroupStateConstant.GROUP_UNDER_AUDITTING);
+ return resiGroupEntity;
+ }
+
+}
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep
similarity index 100%
rename from epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/.gitkeep
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep
similarity index 100%
rename from epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/.gitkeep
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep
similarity index 100%
rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/.gitkeep
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep
similarity index 100%
rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/.gitkeep
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/.gitkeep
similarity index 100%
rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/.gitkeep
rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/.gitkeep
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
new file mode 100644
index 0000000000..e6b2e5a215
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
@@ -0,0 +1,34 @@
+/**
+ * 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
+ * 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 {
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
new file mode 100644
index 0000000000..9230184dd1
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.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 {
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java
new file mode 100644
index 0000000000..47d7442f3e
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/entity/GroupMemeberOperationEntity.java
@@ -0,0 +1,79 @@
+/**
+ * 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
+ * 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
+ * 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
+ * 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
+ * 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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-03-29
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-03-29
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return GroupMemeberOperationDTO
+ * @author generator
+ * @date 2020-03-29
+ */
+ GroupMemeberOperationDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void save(GroupMemeberOperationDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void update(GroupMemeberOperationDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void delete(String[] ids);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
new file mode 100644
index 0000000000..40e6f22335
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
@@ -0,0 +1,105 @@
+/**
+ * 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 {
+
+ /**
+ * 默认分页
+ *
+ * @param params
+ * @return PageData
+ * @author generator
+ * @date 2020-03-29
+ */
+ PageData page(Map params);
+
+ /**
+ * 默认查询
+ *
+ * @param params
+ * @return java.util.List
+ * @author generator
+ * @date 2020-03-29
+ */
+ List list(Map params);
+
+ /**
+ * 单条查询
+ *
+ * @param id
+ * @return ResiGroupMemberDTO
+ * @author generator
+ * @date 2020-03-29
+ */
+ ResiGroupMemberDTO get(String id);
+
+ /**
+ * 默认保存
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void save(ResiGroupMemberDTO dto);
+
+ /**
+ * 默认更新
+ *
+ * @param dto
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void update(ResiGroupMemberDTO dto);
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return void
+ * @author generator
+ * @date 2020-03-29
+ */
+ void delete(String[] ids);
+
+ /**
+ * @param groupId
+ * @param userId
+ * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+ * @Author yinzuomei
+ * @Description 根据群id, 用户id查询成员信息
+ * @Date 2020/3/29 18:28
+ **/
+ ResiGroupMemberDTO getResiGroupMember(String groupId, String userId);
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
new file mode 100644
index 0000000000..9474788ebf
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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 implements GroupMemeberOperationService {
+
+ @Autowired
+ private GroupMemeberOperationRedis groupMemeberOperationRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, GroupMemeberOperationDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, GroupMemeberOperationDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public GroupMemeberOperationDTO get(String id) {
+ GroupMemeberOperationEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, GroupMemeberOperationDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(GroupMemeberOperationDTO dto) {
+ GroupMemeberOperationEntity entity = ConvertUtils.sourceToTarget(dto, GroupMemeberOperationEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(GroupMemeberOperationDTO dto) {
+ GroupMemeberOperationEntity entity = ConvertUtils.sourceToTarget(dto, GroupMemeberOperationEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
new file mode 100644
index 0000000000..83f73eaff0
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -0,0 +1,124 @@
+/**
+ * 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 implements ResiGroupMemberService {
+
+ @Autowired
+ private ResiGroupMemberRedis resiGroupMemberRedis;
+
+ @Override
+ public PageData page(Map params) {
+ IPage page = baseDao.selectPage(
+ getPage(params, FieldConstant.CREATED_TIME, false),
+ getWrapper(params)
+ );
+ return getPageData(page, ResiGroupMemberDTO.class);
+ }
+
+ @Override
+ public List list(Map params) {
+ List entityList = baseDao.selectList(getWrapper(params));
+
+ return ConvertUtils.sourceToTarget(entityList, ResiGroupMemberDTO.class);
+ }
+
+ private QueryWrapper getWrapper(Map params){
+ String id = (String)params.get(FieldConstant.ID_HUMP);
+
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+ return wrapper;
+ }
+
+ @Override
+ public ResiGroupMemberDTO get(String id) {
+ ResiGroupMemberEntity entity = baseDao.selectById(id);
+ return ConvertUtils.sourceToTarget(entity, ResiGroupMemberDTO.class);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void save(ResiGroupMemberDTO dto) {
+ ResiGroupMemberEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupMemberEntity.class);
+ insert(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void update(ResiGroupMemberDTO dto) {
+ ResiGroupMemberEntity entity = ConvertUtils.sourceToTarget(dto, ResiGroupMemberEntity.class);
+ updateById(entity);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delete(String[] ids) {
+ // 逻辑删除（@TableLogic 注解）
+ baseDao.deleteBatchIds(Arrays.asList(ids));
+ }
+
+ /**
+ * @param groupId
+ * @param userId
+ * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+ * @Author yinzuomei
+ * @Description 根据群id, 用户id查询成员信息
+ * @Date 2020/3/29 18:28
+ **/
+ @Override
+ public ResiGroupMemberDTO getResiGroupMember(String groupId, String userId) {
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq(StringUtils.isNotBlank(groupId), "RESI_GROUP_ID", groupId)
+ .eq(StringUtils.isNotBlank(userId), "CUSTOMER_USER_ID", userId);
+ List list = baseDao.selectList(wrapper);
+ if (null == list || list.size() == 0) {
+ return null;
+ }
+ return ConvertUtils.sourceToTarget(list.get(0), ResiGroupMemberDTO.class);
+ }
+
+}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 7c826f258c..02f45bd177 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -27,4 +27,37 @@ public interface ModuleConstant extends Constant {
* 接口只限居民端调用
*/
String FOR_RESI_CALL="当前接口只限居民端调用";
+
+ /**
+ * 修改组信息成功
+ */
+ String UPDATE_SUCCESS="修改成功";
+
+ /**
+ * 修改组信息失败
+ */
+ String UPDATE_FAILED="修改失败";
+
+ /**
+ * 查询组信息失败
+ */
+ String GETGROUPSUMMARIZE_FAILED="查询失败";
+
+ /**
+ * member成员，leader群主
+ */
+ String GROUP_LEADER="leader";
+
+ /**
+ * member成员，leader群主
+ */
+ String GROUP_MEMBER="member";
+
+ /**
+ * 只有群主才能修改群信息
+ */
+ String REJECT_MODIFYGROUPINFO="只有群主才能修改群信息";
+
+ String QUERY_GROUPINFO_FAILED="查询组信息失败";
+
}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
new file mode 100644
index 0000000000..13b44dc9b5
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+ SELECT
+ rg.id,
+ rg.GROUP_HEAD_PHOTO,
+ rg.GROUP_NAME ,
+ rgs.TOTAL_MEMBERS ,
+ rgs.TOTAL_PARTY_MEMBERS ,
+ rg.STATE ,
+ rgm.GROUP_LEADER_FLAG AS groupLeaderFlag
+ FROM
+ resi_group_member rgm
+ LEFT JOIN resi_group rg ON ( rgm.RESI_GROUP_ID = rg.ID )
+ LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
+ WHERE
+ rg.DEL_FLAG = '0'
+ AND rgm.DEL_FLAG = '0'
+ AND rgs.DEL_FLAG = '0'
+ AND rg.CUSTOMER_ID = #{cusomerId}
+ AND rg.GRID_ID ={gridId}
+ AND rgm.CUSTOMER_USER_ID = #{userId}
+ AND rgm.STATUS IN ( 'approved', 'silent' )
+ order by rg.LATEST_TOPIC_PUBLISH_DATE desc
+ LIMIT #{pageNo}, #{pageSize}
+
+
+
+
+ SELECT
+ rt.id as topicId,
+ rt.TOPIC_CONTENT as topicContent
+ FROM
+ resi_topic rt
+ WHERE
+ rt.DEL_FLAG = '0'
+ and rt.GROUP_ID=#{groupId}
+ AND rt.STATUS = 'discussing'
+ order by rt.CREATED_TIME desc
+ limit 1
+
+
+
+
+ SELECT
+ rg.id AS groupId,
+ rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
+ rg.GROUP_NAME AS groupName,
+ rgs.TOTAL_MEMBERS AS totalMember,
+ rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
+ FROM
+ resi_group rg
+ LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
+ WHERE
+ rg.DEL_FLAG = '0'
+ AND rgs.DEL_FLAG = '0'
+ and rg.id not EXISTS (
+ SELECT
+ rgm.RESI_GROUP_ID
+ FROM
+ resi_group_member rgm
+ WHERE
+ rgm.DEL_FLAG = '0'
+ AND rgm.`STATUS` !='removed'
+ AND rgm.CUSTOMER_USER_ID = #{userId}
+ )
+ and rg.CUSTOMER_ID=#{cusomerId}
+ and rg.GRID_ID=#{gridId}
+ order by totalMember desc,rg.LATEST_TOPIC_PUBLISH_DATE desc
+ LIMIT #{pageNo}, #{pageSize}
+
+
+
+
+ SELECT
+ rg.id AS groupId,
+ rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
+ rg.GROUP_NAME AS groupName,
+ rgs.TOTAL_MEMBERS AS totalMember,
+ rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember,
+ rg.STATE AS groupState
+ FROM
+ resi_group_member rgm
+ LEFT JOIN resi_group rg ON ( rgm.RESI_GROUP_ID = rg.ID )
+ LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
+ WHERE
+ rg.DEL_FLAG = '0'
+ AND rgm.DEL_FLAG = '0'
+ AND rgs.DEL_FLAG = '0'
+ AND rg.CUSTOMER_ID = #{cusomerId}
+ AND rg.GRID_ID ={gridId}
+ AND rgm.CUSTOMER_USER_ID = #{userId}
+ AND rgm.GROUP_LEADER_FLAG = 'leader'
+ ORDER BY
+ rg.CREATED_TIME DESC
+ LIMIT #{pageNo}, #{pageSize}
+
+
+
+
+ UPDATE resi_group rg
+ SET rg.GROUP_NAME = #{groupName},
+ rg.GROUP_HEAD_PHOTO = #{groupHeadPhoto},
+ rg.GROUP_INTRODUCTION =#{groupIntroduction},
+ rg.UPDATED_BY=#{userId},
+ rg.UPDATED_BY=NOW()
+ WHERE
+ rg.id = #{groupId}
+ AND rg.DEL_FLAG = '0'
+
+
+
+
+ SELECT
+ rg.id AS groupId,
+ rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
+ rg.GROUP_NAME AS groupName,
+ rg.GROUP_INTRODUCTION AS groupIntroduction,
+ rgs.TOTAL_MEMBERS AS totalMember,
+ rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember,
+ rgm.GROUP_LEADER_FLAG AS leaderFlag,
+ (
+ SELECT
+ count(1)
+ FROM
+ group_memeber_operation gmo
+ WHERE
+ gmo.DEL_FLAG = '0'
+ AND gmo.GROUP_ID = rg.id
+ AND gmo.OPERATE_STATUS = 'under_auditting'
+ ) AS totalApplyingMember
+ FROM
+ resi_group rg
+ LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
+ LEFT JOIN resi_group_member rgm ON ( rg.id = rgm.RESI_GROUP_ID AND rgm.CUSTOMER_USER_ID =#{userId})
+ WHERE
+ rg.DEL_FLAG = '0'
+ AND rgs.DEL_FLAG = '0'
+ and rg.id=#{groupId}
+
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupOperationDao.xml
new file mode 100644
index 0000000000..5e0c19d8e7
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupOperationDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/.gitkeep b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml
new file mode 100644
index 0000000000..7dec92a8f7
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/GroupMemeberOperationDao.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
new file mode 100644
index 0000000000..ce5cb22c93
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/excel/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/.gitkeep
similarity index 100%
rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/excel/.gitkeep
rename to epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/.gitkeep
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/form/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 01a62faf8d..1ba86f3a63 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -64,6 +64,18 @@
2.0.0
compile
+
+ com.epmet
+ resi-mine-client
+ 2.0.0
+ compile
+
+
+ com.epmet
+ epmet-message-client
+ 2.0.0
+ compile
+
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/dao/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/entity/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/excel/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
similarity index 92%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
index 1206c71b9a..4daeeb6450 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/exception/ModuleErrorCode.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
@@ -6,7 +6,7 @@
* 版权所有，侵权必究！
*/
-package com.epmet.exception;
+package com.epmet.modules.exception;
import com.epmet.commons.tools.exception.ErrorCode;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
similarity index 90%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
index 0143c55acd..15966f5f15 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
@@ -1,9 +1,9 @@
-package com.epmet.feign;
+package com.epmet.modules.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.LatestGridInfoResultDTO;
-import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
+import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
similarity index 90%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
index 6e912e7417..b45339f8ba 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
@@ -1,10 +1,10 @@
-package com.epmet.feign.fallback;
+package com.epmet.modules.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.LatestGridInfoResultDTO;
-import com.epmet.feign.EpmetUserFeignClient;
+import com.epmet.modules.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component;
/**
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
similarity index 91%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
index 7dc2f9c69a..626f78bfd4 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
@@ -1,10 +1,10 @@
-package com.epmet.controller;
+package com.epmet.modules.grid.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.LatestGridInfoResultDTO;
-import com.epmet.service.ResiMineGridService;
+import com.epmet.modules.grid.service.ResiMineGridService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java
similarity index 93%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java
index 33c5f4d73d..29597c8e87 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/ResiMineGridService.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/ResiMineGridService.java
@@ -1,4 +1,4 @@
-package com.epmet.service;
+package com.epmet.modules.grid.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
similarity index 86%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
index 891d41bf51..7de59e3277 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/service/impl/ResiMineGridServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
@@ -1,12 +1,12 @@
-package com.epmet.service.impl;
+package com.epmet.modules.grid.service.impl;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.LatestGridInfoResultDTO;
-import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.service.ResiMineGridService;
-import com.epmet.utils.ModuleConstant;
+import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.grid.service.ResiMineGridService;
+import com.epmet.modules.utils.ModuleConstant;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
new file mode 100644
index 0000000000..fa626f84ba
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
@@ -0,0 +1,69 @@
+package com.epmet.modules.message.controller;
+
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.MymessageFormDTO;
+import com.epmet.dto.result.MymessageResultDTO;
+import com.epmet.modules.message.service.UserMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Description 我的消息
+ * @Author yinzuomei
+ * @Date 2020/3/29 20:49
+ */
+@RestController
+@RequestMapping("mymessage")
+public class UserMessageController {
+ @Autowired
+ private UserMessageService userMessageService;
+
+ /**
+ * @param
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 查询我的消息
+ * @Date 2020/3/29 20:53
+ **/
+ @PostMapping("getmymessage")
+ public Result> getMyMessage(@LoginUser TokenDto tokenDto,
+ @RequestBody MymessageFormDTO mymessageFormDTO) {
+ mymessageFormDTO.setUserId(tokenDto.getUserId());
+ ValidatorUtils.validateEntity(mymessageFormDTO);
+ //逻辑待实现
+ return new Result();
+ }
+
+ /**
+ * @param tokenDto
+ * @param messageId
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 单条消息标记为已读
+ * @Date 2020/3/29 21:05
+ **/
+ @PostMapping("readmsg")
+ public Result readMessage(@LoginUser TokenDto tokenDto,
+ @RequestParam("messageId") String messageId) {
+ //逻辑待实现
+ return new Result();
+ }
+
+ /**
+ * @param tokenDto
+ * @return com.epmet.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 全部已读
+ * @Date 2020/3/29 21:06
+ **/
+ @PostMapping("readallmsg")
+ public Result readAllMessage(@LoginUser TokenDto tokenDto) {
+ //逻辑待实现
+ return new Result();
+ }
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java
new file mode 100644
index 0000000000..165d9f3650
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/UserMessageService.java
@@ -0,0 +1,9 @@
+package com.epmet.modules.message.service;
+
+/**
+ * @Description 我的消息
+ * @Author yinzuomei
+ * @Date 2020/3/29 20:50
+ */
+public interface UserMessageService {
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java
new file mode 100644
index 0000000000..dee56e413e
--- /dev/null
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/service/impl/UserMessageServiceImpl.java
@@ -0,0 +1,13 @@
+package com.epmet.modules.message.service.impl;
+
+import com.epmet.modules.message.service.UserMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 我的消息
+ * @Author yinzuomei
+ * @Date 2020/3/29 20:50
+ */
+@Service
+public class UserMessageServiceImpl implements UserMessageService {
+}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
similarity index 94%
rename from epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
rename to epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index eb482b07f3..7c826f258c 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/utils/ModuleConstant.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -6,7 +6,7 @@
* 版权所有，侵权必究！
*/
-package com.epmet.utils;
+package com.epmet.modules.utils;
import com.epmet.commons.tools.constant.Constant;
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
index a038b82fe7..e767c8edc6 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml
@@ -132,8 +132,7 @@