From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 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 ac04a11..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,8 @@
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;
import io.swagger.annotations.Api;
@@ -37,6 +39,11 @@
return R.fail("请先绑定社区");
}
neighborCircleAppDTO.setCommunityId(communityId);
+
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId != null){
+ neighborCircleAppDTO.setUserId(userId);
+ }
return communityService.pageNeighborByApp(neighborCircleAppDTO);
}
@@ -61,6 +68,11 @@
@ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
@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);
}
@@ -141,5 +153,25 @@
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