From d568205ae121b69364720d3b13e19df69426909e Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 23 四月 2021 16:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java |  125 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
index 1b4e494..5279264 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
@@ -1,6 +1,6 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
+import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.service_community.service.ComActActivityService;
 import com.panzhihua.service_community.service.ComActDiscussService;
@@ -17,7 +17,7 @@
  **/
 @Slf4j
 @RestController
-@RequestMapping("/discuss/")
+@RequestMapping("/")
 public class DiscussApi {
     @Resource
     private ComActDiscussService comActDiscussService;
@@ -52,4 +52,125 @@
         return comActDiscussService.deleteDiscuss(id);
     }
 
+    /**
+     * 一起议-回复
+     * @param comActDiscussCommentDTO 评论内容
+     * @return 回复结果
+     */
+    @PostMapping("adddiscusscomment")
+    public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO){
+        return comActDiscussService.addDiscussComment(comActDiscussCommentDTO);
+    }
+
+    /**
+     * 一起议-分页查询
+     * @param pageComActDiscussDTO 查询参数
+     * @return ComActDiscussVO
+     */
+    @PostMapping("pagediscuss")
+    public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO){
+        return comActDiscussService.pageDiscuss(pageComActDiscussDTO);
+    }
+
+    /**
+     * 一起议-评论-查看
+     * @param id 主键
+     * @return 详情
+     */
+    @PostMapping("detaildiscusscomment")
+    public R detailDiscusscomment(@RequestParam("id") Long id){
+        return comActDiscussService.detailDiscusscomment(id);
+    }
+
+    /**
+     * 一起议-评论-置顶
+     * @param id 主键
+     * @return 置顶结果
+     */
+    @PostMapping("putdiscusscommenttop")
+    R putDiscussCommentTop(@RequestParam("id") Long id){
+        return comActDiscussService.putDiscussCommentTop(id);
+    }
+
+    /**
+     * 一起议-评论-回复
+     * @param comActDiscussCommentDTO 回复内容
+     * @return  回复结果
+     */
+    @PostMapping("adddiscusscommentback")
+    public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO){
+        return comActDiscussService.addDiscussCommentBack(comActDiscussCommentDTO);
+    }
+
+    /**
+     * 一起议-评论-分页查询
+     * @param pageComActDiscussCommentDTO 分页查询参数
+     * @return  ComActDiscussCommentVO
+     */
+    @PostMapping("pagediscusscomment")
+    public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO){
+        return comActDiscussService.pageDiscussComment(pageComActDiscussCommentDTO);
+    }
+
+    /**
+     * 一起议-分页查询 小程序
+     * @param pageComActDiscussDTO 查询参数
+     * @return ComActDiscussVO 分页
+     */
+    @PostMapping("pagediscussapplets")
+    public R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO){
+        return comActDiscussService.pageDiscussApplets(pageComActDiscussDTO);
+    }
+
+    /**
+     * 一起议-点赞、取消点赞
+     * @param comActDiscussUserDTO 操作类型
+     * @return 操作结果
+     */
+    @PostMapping("putdiscussuser")
+    public R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO){
+        return comActDiscussService.putDiscussUser(comActDiscussUserDTO);
+    }
+
+    /**
+     * 一起议-评论-分页查询 小程序
+     * @param pageComActDiscussCommentDTO 分页参数
+     * @return ComActDiscussCommentVO
+     */
+    @PostMapping("pagediscusscommentapplets")
+    public R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO){
+        return comActDiscussService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
+    }
+
+    /**
+     * 一起议-详情 小程序
+     * @param id 主键
+     * @param userId 用户主键
+     * @return ComActDiscussVO
+     */
+    @PostMapping("detaildiscussapplets")
+    public R detailDiscussApplets(@RequestParam("id") Long id,@RequestParam("userId")Long userId){
+        return comActDiscussService.detailDiscussApplets(id,userId);
+    }
+
+    /**
+     * 一起议-投票
+     * @param comActDiscussOptionUserDTO 投票信息
+     * @return 投票结果
+     */
+    @PostMapping("adddiscussoptionuser")
+    public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO){
+        return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+    }
+
+    /**
+     * 一起议-评论-点赞、取消点赞
+     * @param comActDiscussUserDTO 评论点赞
+     * @return 点赞结果
+     */
+    @PostMapping("putdiscusscommentuser")
+    public R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO){
+        return comActDiscussService.putDiscussCommentUser(comActDiscussUserDTO);
+    }
+
 }

--
Gitblit v1.7.1