From 78d1c9ee9b0c49f77c29d0535cb93c6d62c42f3a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:58:25 +0800
Subject: [PATCH] 1111修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 74 insertions(+), 36 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 5e051a7..b086212 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,20 +1,24 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
+
+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;
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.dtos.neighbor.DeleteNeighborCircleAppDTO;
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 org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import java.util.Date;
+import lombok.extern.slf4j.Slf4j;
/**
* @auther lyq
@@ -23,39 +27,45 @@
*/
@Slf4j
@Service
-public class ComActNeighborCircleTopicServiceImpl extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO> implements ComActNeighborCircleTopicService {
-
+public class ComActNeighborCircleTopicServiceImpl
+ extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO>
+ implements ComActNeighborCircleTopicService {
/**
* 分页查询邻里圈话题列表
- * @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())
+ .eq(ComActNeighborCircleTopicDO::getCommunityId, addCircleTopicAdminDTO.getCommunityId()));
+ 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("添加失败");
@@ -63,29 +73,32 @@
/**
* 编辑邻里圈话题
- * @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){
+ 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("修改失败");
@@ -93,12 +106,37 @@
/**
* 小程序查询邻里圈话题列表
- * @param communityId 社区id
- * @return 邻里圈话题列表
+ *
+ * @param communityId
+ * 社区id
+ * @return 邻里圈话题列表
*/
@Override
- public R getNeighborTopicByApp(Long communityId){
- return R.ok(this.baseMapper.getNeighborTopicByApp(communityId));
+ public R getNeighborTopicByApp(Long communityId,Integer isZero,String name){
+ return R.ok(this.baseMapper.getNeighborTopicByApp(communityId,isZero,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()));
+ 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);
+ this.baseMapper.insert(circleTopicDO);
+ }
+ return R.ok(circleTopicDO);
+ }
}
--
Gitblit v1.7.1