From cb07aef10f307403e2d8b3249bb9b7de7f3d295f Mon Sep 17 00:00:00 2001 From: huanghongfa <18228131219@163.com> Date: 星期日, 24 一月 2021 13:28:07 +0800 Subject: [PATCH] 评论 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java index c6c2863..e6b1717 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/DiscussApi.java @@ -9,6 +9,7 @@ import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.validated.AddGroup; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; @@ -62,7 +63,13 @@ @ApiOperation(value = "一起议-分页查询",response = ComActDiscussVO.class) @PostMapping("pagediscuss") public R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO) { - pageComActDiscussDTO.setCommunityId(this.getCommunityId()); + LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); + pageComActDiscussDTO.setCommunityId(loginUserInfo.getCommunityId()); + Integer isMy = pageComActDiscussDTO.getIsMy(); + if (null!=isMy&&isMy.intValue()==1) { + pageComActDiscussDTO.setUserId(loginUserInfo.getUserId()); + } + pageComActDiscussDTO.setLoginUserId(loginUserInfo.getUserId()); return communityService.pageDiscussApplets(pageComActDiscussDTO); } @@ -89,10 +96,19 @@ return communityService.putDiscussUser(comActDiscussUserDTO); } + @ApiOperation(value = "一起议-评论-点赞、取消点赞") + @PutMapping("discusscommentuser") + public R putDiscussCommentUser(@RequestBody @Validated ComActDiscussCommentUserDTO comActDiscussUserDTO) { + comActDiscussUserDTO.setUserId(this.getUserId()); + return communityService.putDiscussCommentUser(comActDiscussUserDTO); + } + @ApiOperation(value = "一起议-详情",response = ComActDiscussVO.class) @GetMapping("discuss") + @ApiImplicitParam(name = "id",value = "一起议主键",required = true) public R detailDiscuss(@RequestParam("id") Long id) { - return communityService.detailDiscussApplets(id); + Long userId = this.getUserId(); + return communityService.detailDiscussApplets(id,userId); } @ApiOperation(value = "一起议-评论-分页查询",response = ComActDiscussCommentVO.class) @@ -102,6 +118,7 @@ if (null==id||0==id) { return R.fail("一起议主键不能为空"); } + pageComActDiscussCommentDTO.setLoginUserId(this.getUserId()); return communityService.pageDiscussCommentApplets(pageComActDiscussCommentDTO); } @@ -120,6 +137,19 @@ return communityService.addDiscussCommentBack(comActDiscussCommentDTO); } + @ApiOperation(value = "一起议-投票") + @GetMapping("discussoptionuser") + @ApiImplicitParam(name = "id",value = "一起议选项主键",required = true) + public R addDiscussOptionUser(@RequestParam("id") Long id) { + if (null==id||0==id) { + return R.fail("选项主键不能为空"); + } + ComActDiscussOptionUserDTO comActDiscussOptionUserDTO=new ComActDiscussOptionUserDTO(); + comActDiscussOptionUserDTO.setDiscussOptionId(id); + comActDiscussOptionUserDTO.setUserId(this.getUserId()); + return communityService.addDiscussOptionUser(comActDiscussOptionUserDTO); + } + -- Gitblit v1.7.1