From 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 20:47:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 681 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 496 insertions(+), 185 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index c81132f..c5154f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -970,205 +970,407 @@
@Override
public R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId) {
- //需要新增的房屋集合
- List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
- List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
- List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
- List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ //需要新增的房屋集合
+ List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
+ //需要新增的人口集合
+ List<ComMngPopulationDO> saveList = new ArrayList<>();
+ //需要修改的人口集合
+ List<ComMngPopulationDO> updateList = new ArrayList<>();
+ //需要新增的人口与房屋关系集合
+ List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
- log.info("开始处理导入数据");
- List<ComMngPopulationMajorMistakeExcelVO> mistakes = new ArrayList<>();
- try {
- //查询社区信息
- log.info("开始查询社区信息数据");
- ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
- log.error("未查询到社区信息");
- return R.fail("未查询到社区信息");
+ log.info("开始处理导入数据");
+ List<ComMngPopulationMajorMistakeExcelVO> 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(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+ 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);
+ });
+
+
+ for (ComMngPopulationMajorExcelVO vo : list) {
+ if (vo.getDoorNo().contains("号")) {
+ vo.setDoorNo(vo.getDoorNo().replace("号",""));
}
- log.info("开始查询社区信息数据完成");
-
- //查询当前社区标签列表
- List<String> labelList = new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
- if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
- labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
}
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
+ 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{
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setMajorMistake(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("号").append(vo.getFloor()).append("栋")
+ .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
- StringBuilder areaPath = new StringBuilder();
- areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
- //处理实有人口信息
- Integer nub = 1;
+ vo.setAddress(address.toString());
+ log.info("开始查询小区街路巷是否存在完成");
- //查询所有人口数据放入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);
- });
-
-
- for (ComMngPopulationMajorExcelVO vo : list) {
- if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
- }
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
- }
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
- }
- 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{
- ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
- setMajorMistake(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("号").append(vo.getFloor()).append("栋")
- .append(vo.getUnitNo()).append("单元").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;
- }
+ 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 = saveMajorPopulationHouse(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;
+ if(populationHouseDO == null){
+ //房屋信息不存在建立房屋信息
+ populationHouseDO = saveMajorPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
}
- 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 = updateMajorPopulationDO(vo,populationDO,labelList);
- updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
- saveList.add(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("开始查询实有人口房屋居住信息完成");
+ }else{
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- }catch (Exception e){
- log.info("出现错误，错误原因：" + e.getMessage());
- }
- log.info("处理完成导入数据");
+ vo.setHouseId(populationHouseDO.getId());
+ 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("执行数据库导入人口房屋关系完成");
- }
- 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 = updateMajorPopulationDO(vo,populationDO,labelList);
+ updateList.add(updatePopulationDO);
+ }else{
+ //不存在实有人口,则新增
+ populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ saveList.add(populationDO);
+ }
+ log.info("开始查询实有人口是否已存在完成");
- if (!mistakes.isEmpty()) {
- log.info("返回错误数据");
- return R.fail(mistakes);
+ 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("开始查询实有人口房屋居住信息完成");
}
- return R.ok(mistakes);
+ }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("执行数据库导入人口房屋关系完成");
+ }
+ log.info("执行数据库导入完成");
+
+ if (!mistakes.isEmpty()) {
+ log.info("返回错误数据");
+ return R.fail(mistakes);
+ }
+ return R.ok(mistakes);
+ }
+
+ @Override
+ public R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId) {
+ //需要新增的房屋集合
+ List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
+ //需要新增的人口集合
+ List<ComMngPopulationDO> saveList = new ArrayList<>();
+ //需要修改的人口集合
+ List<ComMngPopulationDO> updateList = new ArrayList<>();
+ //需要新增的人口与房屋关系集合
+ List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+
+ log.info("开始处理导入数据");
+ List<ComMngPopulationCultMistakeExcelVO> 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(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+ 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);
+ });
+
+
+ for (ComMngPopulationCultExcelVO vo : list) {
+ if (vo.getDoorNo().contains("号")) {
+ vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ }
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
+ 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{
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setCultMistake(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("号").append(vo.getFloor()).append("栋")
+ .append(vo.getUnitNo()).append("单元").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 = saveCultPopulationHouse(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 = updateCultPopulationDO(vo,populationDO,labelList);
+ updateList.add(updatePopulationDO);
+ }else{
+ //不存在实有人口,则新增
+ populationDO = saveCultPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ saveList.add(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("开始查询实有人口房屋居住信息完成");
+ }
+ }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("执行数据库导入人口房屋关系完成");
+ }
+ log.info("执行数据库导入完成");
+
+ if (!mistakes.isEmpty()) {
+ log.info("返回错误数据");
+ return R.fail(mistakes);
+ }
+ return R.ok(mistakes);
+ }
private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
@@ -1235,6 +1437,27 @@
}
private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ BeanUtils.copyProperties(vo, populationDO);
+ 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();
+ }
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCardNo(cardNoAES);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
BeanUtils.copyProperties(vo, populationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -1391,6 +1614,38 @@
return populationDO;
}
+ private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ ComMngPopulationDO populationDO = new ComMngPopulationDO();
+ BeanUtils.copyProperties(vo, populationDO);
+ populationDO.setId(Snowflake.getId());
+ 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());
+ //新增的时候默认绑定房屋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);
+ return populationDO;
+ }
+
private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
//查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
@@ -1515,6 +1770,47 @@
}
private ComMngPopulationHouseDO saveMajorPopulationHouse(ComMngPopulationMajorExcelVO 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 saveCultPopulationHouse(ComMngPopulationCultExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
//查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
@@ -2938,6 +3234,21 @@
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
+ private void setCultMistake(ComMngPopulationCultMistakeExcelVO mvo, ComMngPopulationCultExcelVO vo){
+ mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
+ 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.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ }
+
/**
* 判重方法
* @param key 主键
--
Gitblit v1.7.1