From f09fa3541ad18c00f30707f592f16d18a0537f77 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 17 八月 2021 21:54:51 +0800
Subject: [PATCH] [新增]添加监控依赖包
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 52fb796..21a30be 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;
@@ -36,11 +34,11 @@
@ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
@PostMapping("pageApp")
public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
- Long communityId = this.getLoginUserInfo().getCommunityId();
- if(communityId == null){
- return R.fail("请先绑定社区");
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
- neighborCircleAppDTO.setCommunityId(communityId);
return communityService.pageNeighborByApp(neighborCircleAppDTO);
}
@@ -65,6 +63,15 @@
@ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
@PostMapping("detail")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+// Long userId = this.getLoginUserInfo().getUserId();
+// if(userId == null){
+// return R.fail("请先登录");
+// }
+// neighborCircleAppDTO.setUserId(userId);
return communityService.neighborDetailByApp(neighborCircleAppDTO);
}
@@ -93,11 +100,15 @@
@ApiOperation(value = "邻里圈转发")
@PostMapping("forward")
public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
- Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
- return R.fail("请先登录");
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ forwardAppDTO.setUserId(loginUserInfo.getUserId());
}
- forwardAppDTO.setUserId(userId);
+// Long userId = this.getLoginUserInfo().getUserId();
+// if(userId == null){
+// return R.fail("请先登录");
+// }
+// forwardAppDTO.setUserId(userId);
return communityService.neighborForwardByApp(forwardAppDTO);
}
@@ -145,5 +156,29 @@
return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
}
+ @ApiOperation(value = "分页查询评论下所有回复",response = ComActNeighborCommentReplyAppVO.class)
+ @PostMapping("comment/reply")
+ public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ commentReplyAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+// 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(@RequestParam("communityId") Long communityId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ communityId = loginUserInfo.getCommunityId();
+ }
+ return communityService.getNeighborTopicByApp(communityId);
+ }
}
--
Gitblit v1.7.1