From 5215d36c5fcda97d611937cb63878fb0a8c866b1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 06 五月 2021 14:00:03 +0800
Subject: [PATCH] 修复bug

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 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..8d32ba7 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,5 +1,7 @@
 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.vos.LoginUserInfoVO;
@@ -9,6 +11,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,10 +34,18 @@
 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();
@@ -49,6 +60,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 +75,13 @@
     @ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class)
     @PostMapping("pagediscuss")
     public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
-        pageComActDiscussDTO.setCommunityId(this.getCommunityId());
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+        pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId());
+        Integer isMy = pageComActDiscussDTO.getIsMy();
+        if (null!=isMy&&isMy.intValue()==1) {
+            pageComActDiscussDTO.setUserId(loginUserInfo.getUserId());
+        }
+        pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId());
         return communityService.pageDiscussApplets(pageComActDiscussDTO);
     }
 
@@ -89,10 +108,19 @@
         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 = this.getUserId();
+        return communityService.detailDiscussApplets(id,userId);
     }
 
     @ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class)
@@ -102,6 +130,7 @@
         if (null==id||0==id) {
             return R.fail("一起议主键不能为空");
         }
+        pageComActDiscussCommentDTO.setLoginUserId(this.getUserId());
         return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
     }
 
@@ -120,6 +149,19 @@
         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());
+        return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+    }
+
 
 
 

--
Gitblit v1.7.1