springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java
@@ -61,13 +61,13 @@ } @ApiOperation(value = "查询邻里圈详情" , response = ComActNeighborCircleDetailAppVO.class) @PostMapping("neighbor/detail") @PostMapping("detail") public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) { return communityService.neighborDetailByApp(neighborCircleAppDTO); } @ApiOperation(value = "分页查询用户邻里圈列表" , response = ComActNeighborCircleAppVO.class) @PostMapping("neighbor/user/page") @ApiOperation(value = "分页查询用户邻里圈审核列表" , response = ComActNeighborCircleAppVO.class) @PostMapping("user/page") public R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ @@ -78,7 +78,7 @@ } @ApiOperation(value = "邻里圈点赞") @PostMapping("neighbor/fabulous") @PostMapping("fabulous") public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ @@ -89,7 +89,7 @@ } @ApiOperation(value = "邻里圈转发") @PostMapping("neighbor/forward") @PostMapping("forward") public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ @@ -100,7 +100,7 @@ } @ApiOperation(value = "邻里圈评论") @PostMapping("neighbor/comment") @PostMapping("comment") public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ @@ -111,7 +111,7 @@ } @ApiOperation(value = "邻里圈回复") @PostMapping("neighbor/reply") @PostMapping("reply") public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ @@ -121,5 +121,27 @@ return communityService.neighborReplyByApp(replyAppDTO); } @ApiOperation(value = "邻里圈取消点赞") @PostMapping("cancel/fabulous") public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ return R.fail("请先登录"); } fabulousAppDTO.setUserId(userId); return communityService.neighborFabulousCancelByApp(fabulousAppDTO); } @ApiOperation(value = "邻里圈添加浏览记录") @PostMapping("add/browse") public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) { Long userId = this.getLoginUserInfo().getUserId(); if(userId == null){ return R.fail("请先登录"); } addBrowseAppDTO.setUserId(userId); return communityService.neighborAddBrowseByApp(addBrowseAppDTO); } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborAddBrowseAppDTO.java
New file @@ -0,0 +1,21 @@ package com.panzhihua.common.model.dtos.neighbor; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** * @auther lyq * @create 2021-04-14 15:02:14 * @describe 邻里圈新增浏览记录请求参数 */ @Data @ApiModel("邻里圈新增浏览记录请求参数") public class ComActNeighborAddBrowseAppDTO { @ApiModelProperty("邻里圈id") private Long circleId; @ApiModelProperty(value = "用户id",hidden = true) private Long userId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleAppVO.java
@@ -75,4 +75,10 @@ @ApiModelProperty("驳回原因") private String refuseReason; /** * 是否已经点赞 1 是 2 否 */ @ApiModelProperty("是否已经点赞 1 是 2 否") private Integer haveSign; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentAppVO.java
@@ -27,10 +27,10 @@ private Long userId; @ApiModelProperty("评论用户名字") private Long userName; private String userName; @ApiModelProperty("评论用户头像") private Long userHeadUrl; private String userHeadUrl; @ApiModelProperty("评论内容") private String content; @@ -48,4 +48,10 @@ @ApiModelProperty("邻里圈评论回复列表(默认展示2条)") private List<ComActNeighborCircleCommentReplyAppVO> circleCommentReplyAppList; /** * 是否已经点赞 1 是 2 否 */ @ApiModelProperty("是否已经点赞 1 是 2 否") private Integer haveSign; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleCommentReplyAppVO.java
@@ -26,10 +26,10 @@ private String parentUserName; @ApiModelProperty("回复用户名称") private Long userName; private String userName; @ApiModelProperty("回复用户头像url") private Long userHeadUrl; private String userHeadUrl; @ApiModelProperty("回复内容") private String replyContent; @@ -44,4 +44,10 @@ @ApiModelProperty("是否是作者回复(1.是 2.否)") private Integer isRelease; /** * 是否已经点赞 1 是 2 否 */ @ApiModelProperty("是否已经点赞 1 是 2 否") private Integer haveSign; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java
@@ -55,4 +55,10 @@ @ApiModelProperty("邻里圈评论列表") private List<ComActNeighborCircleCommentAppVO> circleCommentAppList; /** * 是否已经点赞 1 是 2 否 */ @ApiModelProperty("是否已经点赞 1 是 2 否") private Integer haveSign; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2340,4 +2340,20 @@ @PostMapping("/neighbor/timeTaskCircleFlow") R timedTaskNeighborCircleRecord(); /** * 邻里圈取消点赞 * @param fabulousAppDTO 请求参数 * @return 取消点赞结果 */ @PostMapping("/neighbor/neighborFabulousCancelByApp") R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO); /** * 添加邻里圈浏览记录 * @param addBrowseAppDTO 请求参数 * @return 返回参数 */ @PostMapping("/neighbor/neighborAddBrowseByApp") R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/NeighborApi.java
@@ -133,7 +133,7 @@ * @param commentAppDTO 请求参数 * @return 评论结果 */ @PostMapping("neighbor/comment") @PostMapping("neighborCommentByApp") public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) { return comActNeighborCircleService.neighborCommentByApp(commentAppDTO); } @@ -143,7 +143,7 @@ * @param replyAppDTO 请求参数 * @return 回复结果 */ @PostMapping("neighbor/reply") @PostMapping("neighborReplyByApp") public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) { return comActNeighborCircleService.neighborReplyByApp(replyAppDTO); } @@ -152,9 +152,29 @@ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量 * @return 执行结果 */ @PostMapping("neighbor/timeTaskCircleFlow") @PostMapping("timeTaskCircleFlow") public R timeTaskCircleFlow() { return comActNeighborCircleService.timeTaskCircleFlow(); } /** * 邻里圈取消点赞 * @param fabulousAppDTO 请求参数 * @return 取消点赞结果 */ @PostMapping("neighborFabulousCancelByApp") public R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) { return comActNeighborCircleService.neighborFabulousCancelByApp(fabulousAppDTO); } /** * 添加邻里圈浏览记录 * @param addBrowseAppDTO 请求参数 * @return 返回参数 */ @PostMapping("neighborAddBrowseByApp") public R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO) { return comActNeighborCircleService.neighborAddBrowseByApp(addBrowseAppDTO); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActNeighborCircleFabulousDO.java
@@ -70,6 +70,15 @@ int no = 2; } /** * 点赞类型(1.邻里圈 2.评论 3.回复) */ public interface type{ int llq = 1; int pl = 2; int hf = 3; } @Override public String toString() { return "ComActNeighborCircleFabulousDO{" + springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java
@@ -110,4 +110,18 @@ */ R timeTaskCircleFlow(); /** * 邻里圈取消点赞 * @param fabulousAppDTO 请求参数 * @return 取消点赞结果 */ R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO); /** * 添加邻里圈浏览记录 * @param addBrowseAppDTO 请求参数 * @return 返回参数 */ R neighborAddBrowseByApp(ComActNeighborAddBrowseAppDTO addBrowseAppDTO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -57,11 +57,14 @@ @Resource ComActNeighborCircleCommentReplyDAO neighborCircleCommentReplyDAO; @Resource private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO; @Resource private ComActNeighborCircleCommentReplyDAO comActNeighborCircleCommentReplyDAO; @Resource private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO; @Resource private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO; /** * 分页查询邻里圈列表 @@ -72,6 +75,20 @@ public R pageNeighborByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){ Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()); IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO); if(!doPager.getRecords().isEmpty()){ for (ComActNeighborCircleAppVO circleAppVO:doPager.getRecords()) { //查询点赞信息 ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleAppVO.getId()) .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)); if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){ circleAppVO.setHaveSign(1); }else{ circleAppVO.setHaveSign(2); } } } return R.ok(doPager); } @@ -108,22 +125,59 @@ */ @Override public R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO){ //添加邻里圈浏览记录 comActNeighborCircleBrowseService.addBrowseRecord(neighborCircleAppDTO.getCircleId(),neighborCircleAppDTO.getUserId()); //查询邻里圈详情 ComActNeighborCircleDetailAppVO circleDetailAppVO = this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId()); if(circleDetailAppVO == null){ return R.fail("未找到邻里圈信息"); } //查询邻里圈点赞信息 ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId()) .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)); if(circleFabulousDO != null && circleFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){ circleDetailAppVO.setHaveSign(1); }else{ circleDetailAppVO.setHaveSign(2); } //查询邻里圈下评论列表 IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage = comActNeighborCircleCommentDAO.pageNeighborCommentByApp( new Page(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO); if(!circleCommentAppPage.getRecords().isEmpty()){ for (ComActNeighborCircleCommentAppVO circleCommentVo:circleCommentAppPage.getRecords()) { //查询点赞信息 ComActNeighborCircleFabulousDO circleCommentFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleCommentVo.getId()) .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)); if(circleCommentFabulousDO != null && circleCommentFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){ circleCommentVo.setHaveSign(1); }else{ circleCommentVo.setHaveSign(2); } //查询评论下评论回复 List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS = comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId()); if(!commentReplyAppVOS.isEmpty()){ for (ComActNeighborCircleCommentReplyAppVO commentReplyVO:commentReplyAppVOS) { //查询点赞信息 ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId()) .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)); if(circleReplyFabulousDO != null && circleReplyFabulousDO.getIsEffective().equals(ComActNeighborCircleFabulousDO.isEffective.yes)){ commentReplyVO.setHaveSign(1); }else{ commentReplyVO.setHaveSign(2); } } circleCommentVo.setCircleCommentReplyAppList(commentReplyAppVOS); } } } circleDetailAppVO.setCircleCommentAppList(circleCommentAppPage.getRecords()); return R.ok(circleDetailAppVO); } @@ -203,10 +257,10 @@ ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(fabulousAppDTO.getServiceId()); if(neighborCircleDO != null){ neighborCircleDO.setFabulousNum(neighborCircleDO.getFabulousNum() + 1); neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1); this.baseMapper.updateById(neighborCircleDO); circleFabulousDO.setCircleId(neighborCircleDO.getId()); } //添加邻里圈浏览记录 comActNeighborCircleBrowseService.addBrowseRecord(fabulousAppDTO.getServiceId(),fabulousAppDTO.getUserId()); }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){ @@ -357,14 +411,18 @@ int commentReplyCount = comActNeighborCircleCommentReplyDAO.selectCount( new QueryWrapper<ComActNeighborCircleCommentReplyDO>().lambda() .eq(ComActNeighborCircleCommentReplyDO::getCircleId,neighborCircleDO.getId())); //查询邻里圈近3天的点赞数 int fabulousCount = comActNeighborCircleFabulousDAO.selectCount(new QueryWrapper<ComActNeighborCircleFabulousDO>() .lambda().eq(ComActNeighborCircleFabulousDO::getCircleId,neighborCircleDO.getId()) .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes)); //查询邻里圈近3天的浏览量 int browseCount = comActNeighborCircleBrowseDAO.selectCount( new QueryWrapper<ComActNeighborCircleBrowseDO>().lambda().eq(ComActNeighborCircleBrowseDO::getNeighborId,neighborCircleDO.getId())); //更新邻里圈信息 neighborCircleDO.setLastCommentNum(commentCount + commentReplyCount); neighborCircleDO.setLastFabulousNum(fabulousCount); neighborCircleDO.setLastViewsNum(browseCount); this.baseMapper.updateById(neighborCircleDO); } } @@ -404,4 +462,65 @@ public R detailNeighborByAdmin(Long id) { return null; } /** * 邻里圈取消点赞 * @param fabulousAppDTO 请求参数 * @return 取消点赞结果 */ @Override public R neighborFabulousCancelByApp(ComActNeighborFabulousAppDTO fabulousAppDTO){ ComActNeighborCircleFabulousDO circleFabulousDO = null; //查询邻里圈点赞信息 if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)){ //查询点赞信息 circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId()) .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)); if(circleFabulousDO == null){ return R.fail("未查询到点赞信息"); } }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){ circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId()) .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)); if(circleFabulousDO == null){ return R.fail("未查询到点赞信息"); } }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){ circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne( new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId()) .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()) .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)); if(circleFabulousDO == null){ return R.fail("未查询到点赞信息"); } } if(circleFabulousDO != null){ circleFabulousDO.setIsEffective(ComActNeighborCircleFabulousDO.isEffective.no); comActNeighborCircleFabulousDAO.updateById(circleFabulousDO); } return R.ok(); } /** * 添加邻里圈浏览记录 * @param addBrowseAppDTO 请求参数 * @return 返回参数 */ @Override @Transactional(rollbackFor = Exception.class) public R neighborAddBrowseByApp(ComActNeighborAddBrowseAppDTO addBrowseAppDTO){ //添加邻里圈浏览记录 comActNeighborCircleBrowseService.addBrowseRecord(addBrowseAppDTO.getCircleId(),addBrowseAppDTO.getUserId()); //更新邻里圈记录 ComActNeighborCircleDO neighborCircleDO = this.baseMapper.selectById(addBrowseAppDTO.getCircleId()); if(neighborCircleDO != null){ neighborCircleDO.setViewsNum(neighborCircleDO.getViewsNum() + 1); this.baseMapper.updateById(neighborCircleDO); } return R.ok(); } } springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/NeighborCircleJobHandler.java
@@ -26,7 +26,7 @@ * @return 刷新个数 * @throws Exception 出现的异常 */ @XxlJob("timedtaskpartybuildingstatusJobHandler") @XxlJob("timedtaskNeighborCircleCommentJobHandler") public ReturnT<String> timedtaskpartybuildingstatusJobHandler(String param) throws Exception { log.info("定时任务更新邻里圈近3天评论数/点赞数/浏览量"); R r=communityService.timedTaskNeighborCircleRecord();