no
DESKTOP-71BH0QO\L、ming
2021-03-30 038537a132c3d2ba4f6b28dc427a38f62f1ce009
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -4,12 +4,11 @@
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.collect.Lists;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
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;
@@ -17,6 +16,7 @@
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;
@@ -39,27 +39,30 @@
    /**
     * 新增实有人口
     *
     * @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 编辑结果
     */
@@ -69,10 +72,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();
@@ -103,11 +106,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);
@@ -124,10 +127,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);
@@ -145,7 +148,7 @@
    @Override
    public R deletePopulation(Long populationId) {
        int delete = populationDAO.deleteById(populationId);
        if (delete>0) {
        if (delete > 0) {
            return R.ok();
        }
        return R.fail();
@@ -159,14 +162,77 @@
    @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) {
       /* //思路:实有房屋(小区)当前是存在重复人口,打印已经存在的重复数据
        List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
        if (list.size() == 0) {
            return R.fail("数据为空!");
        }
        judgeEmpty(list);
        ComActDO comActDO = comActDAO.selectById(communityId);
        ArrayList<ComMngVillageDO> comMngVillageDOS = Lists.newArrayList();
        list.forEach(vo -> {
            ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
            BeanUtils.copyProperties(vo, comMngVillageDO);
            comMngVillageDO.setCommunityId(comActDO.getCommunityId());
            comMngVillageDO.setStreetId(comActDO.getStreetId());
            comMngVillageDOS.add(comMngVillageDO);
        });
        this.saveBatch(comMngVillageDOS);
        return R.ok("共计导入实有房屋数量:" + comMngVillageDOS.size());*/
        return null;
    }
    /**
     * excel数据校验
     *
     * @param list
     */
    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("");
            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++;
        }*/
    }
}