Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java

@@ -1,5 +1,10 @@
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;
@@ -12,11 +17,8 @@
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
@@ -25,39 +27,46 @@
 */
@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);
        BeanUtils.copyProperties(addCircleTopicAdminDTO, circleTopicDO);
        circleTopicDO.setStatus(1);
        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 +74,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 && !oldCircleTopicDO.getId().equals(addCircleTopicAdminDTO.getId())){
        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,8 +107,10 @@

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * @return  邻里圈话题列表
     *
     * @param communityId
     *            社区id
     * @return 邻里圈话题列表
     */
    @Override
    public R getNeighborTopicByApp(Long communityId,Integer isZero){