From c1e48a47b39dbd6919bfd9cf2e7023e9f3d6fee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 10:24:21 +0800
Subject: [PATCH] 1105测试代码修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java |  336 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 316 insertions(+), 20 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..9beecb3 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,55 +1,351 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.service_community.service.ComActActivityService;
-import com.panzhihua.service_community.service.ComActDiscussService;
-import lombok.extern.slf4j.Slf4j;
+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 javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_community.service.ComActDiscussService;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
- * @description: 一起议
+ * @description: 议事投票
  * @author: huang.hongfa weixin hhf9596 qq 959656820
  * @create: 2021-01-22 14:52
  **/
 @Slf4j
 @RestController
-@RequestMapping("/discuss/")
+@RequestMapping("/")
 public class DiscussApi {
     @Resource
     private ComActDiscussService comActDiscussService;
 
     /**
-     * 一起议-新增
-     * @param comActDiscussDTO 新增参数
+     * 议事投票-新增
+     * 
+     * @param comActDiscussDTO
+     *            新增参数
      * @return 新增结果
      */
     @PostMapping("adddiscuss")
-    public R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO){
+    public R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO) {
         return comActDiscussService.addDiscuss(comActDiscussDTO);
     }
 
     /**
-     * 一起议-详情
-     * @param id 主键
-     * @return ComActDiscussVO
+     * 议事投票-编辑
+     * @param comActDiscussDTO  请求参数
+     * @return  编辑结果
      */
-    @PostMapping("detaildiscuss")
-    public R detailDiscuss(@RequestParam("id") Long id){
-        return comActDiscussService.detailDiscuss(id);
+    @PostMapping("editdiscuss")
+    public R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO) {
+        return comActDiscussService.editDiscuss(comActDiscussDTO);
     }
 
     /**
-     * 一起议-删除
-     * @param id 主键
+     * 议事投票-详情
+     * 
+     * @param discussDetailDTO
+     *            请求参数
+     * @return ComActDiscussVO
+     */
+    @PostMapping("detaildiscuss")
+    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);
+    }
+
+    /**
+     * 议事投票-删除
+     * 
+     * @param id
+     *            主键
      * @return 删除结果
      */
     @PostMapping("deletediscuss")
-    public R deleteDiscuss(@RequestParam("id") Long id){
+    public R deleteDiscuss(@RequestParam("id") Long id) {
         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 pageComActDiscussDTO
+     *            查询参数
+     * @return ComActDiscussVO
+     */
+    @PostMapping("pagediscussAdmin")
+    public R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
+        return comActDiscussService.pageDiscussAdmin(pageComActDiscussDTO);
+    }
+
+    /**
+     * 议事投票-评论-查看
+     * 
+     * @param id
+     *            主键
+     * @return 详情
+     */
+    @PostMapping("detaildiscusscomment")
+    public R detailDiscusscomment(@RequestParam("id") Long id) {
+        return comActDiscussService.detailDiscusscomment(id);
+    }
+
+    /**
+     * 议事投票评论详情
+     * @param pageComActDiscussCommentDTO   请求参数
+     * @return  议事投票详情
+     */
+    @PostMapping("detaildiscusscommentAdmin")
+    public R detailDiscusscommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+        return comActDiscussService.detailDiscussCommentAdmin(pageComActDiscussCommentDTO);
+    }
+
+    /**
+     * 议事投票-评论-置顶
+     * 
+     * @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 pageComActDiscussCommentDTO
+     *            分页查询参数
+     * @return ComActDiscussCommentVO
+     */
+    @PostMapping("pagediscusscommentAdmin")
+    public R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+        return comActDiscussService.pageDiscussCommentAdmin(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);
+    }
+
+    /**
+     * 议事投票后台公布结果
+     * @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
+     */
+    @PostMapping("discuss/increase-view-num")
+    public void increaseViewNum(@RequestParam("discussId") Long discussId) {
+        comActDiscussService.increaseViewNum(discussId);
+    }
+
+    /**
+     * 公布/编辑一起议投票结果
+     * @param comActDiscussDTO
+     * @return 请求结果
+     */
+    @PostMapping("discuss/edit-result")
+    public R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO) {
+        return comActDiscussService.editDiscussResult(comActDiscussDTO);
+    }
+
+    /**
+     * 定时任务每半小时执行一次将一起议浏览量写入到表中
+     */
+    @PostMapping("discuss/write-view-num")
+    public R timedTaskWriteDiscussViewNumToTable() {
+        return comActDiscussService.writeDiscussViewNumToTable();
+    }
+
+    /**
+     * 一起议获取是否有发布权
+     * @param comActDiscussDTO
+     * @return
+     */
+    @PostMapping("discuss/permissions")
+    public R getDiscussPermissions(@RequestBody ComActDiscussDTO comActDiscussDTO) {
+        return comActDiscussService.getDiscussPermissions(comActDiscussDTO);
+    }
 }

--
Gitblit v1.7.1