fix：修改bug

DESKTOP-71BH0QO\L、ming

2021-04-02 2ced4e05bc384e010836df6f3f0f13dd6a7f2d0f

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

@@ -1,17 +1,22 @@
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.*;
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;
@@ -22,6 +27,7 @@
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;
@@ -32,9 +38,13 @@
 * 实有人口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;


    /**
@@ -175,64 +185,155 @@

    @Override
    public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) {
       /* //思路：实有房屋（小区）当前是存在重复人口,打印已经存在的重复数据
        List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
        if (list.size() == 0) {
            return R.fail("数据为空！");
        }
        judgeEmpty(list);
        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<ComMngVillageDO> comMngVillageDOS = Lists.newArrayList();
        ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
        list.forEach(vo -> {
            ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
            BeanUtils.copyProperties(vo, comMngVillageDO);
            comMngVillageDO.setCommunityId(comActDO.getCommunityId());
            comMngVillageDO.setStreetId(comActDO.getStreetId());
            comMngVillageDOS.add(comMngVillageDO);
            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() + "不存在！");
            }
            //性别判断
            if(!StringUtils.isEmpty(vo.getSex())){
                if(vo.getSex().equals(ComMngPopulationServeExcelVO.sex.nan)){
                    comMngPopulationDO.setSex(ComMngPopulationDO.sex.nan);
                }else if(vo.getSex().equals(ComMngPopulationServeExcelVO.sex.nv)){
                    comMngPopulationDO.setSex(ComMngPopulationDO.sex.nv);
                }else{
                    comMngPopulationDO.setSex(ComMngPopulationDO.sex.no);
                }
            }
            //是否租住判断
            if(!StringUtils.isEmpty(vo.getIsRent())){
                if(vo.getIsRent().equals(ComMngPopulationServeExcelVO.isOk.no)){
                    comMngPopulationDO.setIsRent(ComMngPopulationDO.isOk.no);
                }else{
                    comMngPopulationDO.setIsRent(ComMngPopulationDO.isOk.yes);
                }
            }
            //政治面貌判断
            if(!StringUtils.isEmpty(vo.getPoliticalOutlook())){
                if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.qun)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.qun);
                }else if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.tuan)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.tuan);
                }else if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.dang)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.dang);
                }else if(vo.getPoliticalOutlook().equals(ComMngPopulationServeExcelVO.politicalOutlook.wu)){
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.wu);
                }else{
                    comMngPopulationDO.setPoliticalOutlook(ComMngPopulationDO.politicalOutlook.no);
                }
            }
            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(comMngVillageDOS);
        return R.ok("共计导入实有房屋数量：" + comMngVillageDOS.size());*/
        return null;
        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;
    }

    /**
     * excel数据校验
     *
     * @param list
     * 根据id修改实有人口标签
     * @param populationTagDTO 请求参数
     * @return 修改结果
     */
    private void judgeEmpty(List<ComMngPopulationServeExcelVO> list) {
        /*int index = 2;
        for (ComMngPopulationServeExcelVO vo : list) {
            ComMngPopulationServeExcelVO comMngPopulationServeExcelVO = new ComMngPopulationServeExcelVO();
            comMngPopulationServeExcelVO.setName("");
            comMngPopulationServeExcelVO.setSex(0);
            comMngPopulationServeExcelVO.setAge(0);
            comMngPopulationServeExcelVO.setAdsf(0);
            comMngPopulationServeExcelVO.setRoad("");
            comMngPopulationServeExcelVO.setDoorNo(0);
            comMngPopulationServeExcelVO.setFloor("");
            comMngPopulationServeExcelVO.setUnitNo(0);
            comMngPopulationServeExcelVO.setHouseNo(0);
            comMngPopulationServeExcelVO.setNation("");
            comMngPopulationServeExcelVO.setPoliticalOutlook(0);
            comMngPopulationServeExcelVO.setCardNo("");
            comMngPopulationServeExcelVO.setPhone("");
            comMngPopulationServeExcelVO.setNativePlace("");
            comMngPopulationServeExcelVO.setWorkCompany("");
    @Override
    public R editTagPopulation(ComMngPopulationTagDTO populationTagDTO) {
        ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationTagDTO.getId());
        if (comMngPopulationDO == null) {
            return R.fail("未查询到人口记录");
        }
        BeanUtils.copyProperties(populationTagDTO,comMngPopulationDO);

            if (vo.get() == null) {
                return R.fail("门牌号第" + index + "行为空!");
            }
            if (vo.getAlley() == null) {
                return R.fail("街路巷第" + index + "行为空!");
            }
            //判断DB和exel数据重复判断
            boolean result = comMngVillageDOs.stream().allMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().equals(vo.getHouseNum()));
            if (result) {
                return R.fail("导入街路巷已存在(" + vo.getAlley() + ")");
            }
            index++;
        }*/
        int nub = populationDAO.updateById(comMngPopulationDO);
        if(nub < 1){
            return R.fail();
        }
        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();
    }
}