From 1aa70f3b0a1411d0de3f4ca78b639bf065168be2 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 10 九月 2021 18:29:10 +0800
Subject: [PATCH] Merge branch 'zzj' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into discuss

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java |   93 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 89 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 516f58e..8ac1930 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
@@ -2,6 +2,8 @@
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
+import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
 import org.springframework.web.bind.annotation.*;
 
 import com.panzhihua.common.model.dtos.community.*;
@@ -48,13 +50,23 @@
     /**
      * 议事投票-详情
      * 
-     * @param id
-     *            主键
+     * @param discussDetailDTO
+     *            请求参数
      * @return ComActDiscussVO
      */
     @PostMapping("detaildiscuss")
-    public R detailDiscuss(@RequestParam("id") Long id) {
-        return comActDiscussService.detailDiscuss(id);
+    public R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO) {
+        return comActDiscussService.detailDiscuss(discussDetailDTO);
+    }
+
+    /**
+     * 分页查询评论下回复列表
+     * @param discussDetailDTO  请求参数
+     * @return  回复列表
+     */
+    @PostMapping("discussCommentReplyAdmin")
+    public R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO) {
+        return comActDiscussService.discussCommentReplyAdmin(discussDetailDTO);
     }
 
     /**
@@ -118,6 +130,16 @@
     }
 
     /**
+     * 议事投票评论详情
+     * @param pageComActDiscussCommentDTO   请求参数
+     * @return  议事投票详情
+     */
+    @PostMapping("detaildiscusscommentAdmin")
+    public R detailDiscusscommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+        return comActDiscussService.detailDiscussCommentAdmin(pageComActDiscussCommentDTO);
+    }
+
+    /**
      * 议事投票-评论-置顶
      * 
      * @param id
@@ -151,6 +173,18 @@
     @PostMapping("pagediscusscomment")
     public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
         return comActDiscussService.pageDiscussComment(pageComActDiscussCommentDTO);
+    }
+
+    /**
+     * 议事投票-评论-后台分页查询
+     *
+     * @param pageComActDiscussCommentDTO
+     *            分页查询参数
+     * @return ComActDiscussCommentVO
+     */
+    @PostMapping("pagediscusscommentAdmin")
+    public R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+        return comActDiscussService.pageDiscussCommentAdmin(pageComActDiscussCommentDTO);
     }
 
     /**
@@ -228,6 +262,57 @@
     }
 
     /**
+     * 议事投票后台公布结果
+     * @param publishResultDTO  请求参数
+     * @return  公布结果
+     */
+    @PostMapping("publishResultAdmin")
+    public R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO) {
+        return comActDiscussService.publishResultAdmin(publishResultDTO);
+    }
+
+    /**
+     * 议事投票-评论/回复删除
+     * @param id    评论/回复id
+     * @return  删除结果
+     */
+    @GetMapping("deleteDiscussCommentAdmin")
+    public R deleteDiscussCommentAdmin(@RequestParam("id") Long id) {
+        return comActDiscussService.deleteDiscussCommentAdmin(id);
+    }
+
+    /**
+     * 查询社区可发布议事投票权限配置
+     * @param communityId   社区id
+     * @return  社区可发布议事投票权限配置
+     */
+    @GetMapping("discussJurisdictionGet")
+    public R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId) {
+        return comActDiscussService.discussJurisdictionGet(communityId,userId);
+    }
+
+    /**
+     * 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员)
+     * @param communityId   社区id
+     * @param value 需要设置的参数值
+     * @return  设置结果
+     */
+    @GetMapping("discussJurisdictionSet")
+    public R discussJurisdictionSet(@RequestParam("communityId") Long communityId,@RequestParam("value") String value) {
+        return comActDiscussService.discussJurisdictionSet(communityId,value);
+    }
+
+    /**
+     * 议事投票检测状态定时任务
+     * @return  执行结果
+     */
+    @GetMapping("timedTaskDiscussInspectStatus")
+    public R timedTaskDiscussInspectStatus() {
+        return comActDiscussService.timedTaskDiscussInspectStatus();
+    }
+
+
+    /**
      * 一起议增加浏览量
      * @param discussId 一起议主键id
      */

--
Gitblit v1.7.1