From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001 From: huanghongfa <18228131219@163.com> Date: 星期一, 01 二月 2021 16:37:52 +0800 Subject: [PATCH] auth --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java index 5ec4711..8c55dba 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java @@ -2,13 +2,18 @@ import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.PageDTO; +import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO; +import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; +import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO; +import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO; import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; import com.panzhihua.common.model.vos.community.ComActMicroWishVO; import com.panzhihua.common.model.vos.user.NoticeUnReadVO; +import com.panzhihua.common.model.vos.user.SysUserAgreementVO; import com.panzhihua.common.model.vos.user.SysUserNoticeVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.user.UserService; @@ -46,11 +51,9 @@ if (null==communityId||0==communityId) { return R.fail("用户未绑定社区"); } - Long userId = loginUserInfo.getUserId(); comActEasyPhotoVO.setCommunityId(communityId); - comActEasyPhotoVO.setStatus(4); - comActEasyPhotoVO.setLogInUserId(userId); - return communityService.pageEasyPhoto(comActEasyPhotoVO); + comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId()); + return communityService.pageEasyPhotoApplets(comActEasyPhotoVO); } @ApiOperation("上传随手拍") @@ -74,6 +77,27 @@ public R detailEasyPhoto (@RequestParam("id") Long id){ Long userId = this.getUserId(); return communityService.detailEasyPhoto(id,userId); + } + + @ApiOperation(value = "随手拍--评论--分页查询",response = ComActEasyPhotoCommentVO.class ) + @PostMapping("pagecomacteasyphotocomment") + public R pageComActEasyPhotoComment (@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO){ + pageComActEasyPhotoCommentDTO.setUserId(this.getUserId()); + return communityService.pageComActEasyPhotoComment(pageComActEasyPhotoCommentDTO); + } + + @ApiOperation(value = "随手拍--评论--新增评论") + @PostMapping("comacteasyphotocomment") + public R addComActEasyPhotoComment (@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO){ + comActEasyPhotoCommentDTO.setUserId(this.getUserId()); + return communityService.addComActEasyPhotoComment(comActEasyPhotoCommentDTO); + } + + @ApiOperation(value = "随手拍--评论--点赞/取消点赞" ) + @PostMapping("commentsign") + public R commentSign (@RequestBody ComActEasyPhotoCommentUserDTO comActEasyPhotoCommentUserDTO){ + comActEasyPhotoCommentUserDTO.setUserId(this.getUserId()); + return communityService.commentSign(comActEasyPhotoCommentUserDTO); } @ApiOperation("点赞/取消点赞随手拍") @@ -105,6 +129,7 @@ comActMicroWishVO.setCommunityId(communityId); comActMicroWishVO.setIsApplets(1); comActMicroWishVO.setResponsibleId(userId);//责任人暂时放登录用户id + comActMicroWishVO.setIsPageMyWish(null); return communityService.pageMicroWish(comActMicroWishVO); } @@ -177,4 +202,11 @@ return userService.noticeUnreadNum(userId); } + @ApiOperation(value = "获取各种协议",response = SysUserAgreementVO.class) + @GetMapping("agreement") + @ApiImplicitParam(name = "type",value = "1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策") + public R agreement (@RequestParam("type")Integer type){ + return userService.agreement(type); + } + } -- Gitblit v1.7.1