Merge remote-tracking branch 'origin/dev_bugfix' into dev

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicCommentController.java

@@ -0,0 +1,42 @@
+package com.epmet.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.resi.group.dto.comment.form.ResiQueryCommentFormDTO;
+import com.epmet.resi.group.dto.comment.result.GovCommentResultDTO;
+import com.epmet.service.ResiTopicService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @Description 话题评论相关接口
+ * @Author yinzuomei
+ * @Date 2020/4/30 16:42
+ */
+@RestController
+@RequestMapping("topic")
+public class ResiTopicCommentController {
+    @Autowired
+    private ResiTopicService resiTopicService;
+    /**
+     * @Description 政府端群组管理-获取某个话题的评论列表
+     * @Param tokenDto
+     * @Param ResiQueryCommentFormDTO
+     * @return Result<List<ResiCommentResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 23:49
+     **/
+    @PostMapping("topiccomments")
+    Result<List<GovCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
+        ValidatorUtils.validateEntity(queryCommentFormDTO);
+        return resiTopicService.topicComments(queryCommentFormDTO);
+    }
+}
+

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiTopicController.java

@@ -70,19 +70,6 @@ public class ResiTopicController {
         return resiTopicService.topicDetail(topicDetailFormDTO);
     }
 
-    /**
-     * @Description 政府端群组管理-获取某个话题的评论列表
-     * @Param tokenDto
-     * @Param ResiQueryCommentFormDTO
-     * @return Result<List<ResiCommentResultDTO>>
-     * @Author wangc
-     * @Date 2020.04.01 23:49
-     **/
-    @PostMapping("topiccomments")
-    Result<List<GovCommentResultDTO>> topicComments(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
-        ValidatorUtils.validateEntity(queryCommentFormDTO);
-        return resiTopicService.topicComments(queryCommentFormDTO);
-    }
 
 
 }

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiTopicServiceImpl.java

@@ -47,7 +47,7 @@ public class ResiTopicServiceImpl implements ResiTopicService {
                 govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto());
                 govTopic.setUserNickName(top.getReleaseUserName());
                 govTopic.setTopicId(top.getTopicId());
-                govTopic.setTopicRealseTime(top.getReleaseTime().getTime());
+                govTopic.setTopicRealseTime(top.getReleaseTime());
                 govTopic.setTopicFirstPhoto(top.getFirstPhoto());
                 topicsResult.add(govTopic);
             });
@@ -76,7 +76,7 @@ public class ResiTopicServiceImpl implements ResiTopicService {
                 govTopic.setUserHeadPhoto(top.getReleaseUserHeadPhoto());
                 govTopic.setUserNickName(top.getReleaseUserName());
                 govTopic.setTopicId(top.getTopicId());
-                govTopic.setTopicRealseTime(top.getReleaseTime().getTime());
+                govTopic.setTopicRealseTime(top.getReleaseTime());
                 govTopic.setTopicFirstPhoto(top.getFirstPhoto());
                 govTopic.setTopicState(top.getStatus());
                 topicsResult.add(govTopic);

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovHiddenTopicInfoResultDTO.java

@@ -1,8 +1,10 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description
@@ -40,9 +42,10 @@ public class GovHiddenTopicInfoResultDTO implements Serializable {
     private String topicContent;
 
     /**
-     * 话题发布时间 时间戳
+     * 话题发布时间
      * */
-    private Long topicRealseTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date topicRealseTime;
 
     /**
      * 话题的第一张图片地址

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicInfoResultDTO.java

@@ -1,8 +1,11 @@
 package com.epmet.resi.group.dto.topic.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
+
 
 /**
  * @Description
@@ -40,9 +43,10 @@ public class GovTopicInfoResultDTO implements Serializable {
     private String topicContent;
 
     /**
-     * 话题发布时间 时间戳
+     * 话题发布时间
      * */
-    private Long topicRealseTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date topicRealseTime;
 
     /**
      * 话题的第一张图片地址