fix：修改bug

DESKTOP-71BH0QO\L、ming

2021-04-02 8555f974846ca5b4f4734f52b51e39cd4502df44

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

@@ -1,28 +1,33 @@
package com.panzhihua.service_community.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.service_community.dao.ComActActivityDAO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.ComActActivityDO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngPopulationService;
import org.springframework.beans.BeanUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -33,34 +38,41 @@
 * 实有人口Service实现类
 */
@Service
public class ComMngPopulationServiceImpl implements ComMngPopulationService {
public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
    @Resource
    private ComMngPopulationDAO populationDAO;
    @Resource
    private ComActDAO comActDAO;
    @Resource
    private ComActVillageDAO comActVillageDAO;


    /**
     * 新增实有人口
     *
     * @param comMngPopulationVO 新增信息
     * @return 新增结果
     */
    @Override
    public R addPopulation(ComMngPopulationVO comMngPopulationVO) {
        ComMngPopulationDO comMngPopulationDO=new ComMngPopulationDO();
        ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
        Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo()));
        if (integer>0) {
        if (integer > 0) {
            return R.fail("实有人口已经存在");
        }
        BeanUtils.copyProperties(comMngPopulationVO,comMngPopulationDO);
        BeanUtils.copyProperties(comMngPopulationVO, comMngPopulationDO);

        int nub = populationDAO.insert(comMngPopulationDO);
        if(nub < 1){
        if (nub < 1) {
            return R.fail();
        }
        return R.ok(nub);
    }


    /**
     * 编辑实有人口
     *
     * @param comMngPopulationVO 编辑内容
     * @return 编辑结果
     */
@@ -70,10 +82,10 @@
        if (comMngPopulationDO == null) {
            return R.fail("未查询到人口记录");
        }
        BeanUtils.copyProperties(comMngPopulationVO,comMngPopulationDO);
        BeanUtils.copyProperties(comMngPopulationVO, comMngPopulationDO);

        int nub = populationDAO.updateById(comMngPopulationDO);
        if(nub < 1){
        if (nub < 1) {
            return R.fail();
        }
        return R.ok();
@@ -104,11 +116,11 @@
            return R.fail();
        }
        ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
        BeanUtils.copyProperties(comMngPopulationDO,comMngPopulationVO);
        BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);

        //查询家庭成员信息
        List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = populationDAO.listFamilyByUserId(comMngPopulationDO.getId());
        if(!comMngFamilyInfoVOS.isEmpty()){
        if (!comMngFamilyInfoVOS.isEmpty()) {
            comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        }
        return R.ok(comMngPopulationVO);
@@ -125,10 +137,10 @@
        Page page = new Page<>();
        Long pageNum = comMngPopulationVO.getPageNum();
        Long pageSize = comMngPopulationVO.getPageSize();
        if (null==pageNum||0==pageNum) {
        if (null == pageNum || 0 == pageNum) {
            pageNum = 1l;
        }
        if (null==pageSize||0==pageSize) {
        if (null == pageSize || 0 == pageSize) {
            pageSize = 10l;
        }
        page.setSize(pageSize);
@@ -146,7 +158,7 @@
    @Override
    public R deletePopulation(Long populationId) {
        int delete = populationDAO.deleteById(populationId);
        if (delete>0) {
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
@@ -160,15 +172,103 @@
    @Override
    public R listPopulationAll() {
        List<ComMngPopulationDO> populationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt));
        List<ComMngPopulationVO> populationVOS=new ArrayList<>();
        List<ComMngPopulationVO> populationVOS = new ArrayList<>();
        if (!ObjectUtils.isEmpty(populationDOS)) {
            populationDOS.forEach(comActDO -> {
                ComMngPopulationVO populationVO=new ComMngPopulationVO();
                BeanUtils.copyProperties(comActDO,populationVO);
                ComMngPopulationVO populationVO = new ComMngPopulationVO();
                BeanUtils.copyProperties(comActDO, populationVO);
                populationVOS.add(populationVO);
            });
        }
        return R.ok(populationVOS);
    }

    @Override
    public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) {
        if (list.size() == 0) {
            return R.fail("数据为空！");
        }
        List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
        //查询该社区所有(实有房屋)小区
        List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
        int index = 2;
        for (ComMngPopulationServeExcelVO vo : list) {
            if (vo.getName() == null) {
                return R.fail("家庭成员（姓名）第" + index + "行为空!");
            }
            if (vo.getSex() == null) {
                return R.fail("性别第" + index + "行为空!");
            }
            if (vo.getAge() == null) {
                return R.fail("年龄" + index + "行为空!");
            }

            if (vo.getIsRent() == null) {
                return R.fail("是否租住，第" + index + "行为空!");
            }
            if (vo.getRoad() == null) {
                return R.fail("街路巷，第" + index + "行为空!");
            }
            if (vo.getDoorNo() == null) {
                return R.fail("门牌号，第" + index + "行为空!");
            }

            if (vo.getFloor() == null) {
                return R.fail("楼排号，第" + index + "行为空!");
            }
            if (vo.getUnitNo() == null) {
                return R.fail("单元号，第" + index + "行为空!");
            }
            if (vo.getHouseNo() == null) {
                return R.fail("户室，第" + index + "行为空!");
            }
            if (vo.getNation() == null) {
                return R.fail("民族，第" + index + "行为空!");
            }
            if (vo.getPoliticalOutlook() == null) {
                return R.fail("政治面貌，第" + index + "行为空!");
            }
            if (vo.getCardNo() == null) {
                return R.fail("身份证号码，第" + index + "行为空!");
            }
            if (vo.getPhone() == null) {
                return R.fail("联系方式，第" + index + "行为空!");
            }
            //判断DB和exel数据重复判断
            boolean result = comMngPopulationDOS.stream().anyMatch(population -> population.getCardNo().equals(vo.getCardNo()));
            if (result) {
                return R.fail("导入实有人口已存在(" + vo.getCardNo() + ")");
            }
            index++;
        }
        ComActDO comActDO = comActDAO.selectById(communityId);
        ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
        list.forEach(vo -> {
            ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
            ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
            BeanUtils.copyProperties(vo, comMngPopulationDO);
            if (comMngVillageDO == null) {
                throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
            }
            comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
            comMngPopulationDO.setActId(comActDO.getCommunityId());
            comMngPopulationDO.setStreetId(comActDO.getStreetId());
            comMngPopulationDO.setLabel(Joiner.on(",").join(vo.getUserTagStr()));
            comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
            populationDOList.add(comMngPopulationDO);
        });
        this.saveBatch(populationDOList);
        return R.ok("共计导入实有人口数量：" + populationDOList.size());
    }

    public boolean isNumeric(String str) {
        for (int i = 0; i < str.length(); i++) {
            System.out.println(str.charAt(i));
            if (!Character.isDigit(str.charAt(i))) {
                return false;
            }
        }
        return true;
    }

    /**
@@ -190,4 +290,56 @@
        }
        return R.ok();
    }

    /**
     * 批量删除实有人口
     * @param Ids
     * @return
     */
    @Override
    public R deletePopulations(List<Long> Ids) {
        int delete = populationDAO.deleteBatchIds(Ids);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
    }

    /**
     * 根据社区id查询所有实有人口
     * @param communityId   社区id
     * @return  查询结果
     */
    @Override
    public R getPopulationListByCommunityId(Long communityId) {
        List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id",communityId));
        List<ComMngPopulationVO> resultList = new ArrayList<>();
        if(list.size() > 0){
            list.forEach(populationDO -> {
                ComMngPopulationVO populationVO=new ComMngPopulationVO();
                BeanUtils.copyProperties(populationDO,populationVO);
                resultList.add(populationVO);
            });
        }
        return R.ok(resultList);
    }

    /**
     * 根据id集合查询实有人口
     * @param Ids   实有人口id集合
     * @return  查询结果
     */
    @Override
    public R getPopulationLists(List<Long> Ids) {
        List<ComMngPopulationDO> list = populationDAO.selectBatchIds(Ids);
        List<ComMngPopulationVO> resultList = new ArrayList<>();
        if(list.size() > 0){
            list.forEach(populationDO -> {
                ComMngPopulationVO populationVO = new ComMngPopulationVO();
                BeanUtils.copyProperties(populationDO,populationVO);
                resultList.add(populationVO);
            });
        }
        return R.ok(resultList);
    }
}