From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java | 112 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 40 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 5279264..c3b9cee 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,13 +1,14 @@
package com.panzhihua.service_community.api;
-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;
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+
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
@@ -24,152 +25,183 @@
/**
* 一起议-新增
- * @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 主键
+ *
+ * @param id
+ * 主键
* @return ComActDiscussVO
*/
@PostMapping("detaildiscuss")
- public R detailDiscuss(@RequestParam("id") Long id){
+ public R detailDiscuss(@RequestParam("id") Long id) {
return comActDiscussService.detailDiscuss(id);
}
/**
* 一起议-删除
- * @param id 主键
+ *
+ * @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 评论内容
+ *
+ * @param comActDiscussCommentDTO
+ * 评论内容
* @return 回复结果
*/
@PostMapping("adddiscusscomment")
- public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO){
+ public R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
return comActDiscussService.addDiscussComment(comActDiscussCommentDTO);
}
/**
* 一起议-分页查询
- * @param pageComActDiscussDTO 查询参数
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
* @return ComActDiscussVO
*/
@PostMapping("pagediscuss")
- public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO){
+ public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
return comActDiscussService.pageDiscuss(pageComActDiscussDTO);
}
/**
* 一起议-评论-查看
- * @param id 主键
+ *
+ * @param id
+ * 主键
* @return 详情
*/
@PostMapping("detaildiscusscomment")
- public R detailDiscusscomment(@RequestParam("id") Long id){
+ public R detailDiscusscomment(@RequestParam("id") Long id) {
return comActDiscussService.detailDiscusscomment(id);
}
/**
* 一起议-评论-置顶
- * @param id 主键
+ *
+ * @param id
+ * 主键
* @return 置顶结果
*/
@PostMapping("putdiscusscommenttop")
- R putDiscussCommentTop(@RequestParam("id") Long id){
+ R putDiscussCommentTop(@RequestParam("id") Long id) {
return comActDiscussService.putDiscussCommentTop(id);
}
/**
* 一起议-评论-回复
- * @param comActDiscussCommentDTO 回复内容
- * @return 回复结果
+ *
+ * @param comActDiscussCommentDTO
+ * 回复内容
+ * @return 回复结果
*/
@PostMapping("adddiscusscommentback")
- public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO){
+ public R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO) {
return comActDiscussService.addDiscussCommentBack(comActDiscussCommentDTO);
}
/**
* 一起议-评论-分页查询
- * @param pageComActDiscussCommentDTO 分页查询参数
- * @return ComActDiscussCommentVO
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页查询参数
+ * @return ComActDiscussCommentVO
*/
@PostMapping("pagediscusscomment")
- public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO){
+ public R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
return comActDiscussService.pageDiscussComment(pageComActDiscussCommentDTO);
}
/**
* 一起议-分页查询 小程序
- * @param pageComActDiscussDTO 查询参数
+ *
+ * @param pageComActDiscussDTO
+ * 查询参数
* @return ComActDiscussVO 分页
*/
@PostMapping("pagediscussapplets")
- public R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO){
+ public R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) {
return comActDiscussService.pageDiscussApplets(pageComActDiscussDTO);
}
/**
* 一起议-点赞、取消点赞
- * @param comActDiscussUserDTO 操作类型
+ *
+ * @param comActDiscussUserDTO
+ * 操作类型
* @return 操作结果
*/
@PostMapping("putdiscussuser")
- public R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO){
+ public R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO) {
return comActDiscussService.putDiscussUser(comActDiscussUserDTO);
}
/**
* 一起议-评论-分页查询 小程序
- * @param pageComActDiscussCommentDTO 分页参数
+ *
+ * @param pageComActDiscussCommentDTO
+ * 分页参数
* @return ComActDiscussCommentVO
*/
@PostMapping("pagediscusscommentapplets")
- public R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO){
+ public R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO) {
return comActDiscussService.pageDiscussCommentApplets(pageComActDiscussCommentDTO);
}
/**
* 一起议-详情 小程序
- * @param id 主键
- * @param userId 用户主键
+ *
+ * @param id
+ * 主键
+ * @param userId
+ * 用户主键
* @return ComActDiscussVO
*/
@PostMapping("detaildiscussapplets")
- public R detailDiscussApplets(@RequestParam("id") Long id,@RequestParam("userId")Long userId){
- return comActDiscussService.detailDiscussApplets(id,userId);
+ public R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ return comActDiscussService.detailDiscussApplets(id, userId);
}
/**
* 一起议-投票
- * @param comActDiscussOptionUserDTO 投票信息
+ *
+ * @param comActDiscussOptionUserDTO
+ * 投票信息
* @return 投票结果
*/
@PostMapping("adddiscussoptionuser")
- public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO){
+ public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO) {
return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
}
/**
* 一起议-评论-点赞、取消点赞
- * @param comActDiscussUserDTO 评论点赞
+ *
+ * @param comActDiscussUserDTO
+ * 评论点赞
* @return 点赞结果
*/
@PostMapping("putdiscusscommentuser")
- public R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO){
+ public R putDiscussCommentUser(@RequestBody ComActDiscussCommentUserDTO comActDiscussUserDTO) {
return comActDiscussService.putDiscussCommentUser(comActDiscussUserDTO);
}
--
Gitblit v1.7.1