From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
index c6c2863..95f0613 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java
@@ -1,7 +1,10 @@
package com.panzhihua.applets.api;
+import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
@@ -9,6 +12,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
@@ -31,14 +35,22 @@
public class DiscussApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
+
@ApiOperation(value = "一起议-新增")
@PostMapping("discuss")
public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) {
+// 微信内容审核
+ String discussSubject = comActDiscussDTO.getDiscussSubject();
+ if (!checkService.checkMessage(discussSubject)) {
+ return R.fail("内容违规");
+ }
Integer type = comActDiscussDTO.getType();
String voteTitle = comActDiscussDTO.getVoteTitle();
- List<String> discussOptions = comActDiscussDTO.getDiscussOptions();
- if (type.intValue()==2 ) {
+ List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
+ if (type.equals(2)) {
if(ObjectUtils.isEmpty(voteTitle)){
return R.fail("投票标题不能为空");
}
@@ -49,6 +61,8 @@
String address = comActDiscussDTO.getAddress();
if (ObjectUtils.isEmpty(address)) {
return R.fail("地址不能为空");
+ }else if(address.contains("null")){
+ comActDiscussDTO.setAddress(null);
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
@@ -62,7 +76,16 @@
@ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class)
@PostMapping("pagediscuss")
public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
- pageComActDiscussDTO.setCommunityId(this.getCommunityId());
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+ pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
+
+ Integer isMy = pageComActDiscussDTO.getIsMy();
+ if (null!=isMy&&isMy.intValue()==1) {
+ pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+ }
+ }
return communityService.pageDiscussApplets(pageComActDiscussDTO);
}
@@ -78,6 +101,10 @@
return R.fail("一起议主键不能为空");
}
comActDiscussCommentDTO.setUserId(this.getUserId());
+ //议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+ integralUserDTO.setIsComment(1);
+ communityService.addIntegralTradeAdmin(integralUserDTO);
return communityService.addDiscussComment(comActDiscussCommentDTO);
}
@@ -89,10 +116,23 @@
return communityService.putDiscussUser(comActDiscussUserDTO);
}
+ @ApiOperation(value = "一起议-评论-点赞、取消点赞")
+ @PutMapping("discusscommentuser")
+ public R putDiscussCommentUser(@RequestBody @Validated ComActDiscussCommentUserDTO comActDiscussUserDTO) {
+ comActDiscussUserDTO.setUserId(this.getUserId());
+ return communityService.putDiscussCommentUser(comActDiscussUserDTO);
+ }
+
@ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class)
@GetMapping("discuss")
+ @ApiImplicitParam(name = "id",value = "一起议主键",required = true)
public R detailDiscuss(@RequestParam("id") Long id) {
- return communityService.detailDiscussApplets(id);
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ return communityService.detailDiscussApplets(id,userId);
}
@ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class)
@@ -102,6 +142,12 @@
if (null==id||0==id) {
return R.fail("一起议主键不能为空");
}
+ Long userId = 0L;
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if(loginUserInfo != null){
+ userId = loginUserInfo.getUserId();
+ }
+ pageComActDiscussCommentDTO.setLoginUserId(userId);
return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
}
@@ -120,6 +166,23 @@
return communityService.addDiscussCommentBack(comActDiscussCommentDTO);
}
+ @ApiOperation(value = "一起议-投票")
+ @GetMapping("discussoptionuser")
+ @ApiImplicitParam(name = "id",value = "一起议选项主键",required = true)
+ public R addDiscussOptionUser(@RequestParam("id") Long id) {
+ if (null==id||0==id) {
+ return R.fail("选项主键不能为空");
+ }
+ ComActDiscussOptionUserDTO comActDiscussOptionUserDTO=new ComActDiscussOptionUserDTO();
+ comActDiscussOptionUserDTO.setDiscussOptionId(id);
+ comActDiscussOptionUserDTO.setUserId(this.getUserId());
+ //议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(id,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+ integralUserDTO.setIsComment(2);
+ communityService.addIntegralTradeAdmin(integralUserDTO);
+ return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+ }
+
--
Gitblit v1.7.1