From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期一, 09 六月 2025 11:54:00 +0800 Subject: [PATCH] 6.9新增登录失败冻结逻辑 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 83 ++++++++++++++++++++++++++++++----------- 1 files changed, 61 insertions(+), 22 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java index cb78a4b..7d68d36 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java @@ -2,21 +2,27 @@ import java.util.Date; +import com.panzhihua.service_community.dao.ComActNeighborCircleDAO; +import com.panzhihua.service_community.dao.ComActNeighborCircleTopicNewMapper; +import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO; +import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO; import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO; import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_community.dao.ComActNeighborCircleTopicMapper; import com.panzhihua.service_community.model.dos.ComActNeighborCircleTopicDO; import com.panzhihua.service_community.service.ComActNeighborCircleTopicService; import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; /** * @auther lyq @@ -29,9 +35,13 @@ extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO> implements ComActNeighborCircleTopicService { + @Resource + private ComActNeighborCircleDAO comActNeighborCircleDAO; + @Autowired + private ComActNeighborCircleTopicNewMapper comActNeighborCircleTopicNewMapper; /** * 分页查询邻里圈话题列表 - * + * * @param circleTopicAdminDTO * 请求参数 * @return 邻里圈话题列表 @@ -44,7 +54,7 @@ /** * 添加邻里圈话题 - * + * * @param addCircleTopicAdminDTO * 请求参数 * @return 添加结果 @@ -54,13 +64,12 @@ ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>().lambda() .eq(ComActNeighborCircleTopicDO::getName, addCircleTopicAdminDTO.getName()) - .eq(ComActNeighborCircleTopicDO::getCommunityId, addCircleTopicAdminDTO.getCommunityId())); + ); if (circleTopicDO != null) { return R.fail("该话题已存在"); } circleTopicDO = new ComActNeighborCircleTopicDO(); BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO); - circleTopicDO.setStatus(1); circleTopicDO.setCreateAt(new Date()); circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId()); @@ -72,7 +81,7 @@ /** * 编辑邻里圈话题 - * + * * @param addCircleTopicAdminDTO * 请求参数 * @return 编辑结果 @@ -84,18 +93,6 @@ if (circleTopicDO == null) { return R.fail("未找到邻里圈话题记录"); } - - if (StringUtils.isNotEmpty(addCircleTopicAdminDTO.getName())) { - ComActNeighborCircleTopicDO oldCircleTopicDO = - this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>().lambda() - .eq(ComActNeighborCircleTopicDO::getName, addCircleTopicAdminDTO.getName()) - .eq(ComActNeighborCircleTopicDO::getCommunityId, addCircleTopicAdminDTO.getCommunityId()) - .ne(ComActNeighborCircleTopicDO::getId, circleTopicDO.getId())); - if (oldCircleTopicDO != null && !oldCircleTopicDO.getId().equals(addCircleTopicAdminDTO.getId())) { - return R.fail("该话题已存在"); - } - } - BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO); if (this.baseMapper.updateById(circleTopicDO) > 0) { return R.ok(); @@ -105,14 +102,56 @@ /** * 小程序查询邻里圈话题列表 - * - * @param communityId + * * 社区id * @return 邻里圈话题列表 */ @Override - public R getNeighborTopicByApp(Long communityId) { - return R.ok(this.baseMapper.getNeighborTopicByApp(communityId)); + public R getNeighborTopicByApp(String name){ + return R.ok(this.baseMapper.getNeighborTopicByApp(name)); } + @Override + public R getNeighborTopicByAppNew(String name) { + return R.ok(comActNeighborCircleTopicNewMapper.getNeighborTopicByAppNew(name)); + } + + /** + * 小程序-用户新增话题 + * @param circleTopicAppDTO 请求参数 + * @return 新增结果 + */ + @Override + public R addNeighborTopicByApp(AddNeighborCircleTopicAppDTO circleTopicAppDTO){ + ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>() + .lambda().eq(ComActNeighborCircleTopicDO::getCommunityId,circleTopicAppDTO.getCommunityId()) + .eq(ComActNeighborCircleTopicDO::getName,circleTopicAppDTO.getName()) + .eq(ComActNeighborCircleTopicDO::getBelongType,circleTopicAppDTO.getBelongType())); + if(circleTopicDO == null){ + circleTopicDO = new ComActNeighborCircleTopicDO(); + circleTopicDO.setCommunityId(circleTopicAppDTO.getCommunityId()); + circleTopicDO.setName(circleTopicAppDTO.getName()); + circleTopicDO.setCreateBy(circleTopicAppDTO.getUserId()); + circleTopicDO.setCreateAt(new Date()); + circleTopicDO.setCount(0); + circleTopicDO.setHotNum(0L); + circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes); + circleTopicDO.setBelongType(circleTopicAppDTO.getBelongType()); + this.baseMapper.insert(circleTopicDO); + } + return R.ok(circleTopicDO); + } + + @Override + public R delete(Long id) { + ComActNeighborCircleTopicDO comActNeighborCircleTopicDO=this.baseMapper.selectById(id); + if(comActNeighborCircleTopicDO==null){ + return R.fail("参数错误"); + } + Integer count=this.comActNeighborCircleDAO.selectCount(new QueryWrapper<ComActNeighborCircleDO>().lambda().eq(ComActNeighborCircleDO::getTopicId,id)); + if(count>0){ + return R.fail("请删除相应问题"); + } + return R.ok(this.baseMapper.deleteById(id)); + } } -- Gitblit v1.7.1