12/23 大屏修改

101captain

2021-12-23 5a8a90c095280fbd2106869ecd2bad10e01a57a6

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

@@ -1,5 +1,14 @@
package com.panzhihua.service_community.service.impl;

import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,15 +21,9 @@
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComStreetDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.ComStreetService;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.List;

/**
 * @author: llming
@@ -37,7 +40,8 @@
    /**
     * 新增社区
     *
     * @param comStreetVO 街道信息
     * @param comStreetVO
     *            街道信息
     * @return 新增结果
     */
    @Override
@@ -53,7 +57,7 @@
        param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
        Integer integer = comStreetDAO.selectCount(param);
        if (integer > 0) {
            return R.fail("街道已经存在");
            return R.fail(500, "街道已经存在");
        }
        BeanUtils.copyProperties(comStreetVO, comStreetDO);
        int insert = comStreetDAO.insert(comStreetDO);
@@ -62,32 +66,43 @@
            BeanUtils.copyProperties(comStreetDO1, comStreetVO);
            return R.ok(comStreetVO);
        }
        return R.fail();
        return R.fail(500, "");
    }


    /**
     * 查询街道
     *
     * @param comStreetVO 街道名
     * @param comStreetVO
     *            街道名
     * @return 社区集合
     */
    @Override
    public R listStreet(ComStreetVO comStreetVO) {
        List<ComStreetVO> vos = Lists.newArrayList();
        LambdaQueryWrapper<ComStreetDO> param = new QueryWrapper<ComStreetDO>().lambda();
        param.eq(ComStreetDO::getProvinceCode, comStreetVO.getProvinceCode());
        param.eq(ComStreetDO::getCityCode, comStreetVO.getCityCode());
        param.eq(ComStreetDO::getAreaCode, comStreetVO.getCityCode());
        List<ComStreetDO> ComStreetDOS = comStreetDAO.selectList(param);
        BeanUtils.copyProperties(vos, ComStreetDOS);
        return R.ok(comStreetVO);
        if (comStreetVO.getProvinceCode() != null) {
            param.eq(ComStreetDO::getProvinceCode, comStreetVO.getProvinceCode());
        }
        if (comStreetVO.getCityCode() != null) {
            param.eq(ComStreetDO::getCityCode, comStreetVO.getCityCode());
        }
        if (comStreetVO.getAreaCode() != null) {
            param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
        }
        List<ComStreetVO> voList = Lists.newArrayList();
        List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
        comStreetDOS.forEach(dos -> {
            ComStreetVO vo = new ComStreetVO();
            BeanUtils.copyProperties(dos, vo);
            voList.add(vo);
        });
        return R.ok(voList);
    }

    /**
     * 社区详情
     *
     * @param streetId 街道id
     * @param streetId
     *            街道id
     * @return 社区详情
     */
    @Override
@@ -105,7 +120,8 @@
    /**
     * 分页查询社区
     *
     * @param pageComStreetDTO 查询参数
     * @param pageComStreetDTO
     *            查询参数
     * @return 分页集合
     */
    @Override
@@ -114,37 +130,44 @@
        Long pageNum = pageComStreetDTO.getPageNum();
        Long pageSize = pageComStreetDTO.getPageSize();
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
            pageNum = 1L;
        }
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
            pageSize = 10L;
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        LambdaQueryWrapper<ComStreetDO> userLambdaQueryWrapper = Wrappers.lambdaQuery();
        if (!pageComStreetDTO.getName().isEmpty()) {
        if (pageComStreetDTO.getName() != null) {
            userLambdaQueryWrapper.like(ComStreetDO::getName, pageComStreetDTO.getName());
        }
        Page userPage = new Page(pageNum, pageSize);
        IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper);
        IPage<ComStreetDO> doPager =
            comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
        return R.ok(doPager);
    }


    /**
     * 批量删除社区
     * 批量删除街道
     *
     * @param streetIds 社区id
     * @param streetIds
     *            社区id
     * @return 删除结果
     */
    @Override
    public R delectStreat(List<Long> streetIds) {
        // 不能删除，已经绑定了社区的街道
        LambdaQueryWrapper<ComActDO> comActDOParam =
            new QueryWrapper<ComActDO>().lambda().in(ComActDO::getStreetId, streetIds);
        List<ComActDO> comActDOS = comActDAO.selectList(comActDOParam);
        if (comActDOS != null && comActDOS.size() > 0) {
            return R.fail("删除失败，批量删除街道中，街道下有社区无法删除！");
        }
        int delete = comStreetDAO.deleteBatchIds(streetIds);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
    }


}