From 78a900b916f9007e45d45355d6e1de21eb71147e Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期四, 29 四月 2021 13:45:45 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 4 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 a85639e..f35f6b2 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
@@ -1,12 +1,15 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+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.ComActNeighborCircleAppVO;
+import com.panzhihua.common.model.vos.neighbor.ComActNeighborCircleDetailAppVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -29,12 +32,94 @@
private CommunityService communityService;
@ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
- @PostMapping("page")
- public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
- return communityService.pageNeighbor(neighborCircleAppDTO);
+ @PostMapping("pageApp")
+ public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ Long communityId = this.getLoginUserInfo().getCommunityId();
+ if(communityId == null){
+ return R.fail("请先绑定社区");
+ }
+ neighborCircleAppDTO.setCommunityId(communityId);
+ return communityService.pageNeighborByApp(neighborCircleAppDTO);
}
+ @ApiOperation(value = "用户发布邻里圈审核")
+ @PostMapping("addNeighborByApp")
+ public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
+ LoginUserInfoVO loginUser = this.getLoginUserInfo();
+ Long userId = loginUser.getUserId();
+ if(userId == null){
+ return R.fail("请重新登录");
+ }
+ addNeighborCircleAppDTO.setUserId(userId);
+ if(StringUtils.isNotEmpty(loginUser.getPhone())){
+ addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone());
+ }
+ if(loginUser.getCommunityId() != null){
+ addNeighborCircleAppDTO.setCommunityId(loginUser.getCommunityId());
+ }
+ return communityService.addNeighborByApp(addNeighborCircleAppDTO);
+ }
+ @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
+ @PostMapping("neighbor/detail")
+ public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
+ return communityService.neighborDetailByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "分页查询用户邻里圈列表" , response = ComActNeighborCircleAppVO.class)
+ @PostMapping("neighbor/user/page")
+ public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ neighborCircleAppDTO.setUserId(userId);
+ return communityService.neighborExamineByApp(neighborCircleAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈点赞")
+ @PostMapping("neighbor/fabulous")
+ public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ fabulousAppDTO.setUserId(userId);
+ return communityService.neighborFabulousByApp(fabulousAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈转发")
+ @PostMapping("neighbor/forward")
+ public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ forwardAppDTO.setUserId(userId);
+ return communityService.neighborForwardByApp(forwardAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈评论")
+ @PostMapping("neighbor/comment")
+ public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ commentAppDTO.setUserId(userId);
+ return communityService.neighborCommentByApp(commentAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈回复")
+ @PostMapping("neighbor/reply")
+ public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
+ Long userId = this.getLoginUserInfo().getUserId();
+ if(userId == null){
+ return R.fail("请先登录");
+ }
+ replyAppDTO.setUserId(userId);
+ return communityService.neighborReplyByApp(replyAppDTO);
+ }
}
--
Gitblit v1.7.1