From 95bb02bb2389dc4fa62d565560b614c8265eabf8 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 1 Apr 2020 10:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/constant/TopicConstant.java    |  8 ++++++++
 .../topic/result/ResiTopicInfoResultDTO.java  |  2 +-
 .../topic/service/ResiTopicService.java       |  8 ++++++++
 .../service/impl/ResiTopicServiceImpl.java    | 19 +++++++++++++++++--
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java
index 572e22d7ec..6b88d61742 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/constant/TopicConstant.java
@@ -33,5 +33,13 @@ public interface TopicConstant {
      * */
     String CLOSED = "CLOSED";
 
+    /**
+     * 本人发布
+     * */
+    String PUBLISHED_BY_MYSELF = "me";
 
+    /**
+     * 他人发布
+     * */
+    String PUBLISHED_BY_OTHER = "other";
 }
diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
index 6f413f5fc1..09b2cd4e85 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicInfoResultDTO.java
@@ -56,7 +56,7 @@ public class ResiTopicInfoResultDTO  implements Serializable{
     private String gridName;
 
     /**
-     * 是否本人 0不是 1是
+     * 是否本人 me other
      * */
     private String releaseUserFlag;
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
index 2ad4de0fa1..89e9136b62 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
@@ -130,5 +130,13 @@ public interface ResiTopicService extends BaseService<ResiTopicEntity> {
      **/
     Result<List<ResiTopicInfoResultDTO>> getLatestTenTopics(TokenDto tokenDto,String groupId);
 
+    /**
+     * @Description 查看历史话题(分页,允许状态筛选)
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
     Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 8de33ed343..aaafafb722 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -257,16 +257,31 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
         List<ResiTopicInfoResultDTO> lastestTenTopics =
                 baseDao.getLatestTenTopics(groupId);
 
-        //2.遍历放用户信息与网格信息
+        //2.遍历放用户信息
         ResiGroupEntity group = resiGroupDao.selectById(groupId);
         if(null != group && ModuleConstant.DEL_FLAG.equals(group.getDelFlag())){
 
         }
 
+        for(ResiTopicInfoResultDTO obj:lastestTenTopics){
+            if(StringUtils.equals(tokenDto.getUserId(),obj.getUserId())){
+                obj.setReleaseUserFlag(TopicConstant.PUBLISHED_BY_MYSELF);
+            }else{
+                obj.setReleaseUserFlag(TopicConstant.PUBLISHED_BY_OTHER);
+            }
+        }
 
-        return null;
+        return new Result<List<ResiTopicInfoResultDTO>>().ok(lastestTenTopics);
     }
 
+    /**
+     * @Description 查看历史话题(分页,允许状态筛选)
+     * @Param tokenDto
+     * @Param ResiTopicPageFormDTO.class
+     * @return Result<List<ResiTopicInfoResultDTO>>
+     * @Author wangc
+     * @Date 2020.04.01 10:36
+     **/
     @Override
     public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) {