From e7e5910f0e7902092cd2e9dd9ae81b88c3ff8d22 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 18 May 2020 16:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=91=E7=9A=84=E8=AF=9D?=
 =?UTF-8?q?=E9=A2=98=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/ApiPropertyController.java    | 15 +++++++++++++++
 .../elink/esua/epdc/service/PropertyService.java  | 11 +++++++++++
 .../epdc/service/impl/PropertyServiceImpl.java    | 10 ++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
index 79034bf..6519e9e 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
@@ -276,4 +276,19 @@ public class ApiPropertyController {
     public Result<EventCommentsResultDTO> listOfComments(@LoginUser TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO) {
         return propertyService.listOfComments(userDetail, topicCommentsFormDTO);
     }
+
+    /**
+     *
+     * 我的话题列表
+     *
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
+     * @author liuchuang
+     * @since 2019/11/11 15:04
+     */
+    @GetMapping("topic/listOfMine")
+    public Result<List<TopicListResultDTO>> listTopicOfMine(@LoginUser TokenDto userDetail, TopicListFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return propertyService.listTopicOfMine(userDetail, formDto);
+    }
 }
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
index 9cfdc9e..71e24c5 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/PropertyService.java
@@ -208,4 +208,15 @@ public interface PropertyService {
      * 评论列表
      */
     Result<EventCommentsResultDTO> listOfComments(TokenDto userDetail, TopicCommentsFormDTO topicCommentsFormDTO);
+
+    /**
+     *
+     * 我的话题列表
+     *
+     * @params [userDetail, formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.topic.result.TopicListResultDTO>>
+     * @author liuchuang
+     * @since 2019/11/11 15:50
+     */
+    Result<List<TopicListResultDTO>> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto);
 }
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
index 1d0dc19..ec71333 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/PropertyServiceImpl.java
@@ -46,11 +46,9 @@ public class PropertyServiceImpl implements PropertyService {
     @Autowired
     private PropertyFeignClient propertyFeignClient;
 
-
     @Autowired
     private WxMaSecCheckTask wxMaSecCheckTask;
 
-
     @Override
     public Result<GroupDetailForMobileEndResultDTO> getGroupDetail(TokenDto userDetail, String id) {
         if (null == userDetail) {
@@ -263,4 +261,12 @@ public class PropertyServiceImpl implements PropertyService {
         return propertyFeignClient.listOfComments(topicCommentsFormDTO);
     }
 
+    @Override
+    public Result<List<TopicListResultDTO>> listTopicOfMine(TokenDto userDetail, TopicListFormDTO formDto) {
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        formDto.setUserId(userDetail.getUserId());
+        return propertyFeignClient.listOfTopic(formDto);
+    }
 }