From 85d4b0a96e53f57d9598a89f46029e1fb7d074df Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 16:06:39 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 87 +++++++++++++++++++++++--------------------
1 files changed, 46 insertions(+), 41 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 6078cc6..a02cc53 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,33 +1,10 @@
package com.panzhihua.applets.api;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-import javax.annotation.Resource;
-import javax.validation.Valid;
-
-import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
+import cn.hutool.core.util.StrUtil;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
-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.*;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -37,12 +14,20 @@
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;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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 javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -63,11 +48,25 @@
@ApiOperation(value = "一起议-新增")
@PostMapping("discuss")
public R addDiscuss(@RequestBody @Validated(AddGroup.class) ComActDiscussDTO comActDiscussDTO) {
+ String openid = this.getLoginUserInfo().getOpenid();
+ String appId = this.getAppId();
// 微信内容审核
String discussSubject = comActDiscussDTO.getDiscussSubject();
- if (!checkService.checkMessage(discussSubject)) {
- return R.fail("内容违规");
+ if (StrUtil.isNotBlank(discussSubject)) {
+ String result = checkService.checkMessageBy(discussSubject, openid, appId);
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
}
+
+ //微信图片审核
+ String photoPah = comActDiscussDTO.getPhotoPah();
+ if (StrUtil.isNotBlank(photoPah)) {
+ if (!checkService.checkImageBy(photoPah, appId)) {
+ return R.fail(501, "上传图片存在违规信息");
+ }
+ }
+
Integer type = comActDiscussDTO.getType();
String voteTitle = comActDiscussDTO.getVoteTitle();
List<ComActDiscussOptionDTO> discussOptions = comActDiscussDTO.getDiscussOptions();
@@ -130,10 +129,14 @@
if (null == discussId || 0 == discussId) {
return R.fail("一起议主键不能为空");
}
+ String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
comActDiscussCommentDTO.setUserId(this.getUserId());
// 议事投票计算积分
AddComActIntegralUserDTO integralUserDTO = new AddComActIntegralUserDTO(discussId,
- AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
+ AddComActIntegralUserDTO.integralType.cyystp, this.getCommunityId(), this.getUserId());
integralUserDTO.setIsComment(1);
communityService.addIntegralTradeAdmin(integralUserDTO);
return communityService.addDiscussComment(comActDiscussCommentDTO);
@@ -193,6 +196,10 @@
if (null == id || 0 == id) {
return R.fail("评论主键不能为空");
}
+ String result = checkService.checkMessageBy(comment, this.getLoginUserInfo().getOpenid(), this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
comActDiscussCommentDTO.setUserId(this.getUserId());
return communityService.addDiscussCommentBack(comActDiscussCommentDTO);
}
@@ -200,28 +207,26 @@
@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 = "一起议-增加浏览量")
@PostMapping("discuss/increase-view-num")
public void increaseViewNum(@RequestParam("discussId")
- @ApiParam(value = "一起议主键id", required = true)
- Long discussId) {
+ @ApiParam(value = "一起议主键id", required = true)
+ Long discussId) {
communityService.increaseViewNum(discussId);
}
--
Gitblit v1.7.1