From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 d92e333..7b27076 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
@@ -6,10 +6,9 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
-import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
-import com.panzhihua.common.validated.PutGroup;
+import com.panzhihua.common.model.dtos.community.ComActDiscussVoteOptionDTO;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +27,7 @@
import com.panzhihua.common.model.dtos.community.ComActDiscussOptionDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
+import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
@@ -38,6 +38,7 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -201,21 +202,19 @@
@ApiOperation(value = "一起议-投票")
@PostMapping("discussoptionuser")
public R addDiscussOptionUser(@RequestBody @Valid DiscussVoteOptionDTO discussVoteOptionDTO) {
- List<Long> optionIds = discussVoteOptionDTO.getOptionIds();
- if (optionIds.isEmpty()) {
- return R.fail("选项主键不能为空");
+ List<ComActDiscussVoteOptionDTO> options = discussVoteOptionDTO.getOptions();
+ if (options.isEmpty()) {
+ return R.fail("选项内容不能为空");
}
- ComActDiscussOptionUserDTO comActDiscussOptionUserDTO = new ComActDiscussOptionUserDTO();
- comActDiscussOptionUserDTO.setDiscussOptionIds(optionIds);
- comActDiscussOptionUserDTO.setUserId(this.getUserId());
- optionIds.forEach(optionId -> {
+ discussVoteOptionDTO.setUserId(this.getUserId());
+ options.forEach(option -> {
// 议事投票计算积分
- AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(optionId,
+ AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(option.getId(),
AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
integralUserDTO.setIsComment(2);
communityService.addIntegralTradeAdmin(integralUserDTO);
});
- return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+ return communityService.addDiscussOptionUser(discussVoteOptionDTO);
}
@ApiOperation(value = "一起议-增加浏览量")
@@ -232,4 +231,15 @@
comActDiscussDTO.setUserId(this.getUserId());
return communityService.editDiscussResult(comActDiscussDTO);
}
+
+ @ApiOperation(value = "一起议-获取是否有发布权限", response = Boolean.class)
+ @GetMapping("discuss/permissions")
+ public R getDiscussPermissions() {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ ComActDiscussDTO comActDiscussDTO = new ComActDiscussDTO();
+ comActDiscussDTO.setLoginUserInfo(loginUserInfo);
+ comActDiscussDTO.setIsApplets(true);
+ comActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+ return communityService.getDiscussPermissions(comActDiscussDTO);
+ }
}
--
Gitblit v1.7.1