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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -2,9 +2,16 @@

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,32 +19,15 @@
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.neighbor.*;
import com.panzhihua.common.model.vos.neighbor.*;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActNeighborCircleCommentDAO;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.service_community.dao.ComActNeighborCircleCommentReplyDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
import com.panzhihua.service_community.dao.ComActNeighborCircleFabulousDAO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentDO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleCommentReplyDO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
import com.panzhihua.service_community.model.dos.ComActNeighborCircleFabulousDO;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComActNeighborCircleBrowseService;
import com.panzhihua.service_community.service.ComActNeighborCircleService;

import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;

import java.util.List;

/**
 * @auther lyq
@@ -46,22 +36,19 @@
 */
@Slf4j
@Service
public class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO> implements ComActNeighborCircleService {

    @Resource
    private ComActNeighborCircleBrowseService comActNeighborCircleBrowseService;
public class ComActNeighborCircleServiceImpl extends ServiceImpl<ComActNeighborCircleDAO, ComActNeighborCircleDO>
    implements ComActNeighborCircleService {

    @Resource
    ComActNeighborCircleFabulousDAO neighborCircleFabulousDAO;

    @Resource
    ComActNeighborCircleBrowseDAO neighborCircleBrowseDAO;

    @Resource
    ComActNeighborCircleCommentDAO neighborCircleCommentDAO;

    @Resource
    ComActNeighborCircleCommentReplyDAO neighborCircleCommentReplyDAO;
    @Resource
    private ComActNeighborCircleBrowseService comActNeighborCircleBrowseService;
    @Resource
    private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO;
    @Resource
@@ -77,7 +64,9 @@

    /**
     * 分页查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return  邻里圈列表
     */
    @Override
@@ -88,11 +77,13 @@
            for (ComActNeighborCircleAppVO circleAppVO:doPager.getRecords()) {
                if(neighborCircleAppDTO.getUserId() != null){
                    //查询点赞信息
                    ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                            new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleAppVO.getId())
                    ComActNeighborCircleFabulousDO circleFabulousDO =
                        comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                            .lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
                                    .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                                    .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
                                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                                ComActNeighborCircleFabulousDO.isEffective.yes));
                    if(circleFabulousDO != null){
                        circleAppVO.setHaveSign(1);
                    }else{
@@ -114,7 +105,9 @@

    /**
     * 用户发布邻里圈审核
     * @param addNeighborCircleAppDTO   邻里圈请求参数
     *
     * @param addNeighborCircleAppDTO
     *            邻里圈请求参数
     * @return  发布结果
     */
    @Override
@@ -156,19 +149,23 @@

    /**
     * 查看邻里圈详情
     * @param neighborCircleAppDTO  请求参数
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return  邻里圈详情
     */
    @Override
    public R neighborDetailByApp(ComActNeighborCircleDetailAppDTO neighborCircleAppDTO){

        //查询邻里圈详情
        ComActNeighborCircleDetailAppVO circleDetailAppVO = this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId());
        ComActNeighborCircleDetailAppVO circleDetailAppVO =
            this.baseMapper.neighborDetailByApp(neighborCircleAppDTO.getCircleId());
        if(circleDetailAppVO == null){
            return R.fail("未找到邻里圈信息");
        }

        if(circleDetailAppVO.getType() != null && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)){
        if (circleDetailAppVO.getType() != null
            && circleDetailAppVO.getType().equals(ComActNeighborCircleDO.type.admin)) {
            ComActDO actDO = comActDAO.selectById(circleDetailAppVO.getCommunityId());
            if(actDO != null){
                circleDetailAppVO.setName(actDO.getName());
@@ -177,11 +174,13 @@

        if(neighborCircleAppDTO.getUserId() != null){
            //查询邻里圈点赞信息
            ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleDetailAppVO.getId())
            ComActNeighborCircleFabulousDO circleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getParentId, circleDetailAppVO.getId())
                            .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                        ComActNeighborCircleFabulousDO.isEffective.yes));
            if(circleFabulousDO != null){
                circleDetailAppVO.setHaveSign(1);
            }else{
@@ -189,20 +188,22 @@
            }
        }


        //查询邻里圈下评论列表
        IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage = comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
        IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage =
            comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
                new Page(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO);
        if(!circleCommentAppPage.getRecords().isEmpty()){
            for (ComActNeighborCircleCommentAppVO circleCommentVo:circleCommentAppPage.getRecords()) {

                if(neighborCircleAppDTO.getUserId() != null){
                    //查询点赞信息
                    ComActNeighborCircleFabulousDO circleCommentFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                            new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,circleCommentVo.getId())
                    ComActNeighborCircleFabulousDO circleCommentFabulousDO =
                        comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                            .lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleCommentVo.getId())
                                    .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                                    .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)
                                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                                ComActNeighborCircleFabulousDO.isEffective.yes));
                    if(circleCommentFabulousDO != null){
                        circleCommentVo.setHaveSign(1);
                    }else{
@@ -211,7 +212,8 @@
                }

                //查询评论下评论回复
                List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS = comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
                List<ComActNeighborCircleCommentReplyAppVO> commentReplyAppVOS =
                    comActNeighborCircleCommentReplyDAO.getCircleCommentReplyList(circleCommentVo.getId());
                if(!commentReplyAppVOS.isEmpty()){
                    List<ComActNeighborCircleCommentReplyAppVO> newCommentReplyAppVOS = new ArrayList<>();
                    if(neighborCircleAppDTO.getUserId() != null){
@@ -221,11 +223,13 @@
                                break;
                            }
                            //查询点赞信息
                            ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyVO.getId())
                            ComActNeighborCircleFabulousDO circleReplyFabulousDO = comActNeighborCircleFabulousDAO
                                .selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                                    .eq(ComActNeighborCircleFabulousDO::getParentId, commentReplyVO.getId())
                                            .eq(ComActNeighborCircleFabulousDO::getUserId,neighborCircleAppDTO.getUserId())
                                            .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
                                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                                        ComActNeighborCircleFabulousDO.isEffective.yes));
                            if(circleReplyFabulousDO != null){
                                commentReplyVO.setHaveSign(1);
                            }else{
@@ -304,21 +308,26 @@

    /**
     * 用户查询邻里圈列表
     * @param neighborCircleAppDTO  请求参数
     *
     * @param neighborCircleAppDTO
     *            请求参数
     * @return  邻里圈列表
     */
    @Override
    public R neighborExamineByApp(ComActNeighborCircleAppDTO neighborCircleAppDTO){
        IPage<ComActNeighborCircleAppVO> neighborCircleIPage = this.baseMapper.neighborExamineByApp(
                new Page<>(neighborCircleAppDTO.getPageNum(),neighborCircleAppDTO.getPageSize()),neighborCircleAppDTO.getUserId());
            new Page<>(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize()),
            neighborCircleAppDTO.getUserId());
        if(!neighborCircleIPage.getRecords().isEmpty()) {
            for (ComActNeighborCircleAppVO circleAppVO : neighborCircleIPage.getRecords()) {
                //查询点赞信息
                ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                        new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
                ComActNeighborCircleFabulousDO circleFabulousDO =
                    comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                        .lambda().eq(ComActNeighborCircleFabulousDO::getParentId, circleAppVO.getId())
                                .eq(ComActNeighborCircleFabulousDO::getUserId, neighborCircleAppDTO.getUserId())
                                .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborCircleFabulousDO.type.llq)
                                .eq(ComActNeighborCircleFabulousDO::getIsEffective, ComActNeighborCircleFabulousDO.isEffective.yes));
                        .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                            ComActNeighborCircleFabulousDO.isEffective.yes));
                if (circleFabulousDO != null) {
                    circleAppVO.setHaveSign(1);
                } else {
@@ -331,7 +340,9 @@

    /**
     * 邻里圈点赞
     * @param fabulousAppDTO    请求参数
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return  点赞结果
     */
    @Override
@@ -345,8 +356,9 @@
        //判断点赞类型
        if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)){

            ComActNeighborCircleFabulousDO oldCircleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborFabulousAppDTO.type.llq)
            ComActNeighborCircleFabulousDO oldCircleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborFabulousAppDTO.type.llq)
                            .eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes)
                            .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId()));
@@ -367,17 +379,21 @@
                circleFabulousDO.setCircleId(neighborCircleDO.getId());
            }
            //添加邻里圈浏览记录
            comActNeighborCircleBrowseService.addBrowseRecord(fabulousAppDTO.getServiceId(),fabulousAppDTO.getUserId());
            comActNeighborCircleBrowseService.addBrowseRecord(fabulousAppDTO.getServiceId(),
                fabulousAppDTO.getUserId());
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){
            ComActNeighborCircleFabulousDO oldCircleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborFabulousAppDTO.type.pl)
            ComActNeighborCircleFabulousDO oldCircleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborFabulousAppDTO.type.pl)
                            .eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                        ComActNeighborCircleFabulousDO.isEffective.yes));
            if(oldCircleFabulousDO != null){
                return R.fail("您已点赞");
            }
            //增加邻里圈评论点赞数量
            ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            ComActNeighborCircleCommentDO circleCommentDO =
                comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentDO != null){
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() + 1);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
@@ -388,15 +404,18 @@
                circleFabulousDO.setCircleId(circleCommentDO.getCircleId());
            }
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){
            ComActNeighborCircleFabulousDO oldCircleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborFabulousAppDTO.type.hf)
            ComActNeighborCircleFabulousDO oldCircleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getType, ComActNeighborFabulousAppDTO.type.hf)
                            .eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                        ComActNeighborCircleFabulousDO.isEffective.yes));
            if(oldCircleFabulousDO != null){
                return R.fail("您已点赞");
            }
            //增加邻里圈评论回复点赞数量
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO =
                comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentReplyDO != null){
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() + 1);
                comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
@@ -416,7 +435,9 @@

    /**
     * 邻里圈转发
     * @param forwardAppDTO 请求参数
     *
     * @param forwardAppDTO
     *            请求参数
     * @return  转发结果
     */
    @Override
@@ -445,7 +466,9 @@

    /**
     * 邻里圈评论
     * @param commentAppDTO 请求参数
     *
     * @param commentAppDTO
     *            请求参数
     * @return  评论结果
     */
    @Override
@@ -484,7 +507,9 @@

    /**
     * 邻里圈回复
     * @param replyAppDTO   请求参数
     *
     * @param replyAppDTO
     *            请求参数
     * @return  回复结果
     */
    @Override
@@ -515,7 +540,8 @@
        //判断回复类型
        if(replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.pl)){
            //查询评论信息
            ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(replyAppDTO.getServiceId());
            ComActNeighborCircleCommentDO circleCommentDO =
                comActNeighborCircleCommentDAO.selectById(replyAppDTO.getServiceId());
            if(circleCommentDO != null){
                circleCommentReplyDO.setCommentId(replyAppDTO.getServiceId());
                circleCommentReplyDO.setParentId(0L);
@@ -523,7 +549,8 @@
            }
        }else if(replyAppDTO.getType().equals(ComActNeighborReplyAppDTO.type.hf)){
            //查询上级回复信息
            ComActNeighborCircleCommentReplyDO parentCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(replyAppDTO.getServiceId());
            ComActNeighborCircleCommentReplyDO parentCommentReplyDO =
                comActNeighborCircleCommentReplyDAO.selectById(replyAppDTO.getServiceId());
            if(parentCommentReplyDO != null){
                circleCommentReplyDO.setCommentId(parentCommentReplyDO.getCommentId());
                circleCommentReplyDO.setParentId(parentCommentReplyDO.getId());
@@ -542,25 +569,30 @@
    public R timeTaskCircleFlow(){
        Date oldDate = DateUtils.addDay(new Date(),-3);
        //查询所有状态正常的邻里圈
        List<ComActNeighborCircleDO> circleDOList = this.baseMapper.selectList(
                new QueryWrapper<ComActNeighborCircleDO>().lambda().eq(ComActNeighborCircleDO::getStatus,ComActNeighborCircleDO.status.xs));
        List<ComActNeighborCircleDO> circleDOList =
            this.baseMapper.selectList(new QueryWrapper<ComActNeighborCircleDO>().lambda()
                .eq(ComActNeighborCircleDO::getStatus, ComActNeighborCircleDO.status.xs));
        if(!circleDOList.isEmpty()){
            //遍历查询到的邻里圈，更新邻里圈内近3天的评论数,点赞数,浏览量
            for (ComActNeighborCircleDO neighborCircleDO:circleDOList) {
                //查询邻里圈近3天的评论数
                int commentCount = comActNeighborCircleCommentDAO.selectCount(
                        new QueryWrapper<ComActNeighborCircleCommentDO>().lambda().eq(ComActNeighborCircleCommentDO::getCircleId,neighborCircleDO.getId()));
                int commentCount =
                    comActNeighborCircleCommentDAO.selectCount(new QueryWrapper<ComActNeighborCircleCommentDO>()
                        .lambda().eq(ComActNeighborCircleCommentDO::getCircleId, neighborCircleDO.getId()));
                //查询邻里圈近3天的评论回复数
                int commentReplyCount = comActNeighborCircleCommentReplyDAO.selectCount(
                        new QueryWrapper<ComActNeighborCircleCommentReplyDO>().lambda()
                int commentReplyCount = comActNeighborCircleCommentReplyDAO
                    .selectCount(new QueryWrapper<ComActNeighborCircleCommentReplyDO>().lambda()
                                .eq(ComActNeighborCircleCommentReplyDO::getCircleId,neighborCircleDO.getId()));
                //查询邻里圈近3天的点赞数
                int fabulousCount = comActNeighborCircleFabulousDAO.selectCount(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                int fabulousCount =
                    comActNeighborCircleFabulousDAO.selectCount(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                        .lambda().eq(ComActNeighborCircleFabulousDO::getCircleId,neighborCircleDO.getId())
                        .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                        .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                            ComActNeighborCircleFabulousDO.isEffective.yes));
                //查询邻里圈近3天的浏览量
                int browseCount = comActNeighborCircleBrowseDAO.selectCount(
                        new QueryWrapper<ComActNeighborCircleBrowseDO>().lambda().eq(ComActNeighborCircleBrowseDO::getNeighborId,neighborCircleDO.getId()));
                int browseCount =
                    comActNeighborCircleBrowseDAO.selectCount(new QueryWrapper<ComActNeighborCircleBrowseDO>().lambda()
                        .eq(ComActNeighborCircleBrowseDO::getNeighborId, neighborCircleDO.getId()));
                //更新邻里圈信息
                neighborCircleDO.setLastCommentNum(commentCount + commentReplyCount);
                neighborCircleDO.setLastFabulousNum(fabulousCount);
@@ -584,14 +616,14 @@
        //邻里圈删除
        this.baseMapper.deleteById(id);
        //邻里圈评论删除
        neighborCircleCommentDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleCommentDO>()
                .eq(ComActNeighborCircleCommentDO::getCircleId, id));
        neighborCircleCommentDAO.delete(
            new LambdaQueryWrapper<ComActNeighborCircleCommentDO>().eq(ComActNeighborCircleCommentDO::getCircleId, id));
        //邻里圈回复删除
        neighborCircleCommentReplyDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleCommentReplyDO>()
                .eq(ComActNeighborCircleCommentReplyDO::getCircleId, id));
        //邻里圈浏览器记录
        neighborCircleBrowseDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>()
                .eq(ComActNeighborCircleBrowseDO::getNeighborId, id));
        neighborCircleBrowseDAO.delete(
            new LambdaQueryWrapper<ComActNeighborCircleBrowseDO>().eq(ComActNeighborCircleBrowseDO::getNeighborId, id));
        //邻里圈点赞删除
        neighborCircleFabulousDAO.delete(new LambdaQueryWrapper<ComActNeighborCircleFabulousDO>()
                .eq(ComActNeighborCircleFabulousDO::getCircleId,id));
@@ -612,7 +644,8 @@

        //查询话题名称
        if(comActNeighborCircleDO.getTopicId() != null){
            ComActNeighborCircleTopicDO circleTopicDO = comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
            ComActNeighborCircleTopicDO circleTopicDO =
                comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
            vo.setTopicName(circleTopicDO.getName());
        }
        return R.ok(vo);
@@ -626,7 +659,8 @@
        }
        Page<ComActNeighborCircleCommentDO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
        //1、先查询所有该邻里圈_的评论
        IPage<ComActNeighborCommentByAdminVO> commentDOIPage = neighborCircleCommentDAO.selectPageDetailNeighborComment(page,dto);
        IPage<ComActNeighborCommentByAdminVO> commentDOIPage =
            neighborCircleCommentDAO.selectPageDetailNeighborComment(page, dto);
        return R.ok(commentDOIPage);
    }

@@ -669,7 +703,8 @@
    @Override
    public R detailNeighborCommentAllReply(DetailNeighborCommentReplyByAdminDTO dto) {
        Page<ComActNeighborCircleCommentReplyDO> page = new Page<>(dto.getPageNum(),dto.getPageSize());
        Page<ComActNeighborCommentReplyByAdminVO> replyPage = neighborCircleCommentReplyDAO.selectListByComment(page, dto);
        Page<ComActNeighborCommentReplyByAdminVO> replyPage =
            neighborCircleCommentReplyDAO.selectListByComment(page, dto);
        replyPage.getRecords().forEach(reply->{

        });
@@ -692,7 +727,8 @@

    @Override
    public R changeCommentReplyStatusByAdmin(ChangeCommentReplyStatusByAdminVO changeStatusReplyVO) {
        ComActNeighborCircleCommentReplyDO replyDO = neighborCircleCommentReplyDAO.selectById(changeStatusReplyVO.getId());
        ComActNeighborCircleCommentReplyDO replyDO =
            neighborCircleCommentReplyDAO.selectById(changeStatusReplyVO.getId());
        if(replyDO==null){
            return R.fail("id有误!");
        }
@@ -703,7 +739,9 @@

    /**
     * 邻里圈取消点赞
     * @param fabulousAppDTO    请求参数
     *
     * @param fabulousAppDTO
     *            请求参数
     * @return  取消点赞结果
     */
    @Override
@@ -713,11 +751,13 @@
        //查询邻里圈点赞信息
        if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.llq)){
            //查询点赞信息
            circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
            circleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getParentId, fabulousAppDTO.getServiceId())
                            .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.llq)
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                        ComActNeighborCircleFabulousDO.isEffective.yes));
            if(circleFabulousDO == null){
                return R.fail("未查询到点赞信息");
            }
@@ -733,17 +773,20 @@
                this.baseMapper.addTopicHotNum(neighborCircleDO.getId(),-hotNum);
            }
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.pl)){
            circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
            circleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getParentId, fabulousAppDTO.getServiceId())
                            .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.pl)
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                        ComActNeighborCircleFabulousDO.isEffective.yes));
            if(circleFabulousDO == null){
                return R.fail("未查询到点赞信息");
            }

            //减少邻里圈评论点赞数量
            ComActNeighborCircleCommentDO circleCommentDO = comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            ComActNeighborCircleCommentDO circleCommentDO =
                comActNeighborCircleCommentDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentDO != null){
                circleCommentDO.setFabulousNum(circleCommentDO.getFabulousNum() - 1);
                comActNeighborCircleCommentDAO.updateById(circleCommentDO);
@@ -753,16 +796,19 @@
                this.baseMapper.addTopicHotNum(circleCommentDO.getCircleId(),-hotNum);
            }
        }else if(fabulousAppDTO.getType().equals(ComActNeighborFabulousAppDTO.type.hf)){
            circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                    new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,fabulousAppDTO.getServiceId())
            circleFabulousDO =
                comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda()
                    .eq(ComActNeighborCircleFabulousDO::getParentId, fabulousAppDTO.getServiceId())
                            .eq(ComActNeighborCircleFabulousDO::getUserId,fabulousAppDTO.getUserId())
                            .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                        ComActNeighborCircleFabulousDO.isEffective.yes));
            if(circleFabulousDO == null){
                return R.fail("未查询到点赞信息");
            }
            //减少邻里圈评论回复点赞数量
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO = comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            ComActNeighborCircleCommentReplyDO circleCommentReplyDO =
                comActNeighborCircleCommentReplyDAO.selectById(fabulousAppDTO.getServiceId());
            if(circleCommentReplyDO != null){
                circleCommentReplyDO.setFabulousNum(circleCommentReplyDO.getFabulousNum() - 1);
                comActNeighborCircleCommentReplyDAO.updateById(circleCommentReplyDO);
@@ -781,7 +827,9 @@

    /**
     * 添加邻里圈浏览记录
     * @param addBrowseAppDTO   请求参数
     *
     * @param addBrowseAppDTO
     *            请求参数
     * @return  返回参数
     */
    @Override
@@ -805,22 +853,27 @@

    /**
     * 分页查询评论下所有回复
     * @param commentReplyAppDTO    请求参数
     *
     * @param commentReplyAppDTO
     *            请求参数
     * @return  回复列表
     */
    @Override
    public R neighborCommentReplyByApp(ComActNeighborCommentReplyAppDTO commentReplyAppDTO){
        IPage<ComActNeighborCommentReplyAppVO> neighborCircleIPage = this.baseMapper.neighborCommentReplyByApp(
                new Page<>(commentReplyAppDTO.getPageNum(),commentReplyAppDTO.getPageSize()),commentReplyAppDTO.getCommentId());
            new Page<>(commentReplyAppDTO.getPageNum(), commentReplyAppDTO.getPageSize()),
            commentReplyAppDTO.getCommentId());
        if(!neighborCircleIPage.getRecords().isEmpty()){
            for (ComActNeighborCommentReplyAppVO commentReplyAppVO:neighborCircleIPage.getRecords()) {
                if(commentReplyAppDTO.getUserId() != null){
                    //查询点赞信息
                    ComActNeighborCircleFabulousDO circleFabulousDO = comActNeighborCircleFabulousDAO.selectOne(
                            new QueryWrapper<ComActNeighborCircleFabulousDO>().lambda().eq(ComActNeighborCircleFabulousDO::getParentId,commentReplyAppVO.getId())
                    ComActNeighborCircleFabulousDO circleFabulousDO =
                        comActNeighborCircleFabulousDAO.selectOne(new QueryWrapper<ComActNeighborCircleFabulousDO>()
                            .lambda().eq(ComActNeighborCircleFabulousDO::getParentId, commentReplyAppVO.getId())
                                    .eq(ComActNeighborCircleFabulousDO::getUserId,commentReplyAppDTO.getUserId())
                                    .eq(ComActNeighborCircleFabulousDO::getType,ComActNeighborCircleFabulousDO.type.hf)
                                    .eq(ComActNeighborCircleFabulousDO::getIsEffective,ComActNeighborCircleFabulousDO.isEffective.yes));
                            .eq(ComActNeighborCircleFabulousDO::getIsEffective,
                                ComActNeighborCircleFabulousDO.isEffective.yes));
                    if(circleFabulousDO != null){
                        commentReplyAppVO.setHaveSign(1);
                    }else{