From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期二, 16 八月 2022 19:08:32 +0800 Subject: [PATCH] 服务范围优化 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 372 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 314 insertions(+), 58 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 e2e724e..0b7f25b 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 @@ -1,27 +1,43 @@ package com.panzhihua.applets.api; +import javax.annotation.Resource; + +import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto; +import com.panzhihua.common.model.dtos.common.EvaluateEasyDto; +import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto; +import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo; +import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO; +import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign; +import com.panzhihua.common.service.community.ComActEasyPhotoHandlerFeign; +import org.springframework.util.ObjectUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import com.panzhihua.applets.weixin.CheckService; +import com.panzhihua.common.constants.Constants; import com.panzhihua.common.controller.BaseController; +import com.panzhihua.common.model.dtos.CommonDTO; import com.panzhihua.common.model.dtos.PageDTO; +import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO; +import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; +import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO; 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.ComActEasyPhotoVO; -import com.panzhihua.common.model.vos.community.ComActMicroWishVO; +import com.panzhihua.common.model.vos.community.*; +import com.panzhihua.common.model.vos.community.easyPhoto.ComActEasyPhotoClassifyVO; 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; import com.panzhihua.common.validated.AddGroup; import com.panzhihua.common.validated.PageGroup; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.springframework.util.ObjectUtils; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -37,28 +53,34 @@ private CommunityService communityService; @Resource private UserService userService; + @Resource + private CheckService checkService; + @Resource + private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign; - @ApiOperation(value = "分页展示社区随手拍",response = ComActEasyPhotoVO.class) + @ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class) @PostMapping("pageeasyphoto") - public R pageEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ - LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); - Long communityId = loginUserInfo.getCommunityId(); - if (null==communityId||0==communityId) { - return R.fail("用户未绑定社区"); + public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + comActEasyPhotoVO.setCommunityId(loginUserInfo.getCommunityId()); + comActEasyPhotoVO.setLogInUserId(loginUserInfo.getUserId()); + comActEasyPhotoVO.setIsDpcMember(loginUserInfo.getIsDpcMember()); } - Long userId = loginUserInfo.getUserId(); - comActEasyPhotoVO.setCommunityId(communityId); - comActEasyPhotoVO.setStatus(4); - comActEasyPhotoVO.setLogInUserId(userId); - return communityService.pageEasyPhoto(comActEasyPhotoVO); + return communityService.pageEasyPhotoApplets(comActEasyPhotoVO); } @ApiOperation("上传随手拍") @PostMapping("easyphoto") - public R addEasyPhoto (@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO){ + public R addEasyPhoto(@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO) { + // 微信内容审核 + String msg = comActEasyPhotoVO.getDetail(); + if (!checkService.checkMessage(msg)) { + return R.fail("内容违规"); + } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); - if (null==communityId||0==communityId) { + if (null == communityId || 0 == communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); @@ -68,23 +90,99 @@ return communityService.addEasyPhoto(comActEasyPhotoVO); } - @ApiOperation(value = "随手拍详情",response =ComActEasyPhotoVO.class ) + /** + * description queryByPage 分页查询 + * + * @param comActEasyPhotoHandler 请求参数 + * @return 分页查询返回参数 + * @author lyq + * @date 2022-03-01 13:45:10 + */ + @ApiOperation(value = "查询处理列表",response = ComActEasyPhotoHandlerVo.class) + @PostMapping("/handleList") + public R handleList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) { + comActEasyPhotoHandler.setUserId(this.getUserId()); + return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler); + } + /** + * description edit 编辑数据 + * + * @param comActEasyPhotoHandler 请求参数 + * @return 编辑结果 + * @author lyq + * @date 2022-03-01 13:45:10 + */ + @ApiOperation(value = "提交反馈") + @PostMapping("/editEasyPhotoHandler") + public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) { + return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler); + } + + @ApiOperation(value = "查询处理详情", response = ComActEasyPhotoHandlerVo.class) + @ApiImplicitParam(name = "id", value = "处理id", required = true) + @GetMapping("/easyPhotoHandler") + public R detailEasyPhotoHandler(@RequestParam("id") Long id) { + return this.communityService.detailEasyPhotoHandler(id); + } + + @ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class) + @PostMapping("getEasyPhotoActivity") + public R getEasyPhotoActivity(@RequestBody CommonDTO commonDTO) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + Long communityId = commonDTO.getCommunityId(); + if (loginUserInfo != null) { + communityId = loginUserInfo.getCommunityId(); + } + return communityService.getEasyPhotoActivity(communityId); + } + + @ApiOperation(value = "随手拍详情", response = ComActEasyPhotoVO.class) @GetMapping("detaileasyphoto") - @ApiImplicitParam(name = "id",value = "随手拍主键") - public R detailEasyPhoto (@RequestParam("id") Long id){ - Long userId = this.getUserId(); - return communityService.detailEasyPhoto(id,userId); + @ApiImplicitParam(name = "id", value = "随手拍主键") + public R detailEasyPhoto(@RequestParam("id") Long id) { + Long userId = 0L; + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + userId = loginUserInfo.getUserId(); + } + return communityService.detailEasyPhoto(id, userId); + } + + @ApiOperation(value = "随手拍--评论--分页查询", response = ComActEasyPhotoCommentVO.class) + @PostMapping("pagecomacteasyphotocomment") + public R pageComActEasyPhotoComment(@RequestBody PageComActEasyPhotoCommentDTO pageComActEasyPhotoCommentDTO) { + Long userId = 0L; + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + userId = loginUserInfo.getUserId(); + } + pageComActEasyPhotoCommentDTO.setUserId(userId); + 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("点赞/取消点赞随手拍") @PutMapping("easyphoto") - public R putEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){ + public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) { Long id = comActEasyPhotoVO.getId(); - if (null==id||id==0) { + if (null == id || id == 0) { return R.fail("随手拍主键不能为空"); } Integer haveGiveThumbsUp = comActEasyPhotoVO.getHaveGiveThumbsUp(); - if (null==haveGiveThumbsUp) { + if (null == haveGiveThumbsUp) { return R.fail("操作类型不能为空"); } Long userId = this.getUserId(); @@ -92,34 +190,37 @@ return communityService.putEasyPhoto(comActEasyPhotoVO); } - - @ApiOperation(value = "分页展示社区微心愿",response = ComActMicroWishVO.class) + @ApiOperation(value = "分页展示社区微心愿", response = ComActMicroWishVO.class) @PostMapping("pagemicrowish") - public R pageMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){ - LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); - Long communityId = loginUserInfo.getCommunityId(); - if (null==communityId||0==communityId) { - return R.fail("用户未绑定社区"); + public R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + comActMicroWishVO.setCommunityId(loginUserInfo.getCommunityId()); + comActMicroWishVO.setResponsibleId(loginUserInfo.getUserId());// 责任人暂时放登录用户id } - Long userId = loginUserInfo.getUserId(); - comActMicroWishVO.setCommunityId(communityId); comActMicroWishVO.setIsApplets(1); - comActMicroWishVO.setResponsibleId(userId);//责任人暂时放登录用户id - return communityService.pageMicroWish(comActMicroWishVO); + comActMicroWishVO.setIsPageMyWish(null); + return communityService.pageMicroWishApplets(comActMicroWishVO); } @ApiOperation("发布微心愿") @PostMapping("microwish") - public R addMicroWish (@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO){ + public R addMicroWish(@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO) { + // 微信内容审核 + String msg = comActMicroWishVO.getDetail(); + if (!checkService.checkMessage(msg)) { + return R.fail("内容违规"); + } LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); Long communityId = loginUserInfo.getCommunityId(); - if (null==communityId||0==communityId) { + if (null == communityId || 0 == communityId) { return R.fail("用户未绑定社区"); } Long userId = loginUserInfo.getUserId(); String phone = loginUserInfo.getPhone(); if (ObjectUtils.isEmpty(phone)) { - return R.fail("只有认证后的用户才能发布微心愿"); + // return R.fail("用户绑定手机号后才能发布微心愿"); + phone = "18228784579"; } comActMicroWishVO.setSponsorPhone(phone); comActMicroWishVO.setCommunityId(communityId); @@ -127,35 +228,39 @@ return communityService.addMicroWish(comActMicroWishVO); } - @ApiOperation(value = "心愿详情",response = ComActMicroWishVO.class) + @ApiOperation(value = "心愿详情", response = ComActMicroWishVO.class) @GetMapping("microwish") - @ApiImplicitParam(name = "id",value = "微心愿主键") - public R detailMicroWish (@RequestParam("id")Long id){ - Long userId = this.getUserId(); - return communityService.detailMicroWish(id,userId); + @ApiImplicitParam(name = "id", value = "微心愿主键") + public R detailMicroWish(@RequestParam("id") Long id) { + Long userId = 0L; + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + userId = loginUserInfo.getUserId(); + } + return communityService.detailMicroWish(id, userId); } @ApiOperation("点赞/取消点赞微心愿") @PutMapping("microwish") - public R putMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){ + public R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO) { Long id = comActMicroWishVO.getId(); - if (null==id||id==0) { + if (null == id || id == 0) { return R.fail("微心愿主键不能为空"); } Long userId = this.getUserId(); - comActMicroWishVO.setSponsorId(userId);//发起人字段暂时存放userId + comActMicroWishVO.setSponsorId(userId);// 发起人字段暂时存放userId return communityService.putMicroWish(comActMicroWishVO); } - @ApiOperation(value = "首页广告banner",response = ComOpsAdvVO.class) - @GetMapping("listadvertisement") - public R listAdvertisement (){ + @ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class) + @GetMapping("listadvertisement/noToken") + public R listAdvertisement() { return communityService.listAdvertisement(); } - @ApiOperation(value = "分页通知列表",response = SysUserNoticeVO.class) + @ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class) @PostMapping("pagenotice") - public R pageNotice (@RequestBody @Validated(PageGroup.class) PageDTO pageDTO){ + public R pageNotice(@RequestBody @Validated(PageGroup.class) PageDTO pageDTO) { Long userId = this.getUserId(); pageDTO.setUserId(userId); return userService.pageNotice(pageDTO); @@ -163,17 +268,168 @@ @ApiOperation(value = "通知已读") @PutMapping("notice") - public R putNotice (@RequestBody NoticeReadDTO noticeReadDTO){ + public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO) { Long userId = this.getUserId(); noticeReadDTO.setUserId(userId); return userService.putNotice(noticeReadDTO); } - @ApiOperation(value = "未读消息汇总",response = NoticeUnReadVO.class) + @ApiOperation(value = "未读消息汇总", response = NoticeUnReadVO.class) @GetMapping("noticeunreadnum") - public R noticeUnreadNum (){ + public R noticeUnreadNum() { Long userId = this.getUserId(); 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,this.getAppId()); + } + + @ApiOperation("发布留言") + @PostMapping("addmessage") + public R addMessage(@RequestBody @Validated(AddGroup.class) ComActMessageVO comActMessageVO) { + // 微信内容审核 + String msg = comActMessageVO.getMsgContent(); + if (!checkService.checkMessage(msg)) { + return R.fail("内容违规"); + } + LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); + Long communityId = loginUserInfo.getCommunityId(); + if (null == communityId || 0 == communityId) { + return R.fail("用户未绑定社区"); + } + Integer type = loginUserInfo.getType(); + if (null == type || (type != 1 && type != 2)) { + return R.fail("留言对象类型错误!"); + } + Long userId = loginUserInfo.getUserId(); + comActMessageVO.setCommunityId(communityId); + comActMessageVO.setUserId(userId); + comActMessageVO.setUserName(loginUserInfo.getName()); + comActMessageVO.setUserAccount(loginUserInfo.getAccount()); + comActMessageVO.setIspublic(1); + comActMessageVO.setStatus(1); + return communityService.addMessage(comActMessageVO); + } + + @ApiOperation("发布留言回复") + @PostMapping("addmessageback") + public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO) { + // 微信内容审核 + String msg = comActMessageBackVO.getMsgContent(); + if (!checkService.checkMessage(msg)) { + return R.fail("内容违规"); + } + LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); + Long communityId = loginUserInfo.getCommunityId(); + if (null == communityId || 0 == communityId) { + return R.fail("用户未绑定社区"); + } + Integer type = loginUserInfo.getType(); + if (null == type || (type != 1 && type != 2)) { + return R.fail("留言对象类型错误!"); + } + Long userId = loginUserInfo.getUserId(); + comActMessageBackVO.setCommunityId(communityId); + comActMessageBackVO.setUserId(userId); + comActMessageBackVO.setUserName(loginUserInfo.getName()); + comActMessageBackVO.setUserAccount(loginUserInfo.getAccount()); + comActMessageBackVO.setIspublic(1); + comActMessageBackVO.setStatus(1); + return communityService.addMessageBack(comActMessageBackVO); + } + + @ApiOperation(value = "分页显示我的留言", response = ComActMessageVO.class) + @PostMapping("pagemymessage") + public R pageMyMessage(@RequestBody ComActMessageVO comActMessageVO) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); + Long communityId = loginUserInfo.getCommunityId(); + if (null == communityId || 0 == communityId) { + return R.fail("用户未绑定社区"); + } + comActMessageVO.setCommunityId(communityId); + comActMessageVO.setUserId(loginUserInfo.getUserId()); + return communityService.pageMyMessageApplets(comActMessageVO); + } + + @ApiOperation(value = "分页显示居民给我的留言", response = ComActMessageVO.class) + @PostMapping("pagesendtomemessage") + public R pageSendToMessage(@RequestBody ComActMessageVO comActMessageVO) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); + Long communityId = loginUserInfo.getCommunityId(); + if (null == communityId || 0 == communityId) { + return R.fail("用户未绑定社区"); + } + comActMessageVO.setCommunityId(communityId); + comActMessageVO.setUserId(loginUserInfo.getUserId()); + comActMessageVO.setPhone(loginUserInfo.getPhone()); + return communityService.pageSendToMessageApplets(comActMessageVO); + } + + @ApiOperation(value = "分页显示指定用户的留言", response = ComActMessageVO.class) + @PostMapping("pagemessagebyuser") + public R pageMessageByUser(@RequestBody ComActMessageVO comActMessageVO) { + return communityService.pageMessageByUser(comActMessageVO); + } + + @ApiOperation(value = "留言详情", response = ComActMessageVO.class) + @GetMapping("detailmessage") + @ApiImplicitParam(name = "id", value = "随手拍主键") + public R detailMessage(@RequestParam("id") Long id) { + return communityService.detailMessage(id); + } + + @ApiOperation(value = "首页商城开关接口") + @GetMapping("isShop") + public R isShop() { + return R.ok(Constants.IS_SHOP_OPEN); + } + + @ApiOperation(value = "获取最新活动和用户最新收益", response = BannerVO.class) + @GetMapping("getUserReward") + public R getUserReward(@RequestParam("communityId") Long communityId) { + Long userId = 0L; + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + userId = loginUserInfo.getUserId(); + if(loginUserInfo.getCommunityId()!=null){ + communityId = loginUserInfo.getCommunityId(); + } + } + return communityService.getUserReward(userId, communityId); + } + + @ApiOperation(value = "获取首页弹窗接口", response = ComActEasyPhotoRewardVO.class) + @GetMapping("getUserRewards") + public R getUserRewards(@RequestParam("communityId") Long communityId) { + Long userId = 0L; + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + userId = loginUserInfo.getUserId(); + communityId = loginUserInfo.getCommunityId(); + } + return communityService.getUserRewards(userId, communityId); + } + + @ApiOperation(value = "读取用户随手拍奖励") + @PostMapping("readUserReward") + public R readUserReward() { + return communityService.readUserReward(this.getUserId(), this.getCommunityId()); + } + + @ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class) + @GetMapping("easyphoto/classify/list") + public R easyPhotoClassifyList() { + return communityService.listPhotoClassify(this.getAreaCode()); + } + + @ApiOperation(value = "随手拍评价") + @PostMapping("easyphoto/whistle/evaluate") + public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) { + whistleDto.setUserId(this.getUserId()); + return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto); + } } -- Gitblit v1.7.1