From 0590944f5d4a4f93af2a4c9241f0e154a9f41c08 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 23 十一月 2021 17:05:45 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java | 140 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 39 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 21a30be..3df433d 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,5 +1,11 @@
package com.panzhihua.applets.api;
+import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.NeighborCircleConstants;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -10,12 +16,10 @@
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
@@ -30,12 +34,14 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
- @ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
+ @ApiOperation(value = "分页查询邻里圈列表", response = ComActNeighborCircleAppVO.class)
@PostMapping("pageApp")
public R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
neighborCircleAppDTO.setCommunityId(loginUserInfo.getCommunityId());
neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
@@ -47,39 +53,66 @@
public R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO) {
LoginUserInfoVO loginUser = this.getLoginUserInfo();
Long userId = loginUser.getUserId();
+ Long communityId = loginUser.getCommunityId();
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){
- addNeighborCircleAppDTO.setCommunityId(loginUser.getCommunityId());
+ if(communityId != null){
+ addNeighborCircleAppDTO.setCommunityId(communityId);
}
+
+ //查询社区自动审核是否开着
+ String key = NeighborCircleConstants.NEIGHBOR_CIRCLE_AUTO_EXAMINE;
+ R isOk = communityService.getSysConfValue(key + communityId,communityId);
+ if(R.isOk(isOk)){
+ if(isOk.getData() != null){
+ String value = isOk.getData().toString();
+ if(value.equals("1")){
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ String msg = addNeighborCircleAppDTO.getReleaseContent();
+ if (checkService.checkMessage(msg)) {
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }else{
+ addNeighborCircleAppDTO.setWxExamineResult(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ }else{
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+ }else{
+ communityService.addSysConfValue(key + communityId,communityId,"社区邻里圈自动审核参数","1");
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.no);
+ }
+ }else{
+ addNeighborCircleAppDTO.setIsExamine(AddComActNeighborCircleAppDTO.isExamine.yes);
+ }
+
return communityService.addNeighborByApp(addNeighborCircleAppDTO);
}
- @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class)
+ @ApiOperation(value = "查询邻里圈详情", response = ComActNeighborCircleDetailAppVO.class)
@PostMapping("detail")
public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
neighborCircleAppDTO.setUserId(loginUserInfo.getUserId());
}
-// Long userId = this.getLoginUserInfo().getUserId();
-// if(userId == null){
-// return R.fail("请先登录");
-// }
-// neighborCircleAppDTO.setUserId(userId);
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // neighborCircleAppDTO.setUserId(userId);
return communityService.neighborDetailByApp(neighborCircleAppDTO);
}
- @ApiOperation(value = "分页查询用户邻里圈审核列表" , response = ComActNeighborCircleAppVO.class)
+ @ApiOperation(value = "分页查询用户邻里圈审核列表", response = ComActNeighborCircleAppVO.class)
@PostMapping("user/page")
public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请先登录");
}
neighborCircleAppDTO.setUserId(userId);
@@ -90,7 +123,7 @@
@PostMapping("fabulous")
public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请先登录");
}
fabulousAppDTO.setUserId(userId);
@@ -101,14 +134,14 @@
@PostMapping("forward")
public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
forwardAppDTO.setUserId(loginUserInfo.getUserId());
}
-// Long userId = this.getLoginUserInfo().getUserId();
-// if(userId == null){
-// return R.fail("请先登录");
-// }
-// forwardAppDTO.setUserId(userId);
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // forwardAppDTO.setUserId(userId);
return communityService.neighborForwardByApp(forwardAppDTO);
}
@@ -116,7 +149,7 @@
@PostMapping("comment")
public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请先登录");
}
commentAppDTO.setUserId(userId);
@@ -127,7 +160,7 @@
@PostMapping("reply")
public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请先登录");
}
replyAppDTO.setUserId(userId);
@@ -138,7 +171,7 @@
@PostMapping("cancel/fabulous")
public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请先登录");
}
fabulousAppDTO.setUserId(userId);
@@ -149,36 +182,65 @@
@PostMapping("add/browse")
public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) {
Long userId = this.getLoginUserInfo().getUserId();
- if(userId == null){
+ if (userId == null) {
return R.fail("请先登录");
}
addBrowseAppDTO.setUserId(userId);
return communityService.neighborAddBrowseByApp(addBrowseAppDTO);
}
- @ApiOperation(value = "分页查询评论下所有回复",response = ComActNeighborCommentReplyAppVO.class)
+ @ApiOperation(value = "分页查询评论下所有回复", response = ComActNeighborCommentReplyAppVO.class)
@PostMapping("comment/reply")
public R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
commentReplyAppDTO.setUserId(loginUserInfo.getUserId());
}
-// Long userId = this.getLoginUserInfo().getUserId();
-// if(userId == null){
-// return R.fail("请先登录");
-// }
-// commentReplyAppDTO.setUserId(userId);
+ // Long userId = this.getLoginUserInfo().getUserId();
+ // if(userId == null){
+ // return R.fail("请先登录");
+ // }
+ // commentReplyAppDTO.setUserId(userId);
return communityService.neighborCommentReplyByApp(commentReplyAppDTO);
}
- @ApiOperation(value = "查询社区邻里圈话题列表" , response = ComActNeighborCircleTopicAppVO.class)
+ @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
@GetMapping("topic/list")
- public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId) {
+ public R getNeighborTopicByApp(@RequestParam("communityId") Long communityId
+ ,@RequestParam(value = "isZero",defaultValue = "2",required = false) Integer isZero
+ ,@RequestParam(value = "name",defaultValue = "",required = false) String name) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
communityId = loginUserInfo.getCommunityId();
}
- return communityService.getNeighborTopicByApp(communityId);
+ if(isZero == null){
+ isZero = 2;
+ }
+ return communityService.getNeighborTopicByApp(communityId,isZero,name);
+ }
+
+ @ApiOperation(value = "用户新增邻里圈话题")
+ @PostMapping("topic/add")
+ public R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo == null){
+ return R.fail(401,"请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.addNeighborTopicByApp(circleTopicAppDTO);
+ }
+
+ @ApiOperation(value = "用户删除邻里圈")
+ @PostMapping("delete")
+ public R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo == null){
+ return R.fail(401,"请先登录");
+ }
+ circleTopicAppDTO.setUserId(loginUserInfo.getUserId());
+ circleTopicAppDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.deleteNeighborByApp(circleTopicAppDTO);
}
}
--
Gitblit v1.7.1