Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicDefaultPageFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName ResiTopicDefaultPageFormDTO
+ * @Author wangc
+ * @date 2020.04.07 09:14
+ */
+@Data
+public class ResiTopicDefaultPageFormDTO implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小组Id
+     * */
+    @NotBlank(message = "小组Id不能为空")
+    private String groupId;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicDetailFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @ClassName ResiTopicDetailFormDTO
+ * @Author wangc
+ * @date 2020.04.07 09:07
+ */
+@Data
+public class ResiTopicDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 话题Id
+     * */
+    @NotBlank(message = "话题Id不能为空")
+    private String topicId;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -5,9 +5,7 @@ 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.modules.topic.service.ResiTopicService;
-import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO;
+import com.epmet.resi.group.dto.topic.form.*;
-import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO;
-import com.epmet.resi.group.dto.topic.form.ResiTopicPublishFormDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
 import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,8 +51,9 @@ public class ResiTopicController {
      * @Date 2020.04.01 23:48
      **/
     @PostMapping("gettopicdetail")
-    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestParam("topicId") String topicId ){
+    public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
-        return topicService.getTopicDetail(tokenDto,topicId);
+        ValidatorUtils.validateEntity(topicDetailFormDTO);
+        return topicService.getTopicDetail(tokenDto,topicDetailFormDTO.getTopicId());
     }
 
     /**
@@ -74,14 +73,15 @@ public class ResiTopicController {
     /**
      * @Description 查看组内最近十条话题
      * @Param tokenDto
-     * @Param groupId
+     * @Param ResiTopicDefaultPageFormDTO
      * @return Result<List<ResiTopicInfoResultDTO>>
      * @Author wangc
      * @Date 2020.04.02 00:01
      **/
     @PostMapping("getlatesttentopics")
-    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestParam("groupId") String groupId){
+    Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(@LoginUser  TokenDto tokenDto,@RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
-        return topicService.getLatestTenTopics(tokenDto,groupId);
+        ValidatorUtils.validateEntity(topicDefaultPageFormDTO);
+        return topicService.getLatestTenTopics(tokenDto,topicDefaultPageFormDTO.getGroupId());
     }
 
     /**