Merge remote-tracking branch 'origin/test' into test

DESKTOP-71BH0QO\L、ming

2021-04-29 2c95548b6c741e775156151b85442fef8eead902

Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

@@ -63,13 +63,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){
@@ -80,7 +80,7 @@
    }

    @ApiOperation(value = "邻里圈点赞")
    @PostMapping("neighbor/fabulous")
    @PostMapping("fabulous")
    public R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
@@ -91,7 +91,7 @@
    }

    @ApiOperation(value = "邻里圈转发")
    @PostMapping("neighbor/forward")
    @PostMapping("forward")
    public R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
@@ -102,7 +102,7 @@
    }

    @ApiOperation(value = "邻里圈评论")
    @PostMapping("neighbor/comment")
    @PostMapping("comment")
    public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
@@ -113,7 +113,7 @@
    }

    @ApiOperation(value = "邻里圈回复")
    @PostMapping("neighbor/reply")
    @PostMapping("reply")
    public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
        Long userId = this.getLoginUserInfo().getUserId();
        if(userId == null){
@@ -123,5 +123,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/community/ComActWorkGuideVO.java

@@ -28,7 +28,7 @@

    @ApiModelProperty("办事指南内容")
    @NotBlank(groups = {AddGroup.class}, message = "内容不能为空")
    @Length(groups = {AddGroup.class}, max = 500)
    @Length(groups = {AddGroup.class}, max = 5000)
    private String content;

    @ApiModelProperty("办理时间")

 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

@@ -2386,7 +2386,7 @@
     * 邻里圈评论回复_基本详情
     * @param id 参数
     */
    @GetMapping("/neighbor/detailNeighborCommentReply")
    @PostMapping("/neighbor/detailNeighborCommentReply")
    R detailNeighborCommentReply(@RequestParam("id") Long id);

    /**
@@ -2395,6 +2395,22 @@
     */
    @PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
    R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
    /**
     * 邻里圈取消点赞
     * @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

@@ -46,6 +46,11 @@
        return comActNeighborCircleService.addNeighborByApp(addNeighborCircleAppDTO);
    }

    /**
     * 查询邻里圈详情
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈详情
     */
    @PostMapping("neighborDetailByApp")
    public R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO) {
        return comActNeighborCircleService.neighborDetailByApp(neighborCircleAppDTO);
@@ -127,7 +132,7 @@
     * @param commentAppDTO 请求参数
     * @return  评论结果
     */
    @PostMapping("neighbor/comment")
    @PostMapping("neighborCommentByApp")
    public R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO) {
        return comActNeighborCircleService.neighborCommentByApp(commentAppDTO);
    }
@@ -137,7 +142,7 @@
     * @param replyAppDTO   请求参数
     * @return  回复结果
     */
    @PostMapping("neighbor/reply")
    @PostMapping("neighborReplyByApp")
    public R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO) {
        return comActNeighborCircleService.neighborReplyByApp(replyAppDTO);
    }
@@ -146,7 +151,7 @@
     * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
     * @return  执行结果
     */
    @PostMapping("neighbor/timeTaskCircleFlow")
    @PostMapping("timeTaskCircleFlow")
    public R timeTaskCircleFlow() {
        return comActNeighborCircleService.timeTaskCircleFlow();
    }
@@ -217,4 +222,24 @@
        return comActNeighborCircleService.changeCommentReplyStatusByAdmin(changeStatusReplyVO);
    }

    /**
     * 邻里圈取消点赞
     * @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/dao/ComActNeighborCircleDAO.java

@@ -43,7 +43,7 @@
            " FROM " +
            " com_act_neighbor_circle AS canc" +
            " left join sys_user as su on su.user_id = canc.release_id" +
            " where canc.status = 2 and canc.community_id = #{communityId} " +
            " where canc.status = 2 and canc.community_id = #{neighborCircleAppDTO.communityId} " +
            "<if test='neighborCircleAppDTO.type != null and neighborCircleAppDTO.type == 1'>" +
            " order by (canc.last_views_num + canc.last_comment_num + canc.last_fabulous_num) desc " +
            " </if> " +

 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

@@ -154,4 +154,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/ComActEasyPhotoServiceImpl.java

@@ -112,6 +112,9 @@
            }
        }
        comActEasyPhotoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(comActEasyPhotoVO.getPhone()));
        if(comActEasyPhotoVO.getAddrRemark()==null){
            comActEasyPhotoVO.setAddrRemark("");
        }
        return R.ok(comActEasyPhotoVO);
    }

@@ -253,8 +256,9 @@
                Long id = comActEasyPhotoVO1.getId();
                Integer status = comActEasyPhotoVO1.getStatus();
                Date feedbackAt = comActEasyPhotoVO1.getFeedbackAt();
                ComActEasyPhotoUserDO comActEasyPhotoUserDO = comActEasyPhotoUserDAO.selectOne(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
                if (ObjectUtils.isEmpty(comActEasyPhotoUserDO)) {
                List<ComActEasyPhotoUserDO> comActEasyPhotoUserDO =
                        comActEasyPhotoUserDAO.selectList(new QueryWrapper<ComActEasyPhotoUserDO>().lambda().eq(ComActEasyPhotoUserDO::getEasyPhotoId, id).eq(ComActEasyPhotoUserDO::getUserId, userId));
                if (comActEasyPhotoUserDO==null||comActEasyPhotoUserDO.size()==0) {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(0);
                }else {
                    comActEasyPhotoVO1.setHaveGiveThumbsUp(1);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -60,6 +60,14 @@

    @Resource
    ComActNeighborCircleCommentReplyDAO neighborCircleCommentReplyDAO;
    @Resource
    private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO;
    @Resource
    private ComActNeighborCircleCommentReplyDAO comActNeighborCircleCommentReplyDAO;
    @Resource
    private ComActNeighborCircleFabulousDAO comActNeighborCircleFabulousDAO;
    @Resource
    private ComActNeighborCircleBrowseDAO comActNeighborCircleBrowseDAO;

    /**
     * 分页查询邻里圈列表
@@ -70,6 +78,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);
    }

@@ -106,22 +128,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 = neighborCircleCommentDAO.pageNeighborCommentByApp(
        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 = neighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
                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,30 +262,30 @@
            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)){
            //增加邻里圈评论点赞数量
            ComActNeighborCircleCommentDO circleCommentDO = neighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentDO != null){
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
                neighborCircleCommentDAO.updateById(circleCommentDO);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
                circleFabulousDO.setCircleId(circleCommentDO.getCircleId());
            }
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){
            //增加邻里圈评论回复点赞数量
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO = neighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentReplyDO != null){
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() + 1);
                neighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
                comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
                circleFabulousDO.setCircleId(circleCommentReplyDO.getCircleId());
            }
        }
        if(neighborCircleFabulousDAO.insert(circleFabulousDO) > 0){
        if(comActNeighborCircleFabulousDAO.insert(circleFabulousDO) > 0){
            return R.ok();
        }else{
            return R.fail("点赞失败");
@@ -283,7 +342,7 @@
            circleCommentDO.setIsRelease(ComActNeighborCircleCommentDO.isRelease.yes);
        }

        if(neighborCircleCommentDAO.insert(circleCommentDO) > 0){
        if(comActNeighborCircleCommentDAO.insert(circleCommentDO) > 0){
            return R.ok();
        }else{
            return R.fail("评论失败");
@@ -318,7 +377,7 @@
        //判断回复类型
        if(replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.pl)){
            //查询评论信息
            ComActNeighborCircleCommentDO circleCommentDO = neighborCircleCommentDAO.selectById(replyAppDTO.getServiceId());
            ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(replyAppDTO.getServiceId());
            if(circleCommentDO != null){
                circleCommentReplyDO.setCommentId(replyAppDTO.getServiceId());
                circleCommentReplyDO.setParentId(0L);
@@ -326,7 +385,7 @@
            }
        }else if(replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.hf)){
            //查询上级回复信息
            ComActNeighborCircleCommentReplyDO parentCommentReplyDO = neighborCircleCommentReplyDAO.selectById(replyAppDTO.getServiceId());
            ComActNeighborCircleCommentReplyDO parentCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(replyAppDTO.getServiceId());
            if(parentCommentReplyDO != null){
                circleCommentReplyDO.setCommentId(parentCommentReplyDO.getCommentId());
                circleCommentReplyDO.setParentId(parentCommentReplyDO.getId());
@@ -334,7 +393,7 @@
            }
        }

        if(neighborCircleCommentReplyDAO.insert(circleCommentReplyDO) > 0){
        if(comActNeighborCircleCommentReplyDAO.insert(circleCommentReplyDO) > 0){
            return R.ok();
        }else{
            return R.fail("回复失败");
@@ -351,20 +410,24 @@
            //遍历查询到的邻里圈，更新邻里圈内近3天的评论数,点赞数,浏览量
            for (ComActNeighborCircleDO neighborCircleDO:circleDOList) {
                //查询邻里圈近3天的评论数
                int commentCount = neighborCircleCommentDAO.selectCount(
                int commentCount = comActNeighborCircleCommentDAO.selectCount(
                        new QueryWrapper<ComActNeighborCircleCommentDO>().lambda().eq(ComActNeighborCircleCommentDO::getCircleId,neighborCircleDO.getId()));
                //查询邻里圈近3天的评论回复数
                int commentReplyCount = neighborCircleCommentReplyDAO.selectCount(
                int commentReplyCount = comActNeighborCircleCommentReplyDAO.selectCount(
                        new QueryWrapper<ComActNeighborCircleCommentReplyDO>().lambda()
                                .eq(ComActNeighborCircleCommentReplyDO::getCircleId,neighborCircleDO.getId()));

                //查询邻里圈近3天的点赞数
                int fabulousCount = neighborCircleFabulousDAO.selectCount(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                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);
            }
        }

@@ -481,4 +544,65 @@
        neighborCircleCommentReplyDAO.updateById(replyDO);
        return R.ok();
    }

    /**
     * 邻里圈取消点赞
     * @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();