From 4404c0a137d2a00594b38d3db9a14effd8e78893 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 8 May 2021 10:18:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/member/ResiGroupMemberDao.xml      | 1 +
 1 file changed, 1 insertion(+)

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
index 25341775cb..7fb542a465 100644
--- 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
@@ -191,6 +191,7 @@
         ORDER BY
             rgm.CREATED_TIME DESC
     </select>
+    <!--因为查的是组员人数 所以历史被删除的也是算的 组员状态只有审核通过 被禁言 被移除 退组-->
     <select id="countAllMembers" resultType="int">
         SELECT
             count(*)

From 9089eb3c1ec1c95546fa3e947fccc3a09de25303 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 8 May 2021 10:56:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E6=88=90=E5=B0=B1?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/resi/group/dto/group/ResiGroupDTO.java   | 6 +-----
 .../com/epmet/modules/group/entity/ResiGroupEntity.java     | 5 -----
 .../modules/topic/service/impl/TopicDraftServiceImpl.java   | 1 -
 3 files changed, 1 insertion(+), 11 deletions(-)

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
index 84454b39c9..9ed8c34510 100644
--- 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
@@ -126,11 +126,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
      * 更新时间
      */
 	private Date updatedTime;
-
-    /**
-     * 小组类型(ordinary:楼院小组  branch:支部小组)
-     */
-	private String groupType;
+	
 	private List<ResiGroupMemberDTO> memberList;
 
 }
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
index 4e694c8f31..b50f50a417 100644
--- 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
@@ -89,11 +89,6 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 */
 	private String groupType;
 
-	/**
-	 * 小组类型(ordinary:楼院小组  branch:支部小组)
-	 */
-	private String groupType;
-
 	/**
 	 * 小组等级
 	 */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 1150f4fbb4..eda33096dd 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -811,7 +811,6 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
             }else {
                 breviary.append("语音话题");
             }
-            sendMqMsg(draft.getCreatedBy(), draft.getCustomerId(),draft.getCreatedTime(),resiGroupRedis.get(draft.getGroupId()).getGroupName(),breviary.toString());
 
             //2021.4.22 start  sun  因业务调整，新增组内消息记录表，新增话题时相应的初始数据
             GroupMessageEntity messageEntity = new GroupMessageEntity();

From ce767363a8ec3cbbf67f4ab30de074373457a5a1 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Sat, 8 May 2021 14:36:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/topic/ResiTopicDTO.java    | 15 ++++++++++++
 .../resi/group/dto/topic/TopicDraftDTO.java   | 15 ++++++++++++
 .../dto/topic/form/CreateTopicFormDTO.java    | 15 ++++++++++++
 .../modules/topic/entity/ResiTopicEntity.java | 15 ++++++++++++
 .../topic/entity/TopicDraftEntity.java        | 16 +++++++++++++
 .../service/impl/TopicDraftServiceImpl.java   |  2 +-
 .../db/migration/V0.0.24__topic_locate.sql    | 24 +++++++++++++++++++
 7 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
index 03ca7df8d6..58d4e1bafa 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
@@ -88,6 +88,21 @@ public class ResiTopicDTO implements Serializable {
      */
 	private String dimension;
 
+	/**
+	 * 定位地址
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
     /**
      * 删除标记 0：未删除，1：已删除
      */
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
index 80fcc43105..e2747cdd83 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
@@ -103,6 +103,21 @@ public class TopicDraftDTO implements Serializable {
      */
 	private String dimension;
 
+	/**
+	 * 定位地址
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
     /**
      * 发布成功后的话题id
      */
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
index e8daa37b2d..79d81c4fc9 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
@@ -44,6 +44,21 @@ public class CreateTopicFormDTO implements Serializable {
 	@NotBlank(message = "地址信息不能为空")
 	private String address;
 
+	/**
+	 * 经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 纬度
+	 * */
+	private String locateDimension;
+
+	/**
+	 * 地址
+	 * */
+	private String locateAddress;
+
 	/**
 	 * 省份
 	 * */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
index 886b5d1ed1..738dfd36c9 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
@@ -90,6 +90,21 @@ public class ResiTopicEntity extends BaseEpmetEntity {
      */
 	private String dimension;
 
+	/**
+	 * 定位地址
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
 	/**
 	 * 议题Id
 	 */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
index 513e03c4cf..d4e87657e3 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
@@ -103,6 +103,22 @@ public class TopicDraftEntity extends BaseEpmetEntity {
      */
 	private String dimension;
 
+	/**
+	 * 定位地址
+	 * */
+	private String locateAddress;
+
+	/**
+	 * 定位经度
+	 * */
+	private String locateLongitude;
+
+	/**
+	 * 定位纬度
+	 * */
+	private String locateDimension;
+
+
     /**
      * 发布成功后的话题id
      */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 8b800af1b5..96daf14858 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -851,7 +851,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         }
         topic.setCreatedBy(tokenDto.getUserId());
         topic.setStatus(TopicConstant.PUBLISHMENT);
-        resiTopicDao.insertOne(topic);
+        resiTopicDao.insert(topic);
         if(StringUtils.isBlank(topic.getId())){
             //没有返回主键
             log.error(ModuleConstant.NO_PRIMARY_KEY_RETURNED);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql
new file mode 100644
index 0000000000..63870679a4
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql
@@ -0,0 +1,24 @@
+ALTER TABLE `resi_topic`
+    ADD COLUMN `LOCATE_ADDRESS` varchar(255) NULL COMMENT '定位地址' AFTER `DIMENSION`,
+    ADD COLUMN `LOCATE_LONGITUDE` varchar(32) NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
+    ADD COLUMN `LOCATE_DIMENSION` varchar(32) NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
+
+ALTER TABLE `topic_draft`
+    ADD COLUMN `LOCATE_ADDRESS` varchar(255) NULL COMMENT '定位地址' AFTER `DIMENSION`,
+    ADD COLUMN `LOCATE_LONGITUDE` varchar(32) NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
+    ADD COLUMN `LOCATE_DIMENSION` varchar(32) NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
+
+ALTER TABLE `resi_group_member`
+    MODIFY COLUMN `STATUS`  varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '状态：（ 审核通过 - approved、  已禁言 - silent、被移出群 - removed 【组长建组为under_auditting,建组审核不通过为rejected】）' AFTER `GROUP_INVITATION_ID`;
+
+UPDATE resi_topic a
+    INNER JOIN resi_topic b ON a.ID = b.ID
+SET a.LOCATE_ADDRESS = b.ADDRESS,
+    a.LOCATE_LONGITUDE = b.LONGITUDE,
+    a.LOCATE_DIMENSION = b.DIMENSION;
+
+UPDATE topic_draft a
+    INNER JOIN topic_draft b ON a.ID = b.ID
+SET a.LOCATE_ADDRESS = b.ADDRESS,
+    a.LOCATE_LONGITUDE = b.LONGITUDE,
+    a.LOCATE_DIMENSION = b.DIMENSION;
\ No newline at end of file