From 61046f00aa8d504372a0fd6f26334846c4ba33dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 25 十一月 2022 15:52:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 172 insertions(+), 8 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..f45977d 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,35 @@
/**
* 议事投票-详情
*
- * @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 ComActDiscussVO
+ */
+ @PostMapping("detaildiscussdesensitize")
+ public R detailDiscussDesensitize(@RequestBody ComActDiscussDetailDTO discussDetailDTO) {
+ return comActDiscussService.detailDiscussDesensitize(discussDetailDTO);
+ }
+
+ /**
+ * 分页查询评论下回复列表
+ * @param discussDetailDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("discussCommentReplyAdmin")
+ public R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO) {
+ return comActDiscussService.discussCommentReplyAdmin(discussDetailDTO);
}
/**
@@ -106,6 +130,26 @@
}
/**
+ * 投票情况-分页查询
+ * @param pageVoteSituationDTO
+ * @return
+ */
+ @PostMapping("pageVoteSituation")
+ public R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO) {
+ return comActDiscussService.pageVoteSituation(pageVoteSituationDTO);
+ }
+
+ /**
+ * 投票情况详情
+ * @param optionUserId
+ * @return
+ */
+ @GetMapping("detailVoteSituation")
+ public R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId) {
+ return comActDiscussService.detailVoteSituation(optionUserId);
+ }
+
+ /**
* 议事投票-评论-查看
*
* @param id
@@ -115,6 +159,16 @@
@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);
}
/**
@@ -154,8 +208,20 @@
}
/**
+ * 议事投票-评论-后台分页查询
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentAdmin")
+ public R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+ return comActDiscussService.pageDiscussCommentAdmin(pageComActDiscussCommentDTO);
+ }
+
+ /**
* 议事投票-分页查询 小程序
- *
+ *
* @param pageComActDiscussDTO
* 查询参数
* @return ComActDiscussVO 分页
@@ -163,6 +229,18 @@
@PostMapping("pagediscussapplets")
public R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
return comActDiscussService.pageDiscussApplets(pageComActDiscussDTO);
+ }
+
+ /**
+ * 议事投票-分页查询 小程序 脱敏
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
+ * @return ComActDiscussVO 分页
+ */
+ @PostMapping("pagediscussappletsdesensitize")
+ public R pageDiscussAppletsDesensitize(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
+ return comActDiscussService.pageDiscussAppletsDesensitize(pageComActDiscussDTO);
}
/**
@@ -188,6 +266,17 @@
public R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
return comActDiscussService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
}
+ /**
+ * 议事投票-评论-分页查询 小程序
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页参数
+ * @return ComActDiscussCommentVO
+ */
+ @PostMapping("pagediscusscommentappletsdesensitize")
+ public R pageDiscussCommentAppletsDesensitize(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
+ return comActDiscussService.pageDiscussCommentAppletsDesensitize(pageComActDiscussCommentDTO);
+ }
/**
* 议事投票-详情 小程序
@@ -204,15 +293,29 @@
}
/**
+ * 议事投票-详情 小程序 脱敏
+ *
+ * @param id
+ * 主键
+ * @param userId
+ * 用户主键
+ * @return ComActDiscussVO
+ */
+ @PostMapping("detaildiscussappletsdesensitize")
+ public R detailDiscussAppletsDesensitize(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ return comActDiscussService.detailDiscussAppletsDesensitize(id, userId);
+ }
+
+ /**
* 议事投票-投票
*
- * @param comActDiscussOptionUserDTO
+ * @param discussVoteOptionDTO
* 投票信息
* @return 投票结果
*/
@PostMapping("adddiscussoptionuser")
- public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO) {
- return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+ public R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO) {
+ return comActDiscussService.addDiscussOptionUser(discussVoteOptionDTO);
}
/**
@@ -226,6 +329,57 @@
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();
+ }
+
/**
* 一起议增加浏览量
@@ -253,4 +407,14 @@
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