From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 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 95f0613..b5bc7dc 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,6 +1,13 @@
package com.panzhihua.applets.api;
-import com.panzhihua.applets.config.WxMaConfiguration;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.*;
@@ -11,16 +18,11 @@
import com.panzhihua.common.model.vos.community.ComActDiscussVO;
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;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -38,11 +40,10 @@
@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("内容违规");
@@ -51,17 +52,17 @@
String voteTitle = comActDiscussDTO.getVoteTitle();
List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
if (type.equals(2)) {
- if(ObjectUtils.isEmpty(voteTitle)){
+ if (ObjectUtils.isEmpty(voteTitle)) {
return R.fail("投票标题不能为空");
}
- if(ObjectUtils.isEmpty(discussOptions)){
+ if (ObjectUtils.isEmpty(discussOptions)) {
return R.fail("选项不能为空");
}
}
String address = comActDiscussDTO.getAddress();
if (ObjectUtils.isEmpty(address)) {
return R.fail("地址不能为空");
- }else if(address.contains("null")){
+ } else if (address.contains("null")) {
comActDiscussDTO.setAddress(null);
}
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -72,17 +73,16 @@
return communityService.addDiscuss(comActDiscussDTO);
}
-
- @ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class)
+ @ApiOperation(value = "一起议-分页查询", response = ComActDiscussVO.class)
@PostMapping("pagediscuss")
public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
Integer isMy = pageComActDiscussDTO.getIsMy();
- if (null!=isMy&&isMy.intValue()==1) {
+ if (null != isMy && isMy.intValue() == 1) {
pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
}
}
@@ -97,12 +97,13 @@
return R.fail("回复不能为空");
}
Long discussId = comActDiscussCommentDTO.getDiscussId();
- if (null==discussId||0==discussId) {
+ if (null == discussId || 0 == discussId) {
return R.fail("一起议主键不能为空");
}
comActDiscussCommentDTO.setUserId(this.getUserId());
- //议事投票计算积分
- AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),this.getUserId());
+ // 议事投票计算积分
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,
+ AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
integralUserDTO.setIsComment(1);
communityService.addIntegralTradeAdmin(integralUserDTO);
return communityService.addDiscussComment(comActDiscussCommentDTO);
@@ -123,28 +124,28 @@
return communityService.putDiscussCommentUser(comActDiscussUserDTO);
}
- @ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class)
+ @ApiOperation(value = "一起议-详情", response = ComActDiscussVO.class)
@GetMapping("discuss")
- @ApiImplicitParam(name = "id",value = "一起议主键",required = true)
+ @ApiImplicitParam(name = "id", value = "一起议主键", required = true)
public R detailDiscuss(@RequestParam("id") Long id) {
Long userId = 0L;
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
- return communityService.detailDiscussApplets(id,userId);
+ return communityService.detailDiscussApplets(id, userId);
}
- @ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class)
+ @ApiOperation(value = "一起议-评论-分页查询", response = ComActDiscussCommentVO.class)
@PostMapping("pagediscusscomment")
public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
Long id = pageComActDiscussCommentDTO.getId();
- if (null==id||0==id) {
+ if (null == id || 0 == id) {
return R.fail("一起议主键不能为空");
}
Long userId = 0L;
LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
- if(loginUserInfo != null){
+ if (loginUserInfo != null) {
userId = loginUserInfo.getUserId();
}
pageComActDiscussCommentDTO.setLoginUserId(userId);
@@ -159,7 +160,7 @@
return R.fail("回复不能为空");
}
Long id = comActDiscussCommentDTO.getId();
- if (null==id||0==id) {
+ if (null == id || 0 == id) {
return R.fail("评论主键不能为空");
}
comActDiscussCommentDTO.setUserId(this.getUserId());
@@ -168,22 +169,20 @@
@ApiOperation(value = "一起议-投票")
@GetMapping("discussoptionuser")
- @ApiImplicitParam(name = "id",value = "一起议选项主键",required = true)
+ @ApiImplicitParam(name = "id", value = "一起议选项主键", required = true)
public R addDiscussOptionUser(@RequestParam("id") Long id) {
- if (null==id||0==id) {
+ if (null == id || 0 == id) {
return R.fail("选项主键不能为空");
}
- ComActDiscussOptionUserDTO comActDiscussOptionUserDTO=new ComActDiscussOptionUserDTO();
+ ComActDiscussOptionUserDTO comActDiscussOptionUserDTO = new ComActDiscussOptionUserDTO();
comActDiscussOptionUserDTO.setDiscussOptionId(id);
comActDiscussOptionUserDTO.setUserId(this.getUserId());
- //议事投票计算积分
- AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(id,AddComActIntegralUserDTO.integralType.cyystp,this.getCommunityId(),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