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 1/2] =?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

From 547a3dfb3d7f8650790d5354107f4cea845190c6 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 10 May 2021 10:45:52 +0800
Subject: [PATCH 2/2] =?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

---
 .../group/dto/topic/result/DraftDetailResultDTO.java   |  9 +++++++++
 .../result/ResiTopicIncludeIssueDetailResultDTO.java   | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
index ed04fa23ac..dc8fda0ce1 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
@@ -42,6 +42,15 @@ public class DraftDetailResultDTO implements Serializable {
 	 * 发布地址
 	 */
 	private String releaseAddress;
+	/**
+	 * 经度
+	 */
+	private String longitude;
+
+	/**
+	 * 维度
+	 */
+	private String dimension;
 	/**
 	 * 驳回理由
 	 */
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
index 06efffca1e..2bce88383f 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
@@ -41,6 +41,16 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
      * */
     private String releaseAddress;
 
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 维度
+     */
+    private String dimension;
+
     /**
      * 话题内容
      * */