From 84d56cf94d1c38c832f0620b3f3f85f6c14bbc6e Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 19 五月 2022 14:02:16 +0800
Subject: [PATCH] 花城E+bug更新
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 106 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 42 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 1d5b39d..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
@@ -1,5 +1,13 @@
package com.panzhihua.service_community.service.impl;
+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;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,11 +20,10 @@
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 org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import java.util.Date;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.annotation.Resource;
/**
* @auther lyq
@@ -25,39 +32,47 @@
*/
@Slf4j
@Service
-public class ComActNeighborCircleTopicServiceImpl extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO> implements ComActNeighborCircleTopicService {
+public class ComActNeighborCircleTopicServiceImpl
+ extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO>
+ implements ComActNeighborCircleTopicService {
-
+ @Resource
+ private ComActNeighborCircleDAO comActNeighborCircleDAO;
/**
* 分页查询邻里圈话题列表
- * @param circleTopicAdminDTO 请求参数
- * @return 邻里圈话题列表
+ *
+ * @param circleTopicAdminDTO
+ * 请求参数
+ * @return 邻里圈话题列表
*/
@Override
- public R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO){
- return R.ok(this.baseMapper.pageNeighborTopicByAdmin(new Page(circleTopicAdminDTO.getPageNum(),circleTopicAdminDTO.getPageSize()),circleTopicAdminDTO));
+ public R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO) {
+ return R.ok(this.baseMapper.pageNeighborTopicByAdmin(
+ new Page(circleTopicAdminDTO.getPageNum(), circleTopicAdminDTO.getPageSize()), circleTopicAdminDTO));
}
/**
* 添加邻里圈话题
- * @param addCircleTopicAdminDTO 请求参数
- * @return 添加结果
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 添加结果
*/
@Override
- public R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){
- ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
- .lambda().eq(ComActNeighborCircleTopicDO::getName,addCircleTopicAdminDTO.getName())
- .eq(ComActNeighborCircleTopicDO::getCommunityId,addCircleTopicAdminDTO.getCommunityId()));
- if(circleTopicDO != null){
+ public R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
+ ComActNeighborCircleTopicDO circleTopicDO =
+ this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>().lambda()
+ .eq(ComActNeighborCircleTopicDO::getName, addCircleTopicAdminDTO.getName())
+ );
+ if (circleTopicDO != null) {
return R.fail("该话题已存在");
}
circleTopicDO = new ComActNeighborCircleTopicDO();
- BeanUtils.copyProperties(addCircleTopicAdminDTO,circleTopicDO);
- circleTopicDO.setStatus(1);
+ BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
circleTopicDO.setCreateAt(new Date());
circleTopicDO.setCreateBy(addCircleTopicAdminDTO.getUserId());
- if(this.baseMapper.insert(circleTopicDO) > 0){
+ if (this.baseMapper.insert(circleTopicDO) > 0) {
return R.ok();
}
return R.fail("添加失败");
@@ -65,29 +80,20 @@
/**
* 编辑邻里圈话题
- * @param addCircleTopicAdminDTO 请求参数
- * @return 编辑结果
+ *
+ * @param addCircleTopicAdminDTO
+ * 请求参数
+ * @return 编辑结果
*/
@Override
- public R editNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){
+ public R editNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO) {
ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectById(addCircleTopicAdminDTO.getId());
- if(circleTopicDO == null){
+ 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){
+ BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
+ if (this.baseMapper.updateById(circleTopicDO) > 0) {
return R.ok();
}
return R.fail("修改失败");
@@ -95,12 +101,13 @@
/**
* 小程序查询邻里圈话题列表
- * @param communityId 社区id
- * @return 邻里圈话题列表
+ *
+ * 社区id
+ * @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId,Integer isZero){
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero));
+ public R getNeighborTopicByApp(String name){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(name));
}
/**
@@ -112,7 +119,8 @@
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::getName,circleTopicAppDTO.getName())
+ .eq(ComActNeighborCircleTopicDO::getBelongType,circleTopicAppDTO.getBelongType()));
if(circleTopicDO == null){
circleTopicDO = new ComActNeighborCircleTopicDO();
circleTopicDO.setCommunityId(circleTopicAppDTO.getCommunityId());
@@ -122,8 +130,22 @@
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