修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

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

@@ -9,20 +9,20 @@
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.PopulIsOksEnum;
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.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.PayUtil;
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import com.panzhihua.service_community.service.ComMngPopulationService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -40,9 +40,7 @@
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -64,6 +62,8 @@
    private ComMngCarDAO comMngCarDAO;
    @Resource
    private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
    @Resource
    private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
    @Value("${domain.aesKey:}")
    private String aesKey;

@@ -136,6 +136,10 @@
        if (ObjectUtils.isEmpty(comMngPopulationDO)) {
            return R.fail("用户信息不存在");
        }
        if(StringUtils.isNotEmpty(comMngPopulationDO.getBirthday())){//计算年龄
            comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
        }

        ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
        BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);

@@ -161,6 +165,9 @@
        //查询当前用户房屋信息
        List<ComMngHouseVo> houseList = comMngPopulationHouseDAO.getPopulHouseListByPopulId(populationId);
        if(!houseList.isEmpty()){
            houseList.forEach(house ->{

            });
            comMngPopulationVO.setHouseList(houseList);
        }

@@ -192,6 +199,13 @@
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
        if(!iPage.getRecords().isEmpty()){
            iPage.getRecords().forEach(populDO -> {
                if(StringUtils.isNotEmpty(populDO.getBirthday())){
                    populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
                }
            });
        }
        return R.ok(iPage);
    }

@@ -248,6 +262,7 @@
        int index = 2;
        //处理实有人口信息
        List<ComMngPopulationDO> savePopulList = new ArrayList<>();
        List<ComMngPopulationHouseDO> saveHouseList = new ArrayList<>();
        for (ComMngPopulationServeExcelVO vo : list) {
            String address = "";
            //查询街路巷是否存在
@@ -268,32 +283,46 @@

            //先判断房屋是否存在
            ComMngPopulationHouseDO populationHouseDO = comMngPopulationHouseDAO.selectOne(new QueryWrapper<ComMngPopulationHouseDO>().lambda()
                    .eq(ComMngPopulationHouseDO::getCommunityId,communityId).eq(ComMngPopulationHouseDO::getAlley,vo.getRoad()).eq(ComMngPopulationHouseDO::getHouseNum,vo.getDoorNo())
                    .eq(ComMngPopulationHouseDO::getCommunityId,communityId).eq(ComMngPopulationHouseDO::getVillageId,comMngVillageDO.getVillageId())
                    .eq(ComMngPopulationHouseDO::getFloor,vo.getFloor()).eq(ComMngPopulationHouseDO::getUnitNo,vo.getUnitNo())
                    .eq(ComMngPopulationHouseDO::getHouseNo,vo.getHouseNo()));
            if(populationHouseDO == null){
                //查询该房屋未建立，执行建立房屋信息
                populationHouseDO = new ComMngPopulationHouseDO();
                populationHouseDO.setAlley(vo.getRoad());
                populationHouseDO.setHouseNum(vo.getDoorNo());
                populationHouseDO.setCommunityId(communityId);
                populationHouseDO.setFloor(vo.getFloor());
                populationHouseDO.setUnitNo(vo.getUnitNo());
                populationHouseDO.setHouseNo(vo.getHouseNo());
                populationHouseDO.setAddress(address);
                if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
                    populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
                boolean isExits = true;
                if(!saveHouseList.isEmpty()){
                    for (ComMngPopulationHouseDO saveHouse:saveHouseList){
                        if(saveHouse.getVillageId().equals(comMngVillageDO.getVillageId())
                                && saveHouse.getFloor().equals(vo.getFloor()) && saveHouse.getUnitNo().equals(vo.getUnitNo())
                                && saveHouse.getHouseNo().equals(vo.getHouseNo())){
                            populationHouseDO = saveHouse;
                            isExits = false;
                            break;
                        }
                    }
                }
                if(vo.getHouseStatus() != null){
                    populationHouseDO.setStatus(vo.getHouseStatus());
                if(isExits){
                    //查询该房屋未建立，执行建立房屋信息
                    populationHouseDO = new ComMngPopulationHouseDO();
                    populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
                    populationHouseDO.setCommunityId(communityId);
                    populationHouseDO.setFloor(vo.getFloor());
                    populationHouseDO.setUnitNo(vo.getUnitNo());
                    populationHouseDO.setHouseNo(vo.getHouseNo());
                    populationHouseDO.setAddress(address);
                    if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
                        populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
                    }
                    if(vo.getHouseStatus() != null){
                        populationHouseDO.setStatus(vo.getHouseStatus());
                    }
                    if(vo.getHousePurpose() != null){
                        populationHouseDO.setPurpose(vo.getHousePurpose());
                    }
                    if(vo.getControlStatus() != null){
                        populationHouseDO.setControlStatus(vo.getControlStatus());
                    }
                    comMngPopulationHouseDAO.insert(populationHouseDO);
                    saveHouseList.add(populationHouseDO);
                }
                if(vo.getHousePurpose() != null){
                    populationHouseDO.setPurpose(vo.getHousePurpose());
                }
                if(vo.getControlStatus() != null){
                    populationHouseDO.setControlStatus(vo.getControlStatus());
                }
                comMngPopulationHouseDAO.insert(populationHouseDO);
            }

            if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
@@ -545,46 +574,76 @@
    }

    @Override
    public R editPopulation(EditComMngPopulationVO vo, Long communityId) {
        ComActDO comActDO = comActDAO.selectById(communityId);
    public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception{
        ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
        if(populationDO==null){
        if(populationDO == null){
            return R.fail();
        }
        String cardNo = populationDO.getCardNo();
        BeanUtils.copyProperties(vo,populationDO);
        try {
            //TODO 修改拦截器时候需要维护加密操作
            if(!cardNo.equals(vo.getCardNo())){//判断是否修改身份证号码
                //判断要修改的身份证号码是否已存在
                ComMngPopulationDO cardNoDO = populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>()
                        .lambda().eq(ComMngPopulationDO::getCardNo,vo.getCardNo()));
                if(cardNoDO != null){
                    return R.fail("您输入的身份证已存在，请重新输入");
                }
                populationDO.setCardNo(AESUtil.encrypt128(vo.getCardNo(), aesKey));
            }else{
                populationDO.setCardNo(AESUtil.encrypt128(cardNo, aesKey));
            }
            populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
        } catch (Exception e) {
            e.printStackTrace();
            return R.fail();
        populationDO.setCardNo(null);
        populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));

        ComActDO comActDO = comActDAO.selectById(communityId);
        if(comActDO != null){
            populationDO.setActId(comActDO.getCommunityId());
            populationDO.setStreetId(comActDO.getStreetId());
        }

        ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
        if (comMngVillageDO == null) {
            return R.fail("街道巷:" + vo.getRoad() + vo.getDoorNo() + "不存在！");
//            throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
        //查询当前用户所有房屋id
        List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
        //清除用户房屋居住信息
        comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(vo.getId());
        if(!houseIds.isEmpty()){
            houseIds.forEach(houseId -> {
                //查询当前房屋下是否有人口信息，如果没有则将房屋设置为空户
                List<Long> oldHouseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByhHosueId(houseId);
                if(oldHouseIds.isEmpty()){
                    //修改房屋信息为空户
                    comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId,1);
                }
            });
        }
        populationDO.setVillageId(comMngVillageDO.getVillageId());
        populationDO.setActId(comActDO.getCommunityId());
        populationDO.setStreetId(comActDO.getStreetId());
        if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
            populationDO.setVillageName(comMngVillageDO.getGroupAt());


        //更新用户的房屋信息
        Long houseId = null;
        List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
        if(!vo.getHouseEditDTOList().isEmpty()){
            for (ComMngPopulationHouseEditDTO houseEditDto:vo.getHouseEditDTOList()) {
                ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
                populationHouseUserDO.setPopulId(populationDO.getId());
                populationHouseUserDO.setHouseId(houseEditDto.getId());
                if(houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)){
                    houseId = houseEditDto.getId();//居住地
                }
                populationHouseUserDOList.add(populationHouseUserDO);

                //修改房屋信息不为空户
                comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(),2);
            }
        }
        comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);

        if(houseId != null){//居住地更新
            ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(houseId);
            if(houseDO != null){
                populationDO.setRoad(houseDO.getAlley());
                populationDO.setDoorNo(houseDO.getHouseNum());
                populationDO.setFloor(houseDO.getFloor());
                populationDO.setUnitNo(houseDO.getUnitNo());
                populationDO.setHouseNo(houseDO.getHouseNo());
                ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().lambda()
                        .eq(ComMngVillageDO::getAlley,houseDO.getAlley()).eq(ComMngVillageDO::getHouseNum,houseDO.getHouseNum())
                        .eq(ComMngVillageDO::getCommunityId,communityId));
                if (comMngVillageDO != null) {
                    populationDO.setVillageId(comMngVillageDO.getVillageId());
                    if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
                        populationDO.setVillageName(comMngVillageDO.getGroupAt());
                    }
                }
            }
        }
        populationDO.setUpdateAt(new Date());
//        this.updateById(populationDO);
        if(populationDAO.updateById(populationDO) > 0){
            return R.ok();
        }else{
@@ -649,4 +708,19 @@
         populationDAO.updateSysUserElectronicFile(userElectronicFileVO);
        return R.ok();
    }

    /**
     * 实有人口统计
     * @param communityId   社区id
     * @return  统计结果
     */
    @Override
    public R getPopulationTotalByAdmin(Long communityId){
        return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId));
    }


    public static void main(String[] args) {
//        List<ComMngPopulationHouseUserDO> distinctClass = populationHouseUserDOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPopulId() + ";" + o.getHouseId() + ";" + o.getId() + ";" + o.getRelation()))), ArrayList::new));
    }
}