From 1ef187142b42b859ab20be4d9c75185a6f256751 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期四, 29 四月 2021 13:24:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java index 5abbda0..3c97b42 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java @@ -1,7 +1,9 @@ package com.panzhihua.service_community.service.impl; + import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -20,6 +22,8 @@ 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.ComActNeighborCircleService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -27,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; + import java.util.List; /** @@ -40,7 +45,18 @@ @Resource private ComActNeighborCircleBrowseService comActNeighborCircleBrowseService; + @Resource + ComActNeighborCircleFabulousDAO neighborCircleFabulousDAO; + + @Resource + ComActNeighborCircleBrowseDAO neighborCircleBrowseDAO; + + @Resource + ComActNeighborCircleCommentDAO neighborCircleCommentDAO; + + @Resource + ComActNeighborCircleCommentReplyDAO neighborCircleCommentReplyDAO; private ComActNeighborCircleCommentDAO comActNeighborCircleCommentDAO; @Resource private ComActNeighborCircleCommentReplyDAO comActNeighborCircleCommentReplyDAO; @@ -354,4 +370,38 @@ return R.ok(); } + + @Override + public R deleteByAdmin(Long id) { + ComActNeighborCircleDO comActNeighborCircleDO = this.baseMapper.selectById(id); + if (comActNeighborCircleDO == null) { + return R.fail(); + } + if (comActNeighborCircleDO.getStatus() == 1) { + return R.fail("待审核的邻里圈不能删除"); + } + //邻里圈删除 + this.baseMapper.deleteById(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::get))*/ + return R.ok(); + + } + + @Override + public R detailNeighborByAdmin(Long id) { + return null; + } } -- Gitblit v1.7.1