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

huanghongfa

2021-08-23 0bbfd2faf511cdde6d179f5e2cde365624e52f5d

 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;
@@ -10,11 +15,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
@@ -23,28 +25,35 @@
 */
@Slf4j
@Service
public class ComActNeighborCircleTopicServiceImpl extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO> implements ComActNeighborCircleTopicService {

public class ComActNeighborCircleTopicServiceImpl
    extends ServiceImpl<ComActNeighborCircleTopicMapper, ComActNeighborCircleTopicDO>
    implements ComActNeighborCircleTopicService {

    /**
     * 分页查询邻里圈话题列表
     * @param circleTopicAdminDTO   请求参数
     * 
     * @param circleTopicAdminDTO
     *            请求参数
     * @return  邻里圈话题列表
     */
    @Override
    public R pageNeighborTopicByAdmin(ComActNeighborCircleTopicAdminDTO circleTopicAdminDTO){
        return R.ok(this.baseMapper.pageNeighborTopicByAdmin(new Page(circleTopicAdminDTO.getPageNum(),circleTopicAdminDTO.getPageSize()),circleTopicAdminDTO));
        return R.ok(this.baseMapper.pageNeighborTopicByAdmin(
            new Page(circleTopicAdminDTO.getPageNum(), circleTopicAdminDTO.getPageSize()), circleTopicAdminDTO));
    }

    /**
     * 添加邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * 
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return  添加结果
     */
    @Override
    public R addNeighborTopicByAdmin(AddNeighborCircleTopicAdminDTO addCircleTopicAdminDTO){
        ComActNeighborCircleTopicDO circleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
                .lambda().eq(ComActNeighborCircleTopicDO::getName,addCircleTopicAdminDTO.getName())
        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("该话题已存在");
@@ -63,7 +72,9 @@

    /**
     * 编辑邻里圈话题
     * @param addCircleTopicAdminDTO    请求参数
     * 
     * @param addCircleTopicAdminDTO
     *            请求参数
     * @return  编辑结果
     */
    @Override
@@ -75,8 +86,9 @@
        }

        if(StringUtils.isNotEmpty(addCircleTopicAdminDTO.getName())){
            ComActNeighborCircleTopicDO oldCircleTopicDO = this.baseMapper.selectOne(new QueryWrapper<ComActNeighborCircleTopicDO>()
                    .lambda().eq(ComActNeighborCircleTopicDO::getName,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())){
@@ -93,7 +105,9 @@

    /**
     * 小程序查询邻里圈话题列表
     * @param communityId   社区id
     * 
     * @param communityId
     *            社区id
     * @return  邻里圈话题列表
     */
    @Override