From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java |   66 +++++++++++++++++++++++++++++++--
 1 files changed, 62 insertions(+), 4 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 22297c2..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,9 +1,6 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
-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.vos.R;
 import com.panzhihua.service_community.service.ComActActivityService;
 import com.panzhihua.service_community.service.ComActDiscussService;
@@ -115,4 +112,65 @@
         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