java/zhihuishenqu.git

			@@ -7,8 +7,12 @@

			import javax.annotation.Resource;

			import com.baomidou.mybatisplus.core.conditions.Wrapper;
			import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
			import com.panzhihua.common.utlis.*;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.context.annotation.Bean;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;
			@@ -51,24 +55,20 @@
			import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
			import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
			import com.panzhihua.common.model.vos.user.*;
			import com.panzhihua.common.utlis.AgeUtils;
			import com.panzhihua.common.utlis.DateUtils;
			import com.panzhihua.common.utlis.Snowflake;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_community.dao.*;
			import com.panzhihua.service_community.model.dos.*;
			import com.panzhihua.service_community.service.*;

			import cn.hutool.core.util.IdcardUtil;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.web.bind.annotation.RequestParam;

			/**
			* 实有人口Service实现类
			*/
			@Slf4j
			@Service
			public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO>
			implements ComMngPopulationService {
			public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
			@Resource
			private ComMngPopulationDAO populationDAO;
			@Resource
			@@ -119,6 +119,14 @@
			private ComDisabilityPopulationDAO comDisabilityPopulationDAO;
			@Resource
			private ComLowSecurityPopulationDAO comLowSecurityPopulationDAO;
			@Resource
			private ComElderAuthElderliesDAO comElderAuthElderliesDAO;
			@Resource
			private ComPensionAuthPensionerDAO comPensionAuthPensionerDAO;
			@Resource
			private ComEldersAuthStatisticsMapper comEldersAuthStatisticsMapper;
			@Resource
			private ComPensionAuthStatisticsDAO comPensionAuthStatisticsDAO;
			@Value("${domain.aesKey:}")
			private String aesKey;

			@@ -189,7 +197,7 @@
			* @return 实有人口详情
			*/
			@Override
			public R detailPopulation(Long populationId) {
			public R detailPopulation(Long populationId, Long communityId) {
			ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
			if (ObjectUtils.isEmpty(comMngPopulationDO)) {
			return R.fail("用户信息不存在");
			@@ -230,7 +238,8 @@
			// 设置特殊群体标签
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
			comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda()
			.eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId));
			.eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId)
			.eq(ComMngPopulationCommunityTagsDO::getCommunityId, communityId));
			if (null != comMngPopulationCommunityTagsDO) {
			comMngPopulationVO.setLabel(comMngPopulationCommunityTagsDO.getLabel());
			}
			@@ -265,126 +274,167 @@
			comMngPopulationVO.setCarList(carList);
			}

			// 吸毒信息
			List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
			List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(
			new QueryWrapper<ComDrugPopulationDO>().lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
			if (!comDrugPopulationDOs.isEmpty()) {
			comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
			ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
			BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
			comDrugPopulationVOs.add(comDrugPopulationVO);
			comMngPopulationVO.setComDrugPopulationVOs(comDrugPopulationVOs);
			});
			}
			if (communityId != null){
			// 吸毒信息
			List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
			List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(
			new QueryWrapper<ComDrugPopulationDO>().lambda().eq(ComDrugPopulationDO::getPopulationId, populationId)
			.eq(ComDrugPopulationDO::getCommunityId, communityId));
			if (!comDrugPopulationDOs.isEmpty()) {
			comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
			ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
			BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
			comDrugPopulationVOs.add(comDrugPopulationVO);
			comMngPopulationVO.setComDrugPopulationVOs(comDrugPopulationVOs);
			});
			}

			// 社区矫正信息
			List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
			List<ComCorrectPopulationDO> comCorrectPopulationDOS =
			comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().lambda()
			.eq(ComCorrectPopulationDO::getPopulationId, populationId));
			if (!comCorrectPopulationDOS.isEmpty()) {
			comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
			ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
			BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
			comCorrectPopulationVOS.add(comCorrectPopulationVO);
			comMngPopulationVO.setComCorrectPopulationVOs(comCorrectPopulationVOS);
			});
			}
			// 社区矫正信息
			List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
			List<ComCorrectPopulationDO> comCorrectPopulationDOS =
			comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().lambda()
			.eq(ComCorrectPopulationDO::getPopulationId, populationId)
			.eq(ComCorrectPopulationDO::getCommunityId, communityId));
			if (!comCorrectPopulationDOS.isEmpty()) {
			comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
			ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
			BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
			comCorrectPopulationVOS.add(comCorrectPopulationVO);
			comMngPopulationVO.setComCorrectPopulationVOs(comCorrectPopulationVOS);
			});
			}

			// 精神障碍信息
			List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
			List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(
			new QueryWrapper<ComMajorPopulationDO>().lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
			if (!comMajorPopulationDOs.isEmpty()) {
			comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
			ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
			BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
			comMajorPopulationVOS.add(comMajorPopulationVO);
			comMngPopulationVO.setComMajorPopulationVOs(comMajorPopulationVOS);
			});
			}
			// 精神障碍信息
			List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
			List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(
			new QueryWrapper<ComMajorPopulationDO>().lambda().eq(ComMajorPopulationDO::getPopulationId, populationId)
			.eq(ComMajorPopulationDO::getCommunityId, communityId));
			if (!comMajorPopulationDOs.isEmpty()) {
			comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
			ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
			BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
			comMajorPopulationVOS.add(comMajorPopulationVO);
			comMngPopulationVO.setComMajorPopulationVOs(comMajorPopulationVOS);
			});
			}

			// 邪教信息
			List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
			List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(
			new QueryWrapper<ComCultPopulationDO>().lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
			if (!comCultPopulationDOS.isEmpty()) {
			comCultPopulationDOS.forEach(comCultPopulationDO -> {
			ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
			BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
			comCultPopulationVOS.add(comCultPopulationVO);
			comMngPopulationVO.setComCultPopulationVOs(comCultPopulationVOS);
			});
			}
			// 邪教信息
			List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
			List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(
			new QueryWrapper<ComCultPopulationDO>().lambda().eq(ComCultPopulationDO::getPopulationId, populationId)
			.eq(ComCultPopulationDO::getCommunityId, communityId));
			if (!comCultPopulationDOS.isEmpty()) {
			comCultPopulationDOS.forEach(comCultPopulationDO -> {
			ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
			BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
			comCultPopulationVOS.add(comCultPopulationVO);
			comMngPopulationVO.setComCultPopulationVOs(comCultPopulationVOS);
			});
			}

			// 刑释信息
			List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
			List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS =
			comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
			.eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
			if (!comRehabilitationPopulationDOS.isEmpty()) {
			comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
			ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
			BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
			comRehabilitationPopulationVOS.add(comRehabilitationPopulationVO);
			comMngPopulationVO.setComRehabilitationPopulationVOs(comRehabilitationPopulationVOS);
			});
			}
			// 刑释信息
			List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
			List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS =
			comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
			.eq(ComRehabilitationPopulationDO::getPopulationId, populationId)
			.eq(ComRehabilitationPopulationDO::getCommunityId, communityId));
			if (!comRehabilitationPopulationDOS.isEmpty()) {
			comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
			ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
			BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
			comRehabilitationPopulationVOS.add(comRehabilitationPopulationVO);
			comMngPopulationVO.setComRehabilitationPopulationVOs(comRehabilitationPopulationVOS);
			});
			}

			// 上访信息
			List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
			List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(
			new QueryWrapper<ComKeyPopulationDO>().lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
			if (!comKeyPopulationDOS.isEmpty()) {
			comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
			ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
			BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
			comKeyPopulationVOS.add(comKeyPopulationVO);
			comMngPopulationVO.setComKeyPopulationVOs(comKeyPopulationVOS);
			});
			}
			// 上访信息
			List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
			List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(
			new QueryWrapper<ComKeyPopulationDO>().lambda().eq(ComKeyPopulationDO::getPopulationId, populationId)
			.eq(ComKeyPopulationDO::getCommunityId, communityId));
			if (!comKeyPopulationDOS.isEmpty()) {
			comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
			ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
			BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
			comKeyPopulationVOS.add(comKeyPopulationVO);
			comMngPopulationVO.setComKeyPopulationVOs(comKeyPopulationVOS);
			});
			}

			// 退役军人信息
			List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
			List<ComVeteransPopulationDO> comVeteransPopulationDOS =
			comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().lambda()
			.eq(ComVeteransPopulationDO::getPopulationId, populationId));
			if (!comVeteransPopulationDOS.isEmpty()) {
			comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
			ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
			BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
			comVeteransPopulationVOS.add(comVeteransPopulationVO);
			comMngPopulationVO.setComVeteransPopulationVOs(comVeteransPopulationVOS);
			});
			}
			// 退役军人信息
			List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
			List<ComVeteransPopulationDO> comVeteransPopulationDOS =
			comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().lambda()
			.eq(ComVeteransPopulationDO::getPopulationId, populationId)
			.eq(ComVeteransPopulationDO::getCommunityId, communityId));
			if (!comVeteransPopulationDOS.isEmpty()) {
			comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
			ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
			BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
			comVeteransPopulationVOS.add(comVeteransPopulationVO);
			comMngPopulationVO.setComVeteransPopulationVOs(comVeteransPopulationVOS);
			});
			}

			// 残疾人信息
			List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
			List<ComDisabilityPopulationDO> comDisabilityPopulationDOS =
			comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
			.eq(ComDisabilityPopulationDO::getPopulationId, populationId));
			if (!comDisabilityPopulationDOS.isEmpty()) {
			comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
			ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
			BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
			comDisabilityPopulationVOS.add(comDisabilityPopulationVO);
			comMngPopulationVO.setComDisabilityPopulationVOs(comDisabilityPopulationVOS);
			});
			}
			// 残疾人信息
			List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
			List<ComDisabilityPopulationDO> comDisabilityPopulationDOS =
			comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
			.eq(ComDisabilityPopulationDO::getPopulationId, populationId)
			.eq(ComDisabilityPopulationDO::getCommunityId, communityId));
			if (!comDisabilityPopulationDOS.isEmpty()) {
			comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
			ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
			BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
			comDisabilityPopulationVOS.add(comDisabilityPopulationVO);
			comMngPopulationVO.setComDisabilityPopulationVOs(comDisabilityPopulationVOS);
			});
			}

			// 低保户信息
			List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
			List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS =
			comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
			.eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
			if (!comLowSecurityPopulationDOS.isEmpty()) {
			comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
			ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
			BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
			comLowSecurityPopulationVOS.add(comLowSecurityPopulationVO);
			comMngPopulationVO.setComLowSecurityPopulationVOs(comLowSecurityPopulationVOS);
			});
			// 低保户信息
			List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
			List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS =
			comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
			.eq(ComLowSecurityPopulationDO::getPopulationId, populationId)
			.eq(ComLowSecurityPopulationDO::getCommunityId, communityId));
			if (!comLowSecurityPopulationDOS.isEmpty()) {
			comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
			ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
			BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
			comLowSecurityPopulationVOS.add(comLowSecurityPopulationVO);
			comMngPopulationVO.setComLowSecurityPopulationVOs(comLowSecurityPopulationVOS);
			});
			}

			// 高龄老人信息
			List<ComElderAuthElderliesVO> comElderAuthElderliesVOList = new ArrayList<>();
			List<ComElderAuthElderliesDO> comElderAuthElderliesDOS =
			comElderAuthElderliesDAO.selectList(new QueryWrapper<ComElderAuthElderliesDO>().lambda()
			.eq(ComElderAuthElderliesDO::getPopulationId, populationId)
			.eq(ComElderAuthElderliesDO::getCommunityId, communityId));
			if (!comElderAuthElderliesDOS.isEmpty()) {
			comElderAuthElderliesDOS.forEach(comElderAuthElderliesDO -> {
			ComElderAuthElderliesVO comElderAuthElderliesVO = new ComElderAuthElderliesVO();
			BeanUtils.copyProperties(comElderAuthElderliesDO, comElderAuthElderliesVO);
			comElderAuthElderliesVOList.add(comElderAuthElderliesVO);
			comMngPopulationVO.setComElderAuthElderliesVOList(comElderAuthElderliesVOList);
			});
			}

			// 养老人员信息
			List<ComPensionAuthPensionerVO> comPensionAuthPensionerVOList = new ArrayList<>();
			List<ComPensionAuthPensionerDO> comPensionAuthPensionerDOS =
			comPensionAuthPensionerDAO.selectList(new QueryWrapper<ComPensionAuthPensionerDO>().lambda()
			.eq(ComPensionAuthPensionerDO::getPopulationId, populationId)
			.eq(ComPensionAuthPensionerDO::getCommunityId, communityId));
			if (!comPensionAuthPensionerDOS.isEmpty()) {
			comPensionAuthPensionerDOS.forEach(comPensionAuthPensionerDO -> {
			ComPensionAuthPensionerVO comPensionAuthPensionerVO = new ComPensionAuthPensionerVO();
			BeanUtils.copyProperties(comPensionAuthPensionerDO, comPensionAuthPensionerVO);
			comPensionAuthPensionerVOList.add(comPensionAuthPensionerVO);
			comMngPopulationVO.setComPensionAuthPensionerVOList(comPensionAuthPensionerVOList);
			});
			}
			}
			return R.ok(comMngPopulationVO);
			}
			@@ -419,25 +469,27 @@
			break;
			case 2:
			comMngPopulationVO.setRoad(houseDO.getAlley());
			comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
			// comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
			break;
			case 3:
			comMngPopulationVO.setRoad(houseDO.getAlley());
			comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
			comMngPopulationVO.setFloor(houseDO.getFloor());
			// comMngPopulationVO.setFloor(houseDO.getFloor());
			break;
			case 4:
			comMngPopulationVO.setRoad(houseDO.getAlley());
			comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
			comMngPopulationVO.setFloor(houseDO.getFloor());
			comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
			// comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
			break;
			case 5:
			comMngPopulationVO.setRoad(houseDO.getAlley());
			comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
			comMngPopulationVO.setFloor(houseDO.getFloor());
			comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
			comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
			if(comMngPopulationVO.getLevelIsAll() == null){
			comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
			}
			break;
			default:
			break;
			@@ -561,7 +613,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -708,6 +760,7 @@
			// 不存在实有人口,则新增
			populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("查询实有人口是否已存在完成");

			@@ -749,8 +802,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -855,7 +908,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -1003,6 +1056,7 @@
			// 不存在实有人口,则新增
			populationDO = saveDrugPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -1044,8 +1098,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -1150,7 +1204,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -1298,6 +1352,7 @@
			// 不存在实有人口,则新增
			populationDO = saveCorrectPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -1339,8 +1394,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -1445,7 +1500,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -1593,6 +1648,7 @@
			// 不存在实有人口,则新增
			populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -1634,8 +1690,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -1740,7 +1796,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -1888,6 +1944,7 @@
			// 不存在实有人口,则新增
			populationDO = saveCultPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -1929,8 +1986,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			} else {
			// 实有人口存在于当前社区，则更新
			@@ -2036,7 +2093,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -2185,6 +2242,7 @@
			// 不存在实有人口,则新增
			populationDO = saveRehabilitationPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -2226,8 +2284,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -2333,7 +2391,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -2481,6 +2539,7 @@
			// 不存在实有人口,则新增
			populationDO = saveKeyPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -2522,8 +2581,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -2628,7 +2687,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -2776,6 +2835,7 @@
			// 不存在实有人口,则新增
			populationDO = saveSentencePopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -2817,8 +2877,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			} else {
			// 实有人口存在于当前社区，则更新
			@@ -2923,7 +2983,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -3071,6 +3131,7 @@
			// 不存在实有人口,则新增
			populationDO = saveVeteransPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -3112,8 +3173,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			}else {
			// 实有人口存在于当前社区，则更新
			@@ -3218,7 +3279,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -3366,6 +3427,7 @@
			// 不存在实有人口,则新增
			populationDO = saveDisabilityPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -3407,8 +3469,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			} else {
			// 实有人口存在于当前社区，则更新
			@@ -3518,7 +3580,7 @@
			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			@@ -3666,6 +3728,7 @@
			// 不存在实有人口,则新增
			populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			@@ -3707,8 +3770,8 @@
			if (!labelList.contains(s))
			iterator.remove();
			}
			populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setCreateBy(userId);
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			} else {
			// 实有人口存在于当前社区，则更新
			@@ -3730,6 +3793,605 @@
			ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setLowSecurityMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			}
			log.info("查询实有人口存在社区信息完成");
			}
			} catch (Exception e) {
			log.info("出现错误，错误原因：" + e.getMessage());
			}
			log.info("处理完成导入数据");

			log.info("开始执行数据库导入");
			if (!houseList.isEmpty()) {
			log.info("执行数据库导入房屋");
			comMngPopulationHouseDAO.insertAll(houseList);
			log.info("执行数据库导入房屋完成");
			}
			if (!saveList.isEmpty()) {
			log.info("执行数据库导入人口");
			this.baseMapper.insertAll(saveList);
			log.info("执行数据库导入人口完成");
			}
			if (!updateList.isEmpty()) {
			log.info("执行数据库更新人口");
			this.baseMapper.updateAll(updateList);
			// this.updateBatchById(updateList);
			log.info("执行数据库更新人口完成");
			}
			if (!houseUserList.isEmpty()) {
			log.info("执行数据库导入人口房屋关系");
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if (!savePopulationCommunityList.isEmpty()) {
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if (!updatePopulationCommunityList.isEmpty()) {
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			log.info("返回错误数据");
			return R.fail(mistakes);
			}
			return R.ok(mistakes);
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSaveEdlerPopulation(List<ComMngPopulationElderExcelVO> list, Long communityId, Long userId) {
			// 需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			// 需要新增的人口集合
			List<ComMngPopulationDO> saveList = new ArrayList<>();
			// 需要修改的人口集合
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			// 需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			// 需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			// 需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationElderMistakeExcelVO> mistakes = new ArrayList<>();
			try {
			// 查询社区信息
			log.info("开始查询社区信息数据");
			ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
			if (populationActVO == null) {
			log.error("未查询到社区信息");
			return R.fail("未查询到社区信息");
			}
			log.info("开始查询社区信息数据完成");

			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
			.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			// 处理实有人口信息
			Integer nub = 1;

			// 查询所有人口数据放入HashMap中
			List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
			HashMap<String, Object> populationMap = new HashMap<>();
			populationList.forEach(population -> {
			String key = population.getCardNo();
			populationMap.put(key, population);
			});
			// 查询所有房屋信息放入到HashMap中
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String, Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key, house);
			});

			List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
			HashMap<String, Object> villageMap = new HashMap<>();
			villageList.forEach(village -> {
			String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
			villageMap.put(key, village);
			});

			List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
			HashMap<String, Object> houseUserMap = new HashMap<>();
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key, houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
			comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String, Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key, populationCommunity);
			});

			for (ComMngPopulationElderExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			vo.setDoorNo(vo.getDoorNo().replace("号", ""));
			}
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			if (vo.getFloor().contains("栋")) {
			vo.setFloor(vo.getFloor().replace("栋", ""));
			}
			}
			if (StringUtils.isNotEmpty(vo.getUnitNo())) {
			if (vo.getUnitNo().contains("单元")) {
			vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
			}
			}
			if (StringUtils.isNotEmpty(vo.getHouseNo())) {
			if (vo.getHouseNo().contains("号")) {
			vo.setHouseNo(vo.getHouseNo().replace("号", ""));
			}
			}
			log.info("开始查询小区街路巷是否存在");
			// 查询小区街路巷是否存在
			ComMngVillageDO comMngVillageDO = null;
			String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
			if (!isOnly(villageKey, villageMap)) {
			comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
			} else {
			ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setElderMistake(mistake, vo);
			mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
			mistakes.add(mistake);
			log.info("未查询到街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			if (StringUtils.isNotEmpty(vo.getUnitNo())) {
			address.append(vo.getUnitNo()).append("单元");
			}
			if (StringUtils.isNotEmpty(vo.getHouseNo())) {
			address.append(vo.getHouseNo()).append("号");
			}
			vo.setAddress(address.toString());
			log.info("开始查询小区街路巷是否存在完成");

			log.info("开始查询房屋是否存在");
			// 先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if (isOnly(houseKey, houseMap)) {
			if (!houseList.isEmpty()) {
			for (ComMngPopulationHouseDO house : houseList) {
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())) {
			populationHouseDO = house;
			break;
			}
			}
			}
			if (populationHouseDO == null) {
			// 房屋信息不存在建立房屋信息
			populationHouseDO = saveElderPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			} else {
			populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
			}
			vo.setHouseId(populationHouseDO.getId());
			log.info("开始查询房屋是否存在完成");

			if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
			// 空户处理完房屋信息，直接返回
			continue;
			}
			String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
			// 判断实有人口是否已存在
			log.info("开始查询实有人口是否已存在");
			ComMngPopulationDO populationDO = null;
			String populationKey = vo.getCardNo();
			if (!isOnly(populationKey, populationMap)) {
			// 存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO =
			updateElderPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			} else {
			// 不存在实有人口,则新增
			populationDO = saveElderPopulationDO(vo, populationActVO, comMngVillageDO, userId,communityId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			log.info("开始查询实有人口房屋居住信息");
			// 处理实有人口房屋居住信息
			if (populationDO != null) {
			ComMngPopulationHouseUserDO populationHouseUserDO = null;
			String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
			if (isOnly(houseUserKey, houseUserMap)) {
			populationHouseUserDO = new ComMngPopulationHouseUserDO();
			populationHouseUserDO.setId(Snowflake.getId());
			populationHouseUserDO.setHouseId(populationHouseDO.getId());
			populationHouseUserDO.setPopulId(populationDO.getId());
			// populationHouseUserDO.setRelation(vo.getRelation());
			populationHouseUserDO.setRelationId(vo.getIsRent());
			// populationHouseUserDO.setResidence(vo.getResidence());
			houseUserList.add(populationHouseUserDO);
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			// 处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if (isOnly(populationCommunityKey, populationCommunityMap)) {
			// 实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			// 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			String s = iterator.next();
			if (!labelList.contains(s))
			iterator.remove();
			}
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			} else {
			// 实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
			(ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			// 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			String s = iterator.next();
			if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())
			&& comMngPopulationCommunityTagsDO.getLabel().contains(s)){
			iterator.remove();
			}
			}
			if(userTag != null && userTag.size() > 0){
			comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel() + "," + Joiner.on(",").join(userTag));
			}
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setElderMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			}
			log.info("查询实有人口存在社区信息完成");
			}
			} catch (Exception e) {
			log.info("出现错误，错误原因：" + e.getMessage());
			}
			log.info("处理完成导入数据");

			log.info("开始执行数据库导入");
			if (!houseList.isEmpty()) {
			log.info("执行数据库导入房屋");
			comMngPopulationHouseDAO.insertAll(houseList);
			log.info("执行数据库导入房屋完成");
			}
			if (!saveList.isEmpty()) {
			log.info("执行数据库导入人口");
			this.baseMapper.insertAll(saveList);
			log.info("执行数据库导入人口完成");
			}
			if (!updateList.isEmpty()) {
			log.info("执行数据库更新人口");
			this.baseMapper.updateAll(updateList);
			// this.updateBatchById(updateList);
			log.info("执行数据库更新人口完成");
			}
			if (!houseUserList.isEmpty()) {
			log.info("执行数据库导入人口房屋关系");
			comMngPopulationHouseUserService.saveBatch(houseUserList);
			log.info("执行数据库导入人口房屋关系完成");
			}
			if (!savePopulationCommunityList.isEmpty()) {
			log.info("执行数据库导入人口社区关系");
			comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
			log.info("数据库导入人口社区关系完成");
			}
			if (!updatePopulationCommunityList.isEmpty()) {
			log.info("执行数据库更新人口社区关系");
			comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
			log.info("数据库更新人口社区关系完成");
			}
			log.info("执行数据库导入完成");

			if (!mistakes.isEmpty()) {
			log.info("返回错误数据");
			return R.fail(mistakes);
			}
			return R.ok(mistakes);
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public R listSavePensionPopulation(List<ComMngPopulationPensionExcelVO> list, Long communityId, Long userId) {
			// 需要新增的房屋集合
			List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
			// 需要新增的人口集合
			List<ComMngPopulationDO> saveList = new ArrayList<>();
			// 需要修改的人口集合
			List<ComMngPopulationDO> updateList = new ArrayList<>();
			// 需要新增的人口与房屋关系集合
			List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
			// 需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
			// 需要新增的人口与社区关系集合
			List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();

			log.info("开始处理导入数据");
			List<ComMngPopulationPensionMistakeExcelVO> mistakes = new ArrayList<>();
			try {
			// 查询社区信息
			log.info("开始查询社区信息数据");
			ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
			if (populationActVO == null) {
			log.error("未查询到社区信息");
			return R.fail("未查询到社区信息");
			}
			log.info("开始查询社区信息数据完成");

			// 查询当前社区标签列表
			List<String> labelList = new ArrayList<>();
			List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(null);
			if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
			labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
			.collect(Collectors.toList());
			}

			StringBuilder areaPath = new StringBuilder();
			areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
			.append(">").append(populationActVO.getDistrictName()).append(">");
			// 处理实有人口信息
			Integer nub = 1;

			// 查询所有人口数据放入HashMap中
			List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
			HashMap<String, Object> populationMap = new HashMap<>();
			populationList.forEach(population -> {
			String key = population.getCardNo();
			populationMap.put(key, population);
			});
			// 查询所有房屋信息放入到HashMap中
			List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
			HashMap<String, Object> houseMap = new HashMap<>();
			houseLists.forEach(house -> {
			String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
			+ house.getHouseNo();
			houseMap.put(key, house);
			});

			List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
			HashMap<String, Object> villageMap = new HashMap<>();
			villageList.forEach(village -> {
			String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
			villageMap.put(key, village);
			});

			List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
			HashMap<String, Object> houseUserMap = new HashMap<>();
			houseUserLists.forEach(houseUser -> {
			String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
			houseUserMap.put(key, houseUser);
			});

			List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
			comMngPopulationCommunityTagsDAO.selectList(null);
			HashMap<String, Object> populationCommunityMap = new HashMap<>();
			populationCommunityLists.forEach(populationCommunity -> {
			String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
			populationCommunityMap.put(key, populationCommunity);
			});

			for (ComMngPopulationPensionExcelVO vo : list) {
			if (vo.getDoorNo().contains("号")) {
			vo.setDoorNo(vo.getDoorNo().replace("号", ""));
			}
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			if (vo.getFloor().contains("栋")) {
			vo.setFloor(vo.getFloor().replace("栋", ""));
			}
			}
			if (StringUtils.isNotEmpty(vo.getUnitNo())) {
			if (vo.getUnitNo().contains("单元")) {
			vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
			}
			}
			if (StringUtils.isNotEmpty(vo.getHouseNo())) {
			if (vo.getHouseNo().contains("号")) {
			vo.setHouseNo(vo.getHouseNo().replace("号", ""));
			}
			}
			log.info("开始查询小区街路巷是否存在");
			// 查询小区街路巷是否存在
			ComMngVillageDO comMngVillageDO = null;
			String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
			if (!isOnly(villageKey, villageMap)) {
			comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
			} else {
			ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setPensionMistake(mistake, vo);
			mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
			mistakes.add(mistake);
			log.info("未查询到街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
			continue;
			}
			StringBuilder address = new StringBuilder();
			address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
			.append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
			.append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
			if (StringUtils.isNotEmpty(vo.getFloor())) {
			address.append(vo.getFloor()).append("栋");
			}
			if (StringUtils.isNotEmpty(vo.getUnitNo())) {
			address.append(vo.getUnitNo()).append("单元");
			}
			if (StringUtils.isNotEmpty(vo.getHouseNo())) {
			address.append(vo.getHouseNo()).append("号");
			}
			vo.setAddress(address.toString());
			log.info("开始查询小区街路巷是否存在完成");

			log.info("开始查询房屋是否存在");
			// 先判断房屋是否存在
			ComMngPopulationHouseDO populationHouseDO = null;
			String houseKey =
			communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
			if (isOnly(houseKey, houseMap)) {
			if (!houseList.isEmpty()) {
			for (ComMngPopulationHouseDO house : houseList) {
			if (house.getVillageId().equals(comMngVillageDO.getVillageId())
			&& house.getCommunityId().equals(communityId) && house.getFloor().equals(vo.getFloor())
			&& house.getUnitNo().equals(vo.getUnitNo())
			&& house.getHouseNo().equals(vo.getHouseNo())) {
			populationHouseDO = house;
			break;
			}
			}
			}
			if (populationHouseDO == null) {
			// 房屋信息不存在建立房屋信息
			populationHouseDO = savePensionPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
			populationActVO.getName());
			houseList.add(populationHouseDO);
			}
			} else {
			populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
			}
			vo.setHouseId(populationHouseDO.getId());
			log.info("开始查询房屋是否存在完成");

			if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
			// 空户处理完房屋信息，直接返回
			continue;
			}
			String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
			// 判断实有人口是否已存在
			log.info("开始查询实有人口是否已存在");
			ComMngPopulationDO populationDO = null;
			String populationKey = vo.getCardNo();
			if (!isOnly(populationKey, populationMap)) {
			// 存在实有人口信息，则更新
			populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
			ComMngPopulationDO updatePopulationDO =
			updatePensionPopulationDO(vo, populationDO, communityId, userId);
			updateList.add(updatePopulationDO);
			} else {
			// 不存在实有人口,则新增
			populationDO = savePensionPopulationDO(vo, populationActVO, comMngVillageDO, userId);
			saveList.add(populationDO);
			populationMap.put(populationDO.getCardNo(),populationDO);
			}
			log.info("开始查询实有人口是否已存在完成");

			log.info("开始查询实有人口房屋居住信息");
			// 处理实有人口房屋居住信息
			if (populationDO != null) {
			ComMngPopulationHouseUserDO populationHouseUserDO = null;
			String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
			if (isOnly(houseUserKey, houseUserMap)) {
			populationHouseUserDO = new ComMngPopulationHouseUserDO();
			populationHouseUserDO.setId(Snowflake.getId());
			populationHouseUserDO.setHouseId(populationHouseDO.getId());
			populationHouseUserDO.setPopulId(populationDO.getId());
			// populationHouseUserDO.setRelation(vo.getRelation());
			populationHouseUserDO.setRelationId(vo.getIsRent());
			// populationHouseUserDO.setResidence(vo.getResidence());
			houseUserList.add(populationHouseUserDO);
			}
			}
			log.info("开始查询实有人口房屋居住信息完成");

			log.info("开始查询实有人口存在社区信息");
			// 处理实有人口与社区关系以及对应特殊群体标签
			String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
			if (populationDO != null) {
			ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
			if (isOnly(populationCommunityKey, populationCommunityMap)) {
			// 实有人口不存在于当前社区
			cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
			cpopulationCommunityTagsDO.setId(Snowflake.getId());
			cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
			cpopulationCommunityTagsDO.setCommunityId(communityId);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			// 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			String s = iterator.next();
			if (!labelList.contains(s))
			iterator.remove();
			}
			cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
			cpopulationCommunityTagsDO.setCreateBy(userId);
			savePopulationCommunityList.add(cpopulationCommunityTagsDO);
			} else {
			// 实有人口存在于当前社区，则更新
			ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
			(ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
			List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0])
			.collect(Collectors.toList());
			// 如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			Iterator<String> iterator = userTag.iterator();
			while (iterator.hasNext()) {
			String s = iterator.next();
			if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())
			&& comMngPopulationCommunityTagsDO.getLabel().contains(s)){
			iterator.remove();
			}
			}
			if(userTag != null && userTag.size() > 0){
			comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel() + "," + Joiner.on(",").join(userTag));
			}
			comMngPopulationCommunityTagsDO.setUpdateBy(userId);
			updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);

			ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
			BeanUtils.copyProperties(vo, mistake);
			setPensionMistake(mistake, vo);
			mistake.setMistake("该实有人口已存在于该社区，执行更新");
			mistakes.add(mistake);
			}
			@@ -3811,7 +4473,7 @@
			Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>()
			.lambda().eq(ComDrugPopulationDO::getPopulationId, populationDO.getId()));
			.lambda().eq(ComDrugPopulationDO::getPopulationId, populationDO.getId()).eq(ComDrugPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -3841,7 +4503,7 @@
			BeanUtils.copyProperties(vo, comDrugPopulationDO);
			comDrugPopulationDO.setId(Snowflake.getId());
			comDrugPopulationDO.setPopulationId(populationDO.getId());
			comDrugPopulationDO.setCommunityId(populationDO.getActId());
			comDrugPopulationDO.setCommunityId(communityId);
			comDrugPopulationDO.setStreetId(populationDO.getStreetId());
			comDrugPopulationDAO.insert(comDrugPopulationDO);
			}
			@@ -3853,7 +4515,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComCorrectPopulationDO comCorrectPopulationDO =
			comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
			.eq(ComCorrectPopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComCorrectPopulationDO::getPopulationId, populationDO.getId()).eq(ComCorrectPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -3882,7 +4544,7 @@
			BeanUtils.copyProperties(vo, comCorrectPopulationDO);
			comCorrectPopulationDO.setId(Snowflake.getId());
			comCorrectPopulationDO.setPopulationId(populationDO.getId());
			comCorrectPopulationDO.setCommunityId(populationDO.getActId());
			comCorrectPopulationDO.setCommunityId(communityId);
			comCorrectPopulationDO.setStreetId(populationDO.getStreetId());
			comCorrectPopulationDAO.insert(comCorrectPopulationDO);
			}
			@@ -3894,7 +4556,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComMajorPopulationDO comMajorPopulationDO =
			comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
			.eq(ComMajorPopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComMajorPopulationDO::getPopulationId, populationDO.getId()).eq(ComMajorPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -3923,7 +4585,7 @@
			BeanUtils.copyProperties(vo, comMajorPopulationDO);
			comMajorPopulationDO.setId(Snowflake.getId());
			comMajorPopulationDO.setPopulationId(populationDO.getId());
			comMajorPopulationDO.setCommunityId(populationDO.getActId());
			comMajorPopulationDO.setCommunityId(communityId);
			comMajorPopulationDO.setStreetId(populationDO.getStreetId());
			comMajorPopulationDAO.insert(comMajorPopulationDO);
			}
			@@ -3934,7 +4596,7 @@
			Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>()
			.lambda().eq(ComCultPopulationDO::getPopulationId, populationDO.getId()));
			.lambda().eq(ComCultPopulationDO::getPopulationId, populationDO.getId()).eq(ComCultPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -3963,7 +4625,7 @@
			BeanUtils.copyProperties(vo, comCultPopulationDO);
			comCultPopulationDO.setId(Snowflake.getId());
			comCultPopulationDO.setPopulationId(populationDO.getId());
			comCultPopulationDO.setCommunityId(populationDO.getActId());
			comCultPopulationDO.setCommunityId(communityId);
			comCultPopulationDO.setStreetId(populationDO.getStreetId());
			comCultPopulationDAO.insert(comCultPopulationDO);
			}
			@@ -3975,7 +4637,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComRehabilitationPopulationDO comRehabilitationPopulationDO =
			comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
			.eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.getId()).eq(ComRehabilitationPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -4004,7 +4666,7 @@
			BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
			comRehabilitationPopulationDO.setId(Snowflake.getId());
			comRehabilitationPopulationDO.setPopulationId(populationDO.getId());
			comRehabilitationPopulationDO.setCommunityId(populationDO.getActId());
			comRehabilitationPopulationDO.setCommunityId(communityId);
			comRehabilitationPopulationDO.setStreetId(populationDO.getStreetId());
			comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
			}
			@@ -4016,7 +4678,7 @@
			Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>()
			.lambda().eq(ComKeyPopulationDO::getPopulationId, populationDO.getId()));
			.lambda().eq(ComKeyPopulationDO::getPopulationId, populationDO.getId()).eq(ComKeyPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -4045,7 +4707,7 @@
			BeanUtils.copyProperties(vo, comKeyPopulationDO);
			comKeyPopulationDO.setId(Snowflake.getId());
			comKeyPopulationDO.setPopulationId(populationDO.getId());
			comKeyPopulationDO.setCommunityId(populationDO.getActId());
			comKeyPopulationDO.setCommunityId(communityId);
			comKeyPopulationDO.setStreetId(populationDO.getStreetId());
			comKeyPopulationDAO.insert(comKeyPopulationDO);
			}
			@@ -4057,7 +4719,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComSentencePopulationDO comSentencePopulationDO =
			comSentencePopulationDAO.selectOne(new QueryWrapper<ComSentencePopulationDO>().lambda()
			.eq(ComSentencePopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComSentencePopulationDO::getPopulationId, populationDO.getId()).eq(ComSentencePopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -4086,7 +4748,7 @@
			BeanUtils.copyProperties(vo, comSentencePopulationDO);
			comSentencePopulationDO.setId(Snowflake.getId());
			comSentencePopulationDO.setPopulationId(populationDO.getId());
			comSentencePopulationDO.setCommunityId(populationDO.getActId());
			comSentencePopulationDO.setCommunityId(communityId);
			comSentencePopulationDO.setStreetId(populationDO.getStreetId());
			comSentencePopulationDAO.insert(comSentencePopulationDO);
			}
			@@ -4098,7 +4760,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComVeteransPopulationDO comVeteransPopulationDO =
			comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().lambda()
			.eq(ComVeteransPopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComVeteransPopulationDO::getPopulationId, populationDO.getId()).eq(ComVeteransPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -4127,7 +4789,7 @@
			BeanUtils.copyProperties(vo, comVeteransPopulationDO);
			comVeteransPopulationDO.setId(Snowflake.getId());
			comVeteransPopulationDO.setPopulationId(populationDO.getId());
			comVeteransPopulationDO.setCommunityId(populationDO.getActId());
			comVeteransPopulationDO.setCommunityId(communityId);
			comVeteransPopulationDO.setStreetId(populationDO.getStreetId());
			comVeteransPopulationDAO.insert(comVeteransPopulationDO);
			}
			@@ -4139,7 +4801,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComDisabilityPopulationDO comDisabilityPopulationDO =
			comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
			.eq(ComDisabilityPopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComDisabilityPopulationDO::getPopulationId, populationDO.getId()).eq(ComDisabilityPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -4168,7 +4830,7 @@
			BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
			comDisabilityPopulationDO.setId(Snowflake.getId());
			comDisabilityPopulationDO.setPopulationId(populationDO.getId());
			comDisabilityPopulationDO.setCommunityId(populationDO.getActId());
			comDisabilityPopulationDO.setCommunityId(communityId);
			comDisabilityPopulationDO.setStreetId(populationDO.getStreetId());
			comDisabilityPopulationDAO.insert(comDisabilityPopulationDO);
			}
			@@ -4180,7 +4842,7 @@
			BeanUtils.copyProperties(vo, populationDO);
			ComLowSecurityPopulationDO comLowSecurityPopulationDO =
			comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
			.eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.getId()));
			.eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.getId()).eq(ComLowSecurityPopulationDO::getCommunityId, communityId));
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			@@ -4209,10 +4871,106 @@
			BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
			comLowSecurityPopulationDO.setId(Snowflake.getId());
			comLowSecurityPopulationDO.setPopulationId(populationDO.getId());
			comLowSecurityPopulationDO.setCommunityId(populationDO.getActId());
			comLowSecurityPopulationDO.setCommunityId(communityId);
			comLowSecurityPopulationDO.setStreetId(populationDO.getStreetId());
			comLowSecurityPopulationDAO.insert(comLowSecurityPopulationDO);
			}
			return populationDO;
			}

			private ComMngPopulationDO updateElderPopulationDO(ComMngPopulationElderExcelVO vo,
			ComMngPopulationDO populationDO, Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComElderAuthElderliesDO comElderAuthElderliesDO =
			comElderAuthElderliesDAO.selectOne(new QueryWrapper<ComElderAuthElderliesDO>().lambda()
			.eq(ComElderAuthElderliesDO::getPopulationId, populationDO.getId()).eq(ComElderAuthElderliesDO::getCommunityId, communityId));
			String cardNoAES = populationDO.getCardNo();
			try {
			cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
			} catch (Exception e) {
			log.error("身份证加密失败");
			}
			// populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comElderAuthElderliesDO != null) {
			BeanUtils.copyProperties(vo, comElderAuthElderliesDO);
			comElderAuthElderliesDO.setIdCard(cardNoAES);
			comElderAuthElderliesDO.setAddress(vo.getNowAddress());
			if (StringUtils.isNotEmpty(vo.getBirthday())) {
			int age = AgeUtils.getAgeFromBirthTimes(vo.getBirthday());
			if (age >= 80 && age < 90) {
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.under90);
			}else if (age >= 90 && age < 100){
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.under100);
			}else if (age >= 100){
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.above100);
			}
			}
			comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
			} else {
			comElderAuthElderliesDO = new ComElderAuthElderliesDO();
			BeanUtils.copyProperties(vo, comElderAuthElderliesDO);
			comElderAuthElderliesDO.setId(Snowflake.getId());
			comElderAuthElderliesDO.setPopulationId(populationDO.getId());
			comElderAuthElderliesDO.setCommunityId(communityId);
			comElderAuthElderliesDO.setStreetId(populationDO.getStreetId());
			comElderAuthElderliesDO.setIdCard(vo.getCardNo());
			comElderAuthElderliesDO.setAddress(vo.getNowAddress());
			if (StringUtils.isNotEmpty(vo.getBirthday())) {
			int age = AgeUtils.getAgeFromBirthTimes(vo.getBirthday());
			if (age >= 80 && age < 90) {
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.under90);
			}else if (age >= 90 && age < 100){
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.under100);
			}else if (age >= 100){
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.above100);
			}
			}
			comElderAuthElderliesDAO.insert(comElderAuthElderliesDO);
			}

			//维护养老认证健在状态
			comPensionAuthPensionerDAO.editPensionIsAlive(populationDO.getId(),vo.getIsAlive());
			return populationDO;
			}

			private ComMngPopulationDO updatePensionPopulationDO(ComMngPopulationPensionExcelVO vo,
			ComMngPopulationDO populationDO, Long communityId, Long userId) {
			BeanUtils.copyProperties(vo, populationDO);
			ComPensionAuthPensionerDO comPensionAuthPensionerDO =
			comPensionAuthPensionerDAO.selectOne(new QueryWrapper<ComPensionAuthPensionerDO>().lambda()
			.eq(ComPensionAuthPensionerDO::getPopulationId, populationDO.getId())
			.eq(ComPensionAuthPensionerDO::getCommunityId, communityId));
			String cardNoAES = populationDO.getCardNo();
			try {
			cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
			} catch (Exception e) {
			log.error("身份证加密失败");
			}
			// populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setActId(communityId);
			populationDO.setCardNo(cardNoAES);
			populationDO.setUpdateBy(userId);
			if (comPensionAuthPensionerDO != null) {
			BeanUtils.copyProperties(vo, comPensionAuthPensionerDO);
			comPensionAuthPensionerDO.setIdCard(cardNoAES);
			comPensionAuthPensionerDO.setAddress(vo.getNowAddress());
			comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
			} else {
			comPensionAuthPensionerDO = new ComPensionAuthPensionerDO();
			BeanUtils.copyProperties(vo, comPensionAuthPensionerDO);
			comPensionAuthPensionerDO.setId(Snowflake.getId());
			comPensionAuthPensionerDO.setPopulationId(populationDO.getId());
			comPensionAuthPensionerDO.setCommunityId(populationDO.getActId());
			comPensionAuthPensionerDO.setStreetId(populationDO.getStreetId());
			comPensionAuthPensionerDO.setIdCard(vo.getCardNo());
			comPensionAuthPensionerDO.setAddress(vo.getNowAddress());
			comPensionAuthPensionerDAO.insert(comPensionAuthPensionerDO);
			}
			//维护高龄老人健在状态
			comElderAuthElderliesDAO.editEditIsAlive(populationDO.getId(),vo.getIsAlive());
			return populationDO;
			}

			@@ -4238,6 +4996,7 @@
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());
			populationDO.setDeath(vo.getDeath().toString());

			String cardNoAES = populationDO.getCardNo();
			try {
			@@ -4769,6 +5528,112 @@
			return populationDO;
			}

			private ComMngPopulationDO saveElderPopulationDO(ComMngPopulationElderExcelVO vo,
			ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId, Long communityId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			ComElderAuthElderliesDO comElderAuthElderliesDO = new ComElderAuthElderliesDO();
			BeanUtils.copyProperties(vo, populationDO);
			BeanUtils.copyProperties(vo, comElderAuthElderliesDO);
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comElderAuthElderliesDO.setPopulationId(populationId);
			populationDO.setVillageId(comMngVillageDO.getVillageId());
			populationDO.setActId(comActDO.getCommunityId());
			populationDO.setStreetId(comActDO.getStreetId());
			// populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());

			String cardNoAES = populationDO.getCardNo();
			try {
			cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
			} catch (Exception e) {
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			// 新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			// populationDO.setHouseId(vo.getHouseId());
			// }else{
			// populationDO.setHouseId(null);
			// }

			// this.baseMapper.insert(populationDO);
			comElderAuthElderliesDO.setId(Snowflake.getId());
			comElderAuthElderliesDO.setCommunityId(comActDO.getCommunityId());
			comElderAuthElderliesDO.setStreetId(comActDO.getStreetId());
			comElderAuthElderliesDO.setIdCard(vo.getCardNo());
			comElderAuthElderliesDO.setAddress(vo.getNowAddress());
			if (StringUtils.isNotEmpty(vo.getBirthday())) {
			int age = AgeUtils.getAgeFromBirthTimes(vo.getBirthday());
			if (age >= 80 && age < 90) {
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.under90);
			}else if (age >= 90 && age < 100){
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.under100);
			}else if (age >= 100){
			comElderAuthElderliesDO.setPersonnelCategory(ComElderAuthElderliesDO.personnelCategory.above100);
			}
			}
			comElderAuthElderliesDAO.insert(comElderAuthElderliesDO);
			return populationDO;
			}

			private ComMngPopulationDO savePensionPopulationDO(ComMngPopulationPensionExcelVO vo,
			ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
			ComMngPopulationDO populationDO = new ComMngPopulationDO();
			ComPensionAuthPensionerDO comPensionAuthPensionerDO = new ComPensionAuthPensionerDO();
			BeanUtils.copyProperties(vo, populationDO);
			BeanUtils.copyProperties(vo, comPensionAuthPensionerDO);
			Long populationId = Snowflake.getId();
			populationDO.setId(populationId);
			comPensionAuthPensionerDO.setPopulationId(populationId);
			// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
			// userTagStr.split("\\(")[0]).collect(Collectors.toList());
			//
			// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
			// Iterator<String> iterator = userTag.iterator();
			// while (iterator.hasNext()) {
			// String s = iterator.next();
			// if (!labelList.contains(s))
			// iterator.remove();
			// }
			populationDO.setVillageId(comMngVillageDO.getVillageId());
			populationDO.setActId(comActDO.getCommunityId());
			populationDO.setStreetId(comActDO.getStreetId());
			// populationDO.setLabel(Joiner.on(",").join(userTag));
			populationDO.setVillageName(comMngVillageDO.getGroupAt());
			populationDO.setCardNoStr(vo.getCardNo());
			populationDO.setUpdateAt(new Date());

			String cardNoAES = populationDO.getCardNo();
			try {
			cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
			} catch (Exception e) {
			log.error("身份证加密失败");
			}
			populationDO.setCardNo(cardNoAES);
			populationDO.setCreateBy(userId);
			// 新增的时候默认绑定房屋id
			// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) \|\|
			// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
			// populationDO.setHouseId(vo.getHouseId());
			// }else{
			// populationDO.setHouseId(null);
			// }

			// this.baseMapper.insert(populationDO);
			comPensionAuthPensionerDO.setId(Snowflake.getId());
			comPensionAuthPensionerDO.setCommunityId(comActDO.getCommunityId());
			comPensionAuthPensionerDO.setStreetId(comActDO.getStreetId());
			comPensionAuthPensionerDO.setIdCard(vo.getCardNo());
			comPensionAuthPensionerDO.setAddress(vo.getNowAddress());
			comPensionAuthPensionerDAO.insert(comPensionAuthPensionerDO);
			return populationDO;
			}

			private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			// 查询该房屋未建立，执行建立房屋信息
			@@ -5242,6 +6107,92 @@
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO saveElderPopulationHouse(ComMngPopulationElderExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			// 查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
			populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
			populationHouseDO.setAlley(vo.getRoad());
			populationHouseDO.setHouseNum(vo.getDoorNo());
			populationHouseDO.setStatus(vo.getIsRent());
			populationHouseDO.setCommunityId(communityId);
			populationHouseDO.setFloor(vo.getFloor());
			populationHouseDO.setUnitNo(vo.getUnitNo());
			populationHouseDO.setHouseNo(vo.getHouseNo());
			populationHouseDO.setCode(vo.getHouseNo());
			populationHouseDO.setAddress(vo.getAddress());
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			// } catch (Exception e) {
			// }

			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);
			return populationHouseDO;
			}

			private ComMngPopulationHouseDO savePensionPopulationHouse(ComMngPopulationPensionExcelVO vo,
			ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
			// 查询该房屋未建立，执行建立房屋信息
			ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
			populationHouseDO.setId(Snowflake.getId());
			populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
			populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
			populationHouseDO.setAlley(vo.getRoad());
			populationHouseDO.setHouseNum(vo.getDoorNo());
			populationHouseDO.setStatus(vo.getIsRent());
			populationHouseDO.setCommunityId(communityId);
			populationHouseDO.setFloor(vo.getFloor());
			populationHouseDO.setUnitNo(vo.getUnitNo());
			populationHouseDO.setHouseNo(vo.getHouseNo());
			populationHouseDO.setCode(vo.getHouseNo());
			populationHouseDO.setAddress(vo.getAddress());
			populationHouseDO.setUpdateAt(new Date());
			// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
			StringBuilder housePath = new StringBuilder();
			housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">")
			.append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
			populationHouseDO.setPath(areaPath.toString() + housePath.toString());
			// try {
			// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
			// } catch (Exception e) {
			// }

			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);
			return populationHouseDO;
			}

			private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo,
			ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
			// 查询该房屋未建立，执行建立房屋信息
			@@ -5360,23 +6311,14 @@
			/**
			* 批量删除实有人口
			*
			* @param Ids
			* @return
			* @param ids 实有人口id集合
			* @return 删除结果
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public R deletePopulations(List<Long> Ids) {
			if (!Ids.isEmpty()) {
			Ids.forEach(id -> {
			// 清除用户房屋居住信息
			comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
			});
			}
			int delete = populationDAO.deleteBatchIds(Ids);
			if (delete > 0) {
			return R.ok();
			}
			return R.fail();
			public R deletePopulations(List<Long> ids, Long communityId) {
			comMngPopulationCommunityTagsDAO.deletePopulationRelation(ids,communityId);
			return R.ok();
			}

			/**
			@@ -5459,6 +6401,16 @@
			populationDO.setStreetId(comActDO.getStreetId());
			}

			//修改人员标签
			List<ComMngPopulationCommunityTagsDO> communityTagsDOList = comMngPopulationCommunityTagsDAO
			.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda()
			.eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId)
			.eq(ComMngPopulationCommunityTagsDO::getPopulationId,vo.getId()));
			communityTagsDOList.forEach(communityTags -> {
			communityTags.setLabel(vo.getLabel());
			comMngPopulationCommunityTagsDAO.updateById(communityTags);
			});

			// 查询当前用户所有房屋id
			List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
			// 清除用户房屋居住信息
			@@ -5533,6 +6485,83 @@
			// comMngPopulationHouseUserDO.setCreateAt(new Date());
			// comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
			// }
			//修改吸毒人员信息
			if (null != vo.getComDrugPopulationVO()) {
			ComDrugPopulationVO comDrugPopulationVO = vo.getComDrugPopulationVO();
			ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectById(comDrugPopulationVO.getId());
			BeanUtils.copyProperties(comDrugPopulationVO, comDrugPopulationDO);
			comDrugPopulationDAO.updateById(comDrugPopulationDO);
			}
			//修改社区矫正人员信息
			if (null != vo.getComCorrectPopulationVO()) {
			ComCorrectPopulationVO comCorrectPopulationVO = vo.getComCorrectPopulationVO();
			ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectById(comCorrectPopulationVO.getId());
			BeanUtils.copyProperties(comCorrectPopulationVO, comCorrectPopulationDO);
			comCorrectPopulationDAO.updateById(comCorrectPopulationDO);
			}
			//修改精神障碍信息
			if (null != vo.getComMajorPopulationVO()) {
			ComMajorPopulationVO comMajorPopulationVO = vo.getComMajorPopulationVO();
			ComMajorPopulationDO comCorrectPopulationDO = comMajorPopulationDAO.selectById(comMajorPopulationVO.getId());
			BeanUtils.copyProperties(comMajorPopulationVO, comCorrectPopulationDO);
			comMajorPopulationDAO.updateById(comCorrectPopulationDO);
			}
			//修改邪教信息
			if (null != vo.getComCultPopulationVO()) {
			ComCultPopulationVO comCultPopulationVO = vo.getComCultPopulationVO();
			ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectById(comCultPopulationVO.getId());
			BeanUtils.copyProperties(comCultPopulationVO, comCultPopulationDO);
			comCultPopulationDAO.updateById(comCultPopulationDO);
			}
			//修改刑释信息
			if (null != vo.getComRehabilitationPopulationVO()) {
			ComRehabilitationPopulationVO comRehabilitationPopulationVO = vo.getComRehabilitationPopulationVO();
			ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectById(comRehabilitationPopulationVO.getId());
			BeanUtils.copyProperties(comRehabilitationPopulationVO, comRehabilitationPopulationDO);
			comRehabilitationPopulationDAO.updateById(comRehabilitationPopulationDO);
			}
			//修改上访信息
			if (null != vo.getComKeyPopulationVO()) {
			ComKeyPopulationVO comKeyPopulationVO = vo.getComKeyPopulationVO();
			ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectById(comKeyPopulationVO.getId());
			BeanUtils.copyProperties(comKeyPopulationVO, comKeyPopulationDO);
			comKeyPopulationDAO.updateById(comKeyPopulationDO);
			}
			//修改退役军人信息
			if (null != vo.getComVeteransPopulationVO()) {
			ComVeteransPopulationVO comVeteransPopulationVO = vo.getComVeteransPopulationVO();
			ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectById(comVeteransPopulationVO.getId());
			BeanUtils.copyProperties(comVeteransPopulationVO, comVeteransPopulationDO);
			comVeteransPopulationDAO.updateById(comVeteransPopulationDO);
			}
			//修改残疾人信息
			if (null != vo.getComDisabilityPopulationVO()) {
			ComDisabilityPopulationVO comDisabilityPopulationVO = vo.getComDisabilityPopulationVO();
			ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectById(comDisabilityPopulationVO.getId());
			BeanUtils.copyProperties(comDisabilityPopulationVO, comDisabilityPopulationDO);
			comDisabilityPopulationDAO.updateById(comDisabilityPopulationDO);
			}
			//修改低保户信息
			if (null != vo.getComLowSecurityPopulationVO()) {
			ComLowSecurityPopulationVO comLowSecurityPopulationVO = vo.getComLowSecurityPopulationVO();
			ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectById(comLowSecurityPopulationVO.getId());
			BeanUtils.copyProperties(comLowSecurityPopulationVO, comLowSecurityPopulationDO);
			comLowSecurityPopulationDAO.updateById(comLowSecurityPopulationDO);
			}
			//修改高龄老人信息
			if (null != vo.getComElderAuthElderliesVO()) {
			ComElderAuthElderliesVO comElderAuthElderliesVO = vo.getComElderAuthElderliesVO();
			ComElderAuthElderliesDO comElderAuthElderliesDO = comElderAuthElderliesDAO.selectById(comElderAuthElderliesVO.getId());
			BeanUtils.copyProperties(comElderAuthElderliesVO, comElderAuthElderliesDO);
			comElderAuthElderliesDAO.updateById(comElderAuthElderliesDO);
			}
			//修改养老人员信息
			if (null != vo.getComPensionAuthPensionerVO()) {
			ComPensionAuthPensionerVO comPensionAuthPensionerVO = vo.getComPensionAuthPensionerVO();
			ComPensionAuthPensionerDO comPensionAuthPensionerDO = comPensionAuthPensionerDAO.selectById(comPensionAuthPensionerVO.getId());
			BeanUtils.copyProperties(comPensionAuthPensionerVO, comPensionAuthPensionerDO);
			comPensionAuthPensionerDAO.updateById(comPensionAuthPensionerDO);
			}
			if (populationDAO.updateById(populationDO) > 0) {
			return R.ok();
			} else {
			@@ -5544,6 +6573,19 @@
			public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
			IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
			new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);
			if(iPage!=null){
			iPage.getRecords().forEach(page -> {
			if(page.getAreaName() == null \|\| StringUtils.isEmpty(page.getAreaName())){
			StringBuilder sb = new StringBuilder();
			sb.append(page.getAlley());
			if(!page.getHouseNum().contains("号")){
			sb.append(page.getHouseNum() + "号");
			}
			page.setAreaName(sb.toString());
			}
			});
			}

			return R.ok(iPage);
			}

			@@ -5555,13 +6597,24 @@
			* @return 删除结果
			*/
			@Override
			public R deleteSpecialInputUser(Long id) {
			public R deleteSpecialInputUser(Long id,Long communityId) {
			// 查询特殊群体人员
			ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
			if (populationDO == null) {
			return R.fail("未查询到该记录");
			}
			populationDO.setLabel(null);

			// 清理社区与人口关联信息的label信息
			List<ComMngPopulationCommunityTagsDO> communityTagsDOList = comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>()
			.lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId,id).eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
			if(communityTagsDOList != null && communityTagsDOList.size() > 0){
			communityTagsDOList.forEach(communityTags -> {
			communityTags.setLabel(null);
			comMngPopulationCommunityTagsDAO.updateById(communityTags);
			});
			}

			if (this.baseMapper.updateById(populationDO) > 0) {
			return R.ok();
			} else {
			@@ -5586,7 +6639,7 @@
			}
			ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(
			new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
			if (null != checkCreditCode && comMngUserTagDO.getId() != checkCreditCode.getId()) {
			if (null != checkCreditCode && !comMngUserTagDO.getId().equals(checkCreditCode.getId())) {
			return R.fail("该标签已存在，标签名称重复");
			}

			@@ -5598,8 +6651,7 @@
			} else {
			// 新增
			Integer count = comMngUserTagDAO.selectCount(
			new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
			.eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
			new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
			if (count > 0) {
			return R.fail("该标签已存在，标签名称重复");
			}
			@@ -6291,8 +7343,11 @@
			statisticsVO.setDangerLevel("0");
			statisticsVO.setMajor(false);
			statisticsVO.setUrgent(false);
			if (statisticsVO.getEventDealStatus().equals(2)) {
			statisticsVO.setEventDealStatus(4);
			if (statisticsVO.getEventDealStatus().equals(2)\|\|statisticsVO.getEventDealStatus().equals(1)) {
			statisticsVO.setEventDealStatus(1);
			}
			else {
			statisticsVO.setEventDealStatus(2);
			}
			List<EventResourceVO> picList = new ArrayList<>();
			String[] pics = statisticsVO.getPhotoPathList().split(",");
			@@ -6375,6 +7430,14 @@
			*/
			@Override
			public R pagePopulationListApp(PagePopulationListDTO populationListDTO) {
			if(populationListDTO.getLabel() != null && "户籍人口".equals(populationListDTO.getLabel())){
			populationListDTO.setLabel(null);
			populationListDTO.setOutOrLocal(PagePopulationListDTO.outOrLocal.bd);
			}
			if(populationListDTO.getLabel() != null && "流动人口".equals(populationListDTO.getLabel())){
			populationListDTO.setLabel(null);
			populationListDTO.setOutOrLocal(PagePopulationListDTO.outOrLocal.wd);
			}
			IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(
			new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO);
			if (!pagePopulationList.getRecords().isEmpty()) {
			@@ -6404,6 +7467,10 @@
			if (StringUtils.isNotEmpty(detail.getMarriage())) {
			detail.setMarriage(PopulMarriageEnum.getCnDescByName(Integer.parseInt(detail.getMarriage())));
			}
			//查询该人口的标签
			List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(populationId);
			String label = LabelUtils.assembleLabel(communityTagsList);
			detail.setLabel(label);
			}
			return R.ok(detail);
			}
			@@ -6481,10 +7548,12 @@
			public R delGridPopulationAdmin(List<Long> ids) {
			Integer count = this.baseMapper.getPopulationVisitingCount(ids);
			if (count > 0) {
			return R.ok("您选择的数据中存在被引用的，无法删除");
			return R.fail("您选择的数据中存在被引用的，无法删除");
			}
			this.baseMapper.deleteBatchIds(ids);
			return R.ok();
			//删除人口并删除人口和社区关联关系
			this.baseMapper.deletePopulaitonRelation(ids);
			return R.ok("删除成功");
			}

			@Override
			@@ -6625,6 +7694,11 @@
			new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
			}

			@Override
			public R specialInputUserExport(PageInputUserDTO pageInputUserDTO) {
			return R.ok(this.comMngPopulationDAO.specialInputUserExport(pageInputUserDTO));
			}

			private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
			mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			@@ -6662,7 +7736,7 @@
			mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
			mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
			mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
			mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
			// mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
			// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
			mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
			mvo.setIsCorrectGroup(PopulHouseUseEnum.getCnDescByName(vo.getIsCorrectGroup()));
			@@ -6678,7 +7752,7 @@
			private void setMajorMistake(ComMngPopulationMajorMistakeExcelVO mvo, ComMngPopulationMajorExcelVO vo) {
			// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			mvo.setCustodyRelation(PopulRelationEnum.getCnDescByName(vo.getCustodyRelation()));
			// mvo.setCustodyRelation(PopulRelationEnum.getCnDescByName(vo.getCustodyRelation()));
			// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
			mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
			mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
			@@ -6712,7 +7786,7 @@
			ComMngPopulationRehabilitationExcelVO vo) {
			// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
			// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
			mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
			mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
			mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
			@@ -6760,7 +7834,7 @@
			}

			private void setVeteransMistake(ComMngPopulationVeteransMistakeExcelVO mvo, ComMngPopulationVeteransExcelVO vo) {
			mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
			// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
			mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
			@@ -6818,6 +7892,40 @@
			// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
			}

			private void setElderMistake(ComMngPopulationElderMistakeExcelVO mvo,
			ComMngPopulationElderExcelVO vo) {
			mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
			mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
			mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
			mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
			mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
			mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
			mvo.setIsRegister(PopulHouseUseEnum.getCnDescByName(vo.getIsRegister()));
			mvo.setIsAlive(PopulHouseUseEnum.getCnDescByName(vo.getIsAlive()));
			// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
			// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
			// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
			}

			private void setPensionMistake(ComMngPopulationPensionMistakeExcelVO mvo,
			ComMngPopulationPensionExcelVO vo) {
			mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
			mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
			mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
			mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
			mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
			mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
			mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
			mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
			mvo.setIsRegister(PopulHouseUseEnum.getCnDescByName(vo.getIsRegister()));
			mvo.setIsAlive(PopulHouseUseEnum.getCnDescByName(vo.getIsAlive()));
			// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
			// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
			// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
			}

			/**
			* 判重方法
			*