From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 f73fa81..7b964ca 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,6 +2,9 @@
import java.util.Date;
+import com.panzhihua.service_community.dao.ComActNeighborCircleDAO;
+import com.panzhihua.service_community.model.dos.ComActNeighborCircleDO;
+import com.panzhihua.service_community.service.ComActNeighborCircleService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -20,6 +23,8 @@
import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+
/**
* @auther lyq
* @create 2021-07-06 15:04:37
@@ -31,6 +36,8 @@
extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO>
implements ComActNeighborCircleTopicService {
+ @Resource
+ private ComActNeighborCircleDAO comActNeighborCircleDAO;
/**
* 分页查询邻里圈话题列表
*
@@ -56,7 +63,7 @@
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("该话题已存在");
}
@@ -85,18 +92,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();
@@ -107,13 +102,12 @@
/**
* 小程序查询邻里圈话题列表
*
- * @param communityId
* 社区id
* @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId,Integer isZero,String name,Integer belongType){
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,name,belongType));
+ public R getNeighborTopicByApp(String name){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(name));
}
/**
@@ -141,4 +135,17 @@
}
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