From 34e50f2c23ff7cc7f0dbf2a40e3d038b30aec12f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 24 七月 2021 13:47:30 +0800
Subject: [PATCH] 测试社区动态

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java |   72 ++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 11 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 286e8bc..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
@@ -2,14 +2,12 @@
 
 import com.panzhihua.common.controller.BaseController;
 import com.panzhihua.common.model.dtos.neighbor.*;
-import com.panzhihua.common.model.dtos.shop.*;
 import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
-import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleAppVO;
 import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
-import com.panzhihua.common.model.vos.shop.*;
+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;
 import io.swagger.annotations.Api;
@@ -41,6 +39,11 @@
             return R.fail("请先绑定社区");
         }
         neighborCircleAppDTO.setCommunityId(communityId);
+
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId != null){
+            neighborCircleAppDTO.setUserId(userId);
+        }
         return communityService.pageNeighborByApp(neighborCircleAppDTO);
     }
 
@@ -63,13 +66,18 @@
     }
 
     @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
-    @PostMapping("neighbor/detail")
+    @PostMapping("detail")
     public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        neighborCircleAppDTO.setUserId(userId);
         return communityService.neighborDetailByApp(neighborCircleAppDTO);
     }
 
-    @ApiOperation(value = "分页查询用户邻里圈列表" , response = ComActNeighborCircleAppVO.class)
-    @PostMapping("neighbor/user/page")
+    @ApiOperation(value = "分页查询用户邻里圈审核列表" , response = ComActNeighborCircleAppVO.class)
+    @PostMapping("user/page")
     public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
         Long userId = this.getLoginUserInfo().getUserId();
         if(userId == null){
@@ -80,7 +88,7 @@
     }
 
     @ApiOperation(value = "邻里圈点赞")
-    @PostMapping("neighbor/fabulous")
+    @PostMapping("fabulous")
     public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
         Long userId = this.getLoginUserInfo().getUserId();
         if(userId == null){
@@ -91,7 +99,7 @@
     }
 
     @ApiOperation(value = "邻里圈转发")
-    @PostMapping("neighbor/forward")
+    @PostMapping("forward")
     public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
         Long userId = this.getLoginUserInfo().getUserId();
         if(userId == null){
@@ -102,7 +110,7 @@
     }
 
     @ApiOperation(value = "邻里圈评论")
-    @PostMapping("neighbor/comment")
+    @PostMapping("comment")
     public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
         Long userId = this.getLoginUserInfo().getUserId();
         if(userId == null){
@@ -113,7 +121,7 @@
     }
 
     @ApiOperation(value = "邻里圈回复")
-    @PostMapping("neighbor/reply")
+    @PostMapping("reply")
     public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
         Long userId = this.getLoginUserInfo().getUserId();
         if(userId == null){
@@ -123,5 +131,47 @@
         return communityService.neighborReplyByApp(replyAppDTO);
     }
 
+    @ApiOperation(value = "邻里圈取消点赞")
+    @PostMapping("cancel/fabulous")
+    public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        fabulousAppDTO.setUserId(userId);
+        return communityService.neighborFabulousCancelByApp(fabulousAppDTO);
+    }
+
+    @ApiOperation(value = "邻里圈添加浏览记录")
+    @PostMapping("add/browse")
+    public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        addBrowseAppDTO.setUserId(userId);
+        return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
+    }
+
+    @ApiOperation(value = "分页查询评论下所有回复",response = ComActNeighborCommentReplyAppVO.class)
+    @PostMapping("comment/reply")
+    public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
+        Long userId = this.getLoginUserInfo().getUserId();
+        if(userId == null){
+            return R.fail("请先登录");
+        }
+        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