小组历史数据查询V2 框框

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

@@ -0,0 +1,36 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/4/21 下午3:21
+ * @DESC
+ */
+@Data
+public class GetPastTopicListV2FormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3746688354140118007L;
+
+    public interface GetPastTopicListV2Form{}
+
+    /**
+     * null默认查询讨论中、已关闭，dicussing讨论中，closed关闭
+     */
+    private String status;
+
+    @NotBlank(message = "小组ID不能为空",groups = GetPastTopicListV2Form.class)
+    private String groupId;
+
+    @NotNull(message = "pageSize不能为空",groups = GetPastTopicListV2Form.class)
+    private Integer pageSize;
+
+    @NotNull(message = "pageNo不能为空",groups = GetPastTopicListV2Form.class)
+    private Integer pageNo;
+
+    private String userId;
+}

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

@@ -0,0 +1,77 @@
+package com.epmet.resi.group.dto.topic.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/4/21 下午3:15
+ * @DESC
+ */
+@Data
+public class GetPastTopicListV2ResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8352977778269083843L;
+
+    /**
+     * 话题、通知、活动Id
+     */
+    private String id;
+
+    /**
+     * 发布者的全称（街道-姓氏先生/女士）【专项组显示真实名】
+     */
+    private String releaseUserName;
+
+    /**
+     * 发布者的头像Url
+     */
+    private String releaseUserHeadPhoto;
+
+    /**
+     * 发布时间yyyy-MM-dd
+     */
+    private String releaseTime;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 话题状态（discussing进行中、closed已关闭）
+     */
+    private String status;
+
+    /**
+     * 是否本人
+     */
+    private Boolean releaseUserFlag;
+
+    /**
+     * 议题id
+     */
+    private String issueId;
+
+    /**
+     * 是否被转为议题true,false
+     */
+    private Boolean shiftIssueFlag;
+
+    /**
+     * 数据类型(topic:话题 notice:通知 act:活动)
+     */
+    private String contentType;
+
+    /**
+     * 本人已读未读状态(read已读 unread未读)
+     */
+    private String readOrUnRead;
+
+    /**
+     * 徽章Url集合
+     */
+    private List<String> badgeList;
+}

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

@@ -455,4 +455,18 @@ public class ResiTopicController {
         formDTO.setUserId(tokenDto.getUserId());
         return new Result<GetLatestV2ResultDTO>().ok(topicService.getLatestV2(formDTO));
     }
+
+    /**
+     * @Description 小组历史数据查询V2
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2021/4/21 下午4:08
+     */
+    @PostMapping("getpasttopiclistv2")
+    public Result<List<GetPastTopicListV2ResultDTO>> getPastTopicListV2(@RequestBody GetPastTopicListV2FormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO, GetPastTopicListV2FormDTO.GetPastTopicListV2Form.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<GetPastTopicListV2ResultDTO>>().ok(topicService.getPastTopicListV2(formDTO));
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java

@@ -361,4 +361,13 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      * @date 2021/4/20 下午2:34
      */
     GetLatestV2ResultDTO getLatestV2(GetLatestV2FormDTO formDTO);
+
+    /**
+     * @Description 小组历史数据查询V2
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2021/4/21 下午4:08
+     */
+    List<GetPastTopicListV2ResultDTO> getPastTopicListV2(GetPastTopicListV2FormDTO formDTO);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -2264,6 +2264,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         return result;
     }
 
+    /**
+     * @Description 小组历史数据查询V2
+     * @Param formDTO
+     * @Param tokenDto
+     * @author zxc
+     * @date 2021/4/21 下午4:08
+     */
+    @Override
+    public List<GetPastTopicListV2ResultDTO> getPastTopicListV2(GetPastTopicListV2FormDTO formDTO) {
+        return null;
+    }
+
     /**
      * @Description  查询用户信息【头像，名字】
      * @Param groupType