From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
index 1f1fcfd..cdd7d30 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -6,6 +6,7 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleTopicAppVO;
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCommentReplyAppVO;
 import com.panzhihua.common.service.community.CommunityService;
 import com.panzhihua.common.utlis.StringUtils;
@@ -162,5 +163,15 @@
         commentReplyAppDTO.setUserId(userId);
         return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
     }
+
+    @ApiOperation(value = "查询社区邻里圈话题列表" , response = ComActNeighborCircleTopicAppVO.class)
+    @GetMapping("topic/list")
+    public R getNeighborTopicByApp() {
+        Long communityId = this.getCommunityId();
+        if(communityId == null){
+            return R.fail("请先绑定社区");
+        }
+        return communityService.getNeighborTopicByApp(communityId);
+    }
 }
 

--
Gitblit v1.7.1