From 8e2d30fd6ac9c8cd3ee6d68c8fd575848f37390d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 31 八月 2021 10:42:13 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 150 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 131 insertions(+), 19 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 3b28c81..4a37f51 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,23 +1,23 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
-import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
-import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
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.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;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
* @auther lyq
@@ -33,14 +33,14 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
+ @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);
}
@@ -49,25 +49,137 @@
public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
LoginUserInfoVO loginUser = this.getLoginUserInfo();
Long userId = loginUser.getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请重新登录");
}
addNeighborCircleAppDTO.setUserId(userId);
- if(StringUtils.isNotEmpty(loginUser.getPhone())){
+ if (StringUtils.isNotEmpty(loginUser.getPhone())) {
addNeighborCircleAppDTO.setPhone(this.getLoginUserInfo().getPhone());
}
- if(loginUser.getCommunityId() != null){
+ if (loginUser.getCommunityId() != null) {
addNeighborCircleAppDTO.setCommunityId(loginUser.getCommunityId());
}
return communityService.addNeighborByApp(addNeighborCircleAppDTO);
}
- @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
- @PostMapping("neighbor/detail")
+ @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);
}
+ @ApiOperation(value = "分页查询用户邻里圈审核列表", response = ComActNeighborCircleAppVO.class)
+ @PostMapping("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("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("forward")
+ public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ forwardAppDTO.setUserId(loginUserInfo.getUserId());
+ }
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // forwardAppDTO.setUserId(userId);
+ return communityService.neighborForwardByApp(forwardAppDTO);
+ }
+
+ @ApiOperation(value = "邻里圈评论")
+ @PostMapping("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("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);
+ }
+
+ @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) {
+ 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