话题定位

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：已删除
      */

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
      */

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;
+
 	/**
 	 * 省份
 	 * */

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
 	 */

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
      */

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);

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;