From 1ecd31f8402e498f64504ba41641a672c8dd7276 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 14:39:39 +0800
Subject: [PATCH] #feat ,,
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 1532 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 1,059 insertions(+), 473 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 2dd5ceb..80c12a7 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
@@ -139,6 +139,8 @@
private String aesKey;
@Resource
private ComActEasyPhotoDAO comActEasyPhotoDAO;
+ @Resource
+ private ComMngBuildingDAO comMngBuildingDAO;
/**
* 新增实有人口
@@ -218,7 +220,7 @@
ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
-
+ comMngPopulationVO.setCultureLevelName(PopulCultureLevelEnum.getCnDescByName(comMngPopulationVO.getCultureLevel()));
// 查询户主关系信息
// List<ComHouseMemberVo> comMngFamilyInfoVOS =
// populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
@@ -240,6 +242,7 @@
if (!comMngPopulationHouseUserDOS.isEmpty()) {
comMngPopulationVO
.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
+ comMngPopulationVO.setRelationName(PopulRelationEnum.getCnDescByName(comMngPopulationVO.getRelation()));
}
// 设置年龄
if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
@@ -507,6 +510,19 @@
}
}
+ if(comMngPopulationVO.getType()!=null){
+ switch (comMngPopulationVO.getType()){
+ case 1 : comMngPopulationVO.setAgeStart("80");
+ comMngPopulationVO.setAgeEnd("89");
+ break;
+ case 2 : comMngPopulationVO.setAgeStart("90");
+ comMngPopulationVO.setAgeEnd("99");
+ break;
+ case 3 : comMngPopulationVO.setAgeStart("100");
+ break;
+ }
+ }
+
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
String ageStartTime = DateUtils.getDateFormatString(
DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
@@ -563,6 +579,66 @@
});
}
return R.ok(iPage);
+ }
+
+ @Override
+ public R exportOld(ComMngPopulationDTO comMngPopulationVO) {
+ if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
+ String ageStartTime = DateUtils.getDateFormatString(
+ DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeStartTime(ageStartTime);
+ }
+ }
+
+ if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())) {
+ String ageEndTime = DateUtils.getDateFormatString(
+ DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageEndTime)) {
+ comMngPopulationVO.setAgeEndTime(ageEndTime);
+ }
+ }
+ if (comMngPopulationVO.getAgeStartTime() != null && !"".equals(comMngPopulationVO.getAgeStartTime())
+ && comMngPopulationVO.getAgeEndTime() != null && !"".equals(comMngPopulationVO.getAgeEndTime())) {
+ if (comMngPopulationVO.getAgeStartTime().equals(comMngPopulationVO.getAgeEndTime())) {
+ Date endAge =
+ DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeStartTimeEnd(ageStartTime);
+ }
+ } else {
+ Date endAge =
+ DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeEndTimeEnd(ageStartTime);
+ }
+ }
+ }
+ List<ComMngPopulationVO> comMngPopulationVOS=this.comMngPopulationDAO.exportOld(comMngPopulationVO);
+ if(!comMngPopulationVOS.isEmpty()){
+ comMngPopulationVOS.forEach(populDO -> {
+ if (StringUtils.isNotEmpty(populDO.getBirthday())) {
+ populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
+ populDO.setRelationName(PopulRelationEnum.getCnDescByName(populDO.getRelation()));
+ populDO.setCultureLevelName(PopulCultureLevelEnum.getCnDescByName(populDO.getCultureLevel()));
+ populDO.setPoliticalOutlookName(
+ PopulPoliticalOutlookEnum.getCnDescByName(populDO.getPoliticalOutlook()));
+ populDO.setMarriageName(PopulMarriageEnum.getCnDescByName(populDO.getMarriage()));
+ if(populDO.getAge()>=80&&populDO.getAge()<=89){
+ populDO.setType(1);
+ }
+ if(populDO.getAge()>=90&&populDO.getAge()<=99){
+ populDO.setType(2);
+ }
+ if(populDO.getAge()>=100){
+ populDO.setType(3);
+ }
+ }
+ });
+ }
+ return R.ok(comMngPopulationVOS);
}
/**
@@ -645,14 +721,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -660,14 +736,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -675,7 +751,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -733,39 +809,51 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO =
- savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- vo.setHouseId(populationHouseDO.getId());
- log.info("查询房屋是否存在完成");
+
+
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
// 空户处理完房屋信息，直接返回
continue;
}
- String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ //String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
// 判断实有人口是否已存在
log.info("开始查询实有人口是否已存在");
ComMngPopulationDO populationDO = null;
@@ -779,7 +867,7 @@
// 不存在实有人口,则新增
populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
- populationMap.put(populationDO.getCardNo(),populationDO);
+ populationMap.put(populationKey,populationDO);
}
log.info("查询实有人口是否已存在完成");
@@ -823,6 +911,7 @@
}
cpopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
cpopulationCommunityTagsDO.setCreateBy(userId);
+ populationCommunityMap.put(populationCommunityKey,cpopulationCommunityTagsDO);
savePopulationCommunityList.add(cpopulationCommunityTagsDO);
}else {
// 实有人口存在于当前社区，则更新
@@ -838,6 +927,7 @@
iterator.remove();
}
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -849,6 +939,18 @@
}
}
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -868,7 +970,7 @@
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
log.info("数据库更新人口完成");
}
@@ -884,7 +986,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -940,14 +1042,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -955,14 +1057,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -970,7 +1072,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1028,39 +1130,49 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveDrugPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveDrugPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setDrugMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -1133,7 +1245,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -1144,7 +1265,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -1155,23 +1289,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -1180,7 +1314,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1236,14 +1370,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -1251,14 +1385,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -1266,7 +1400,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1324,39 +1458,49 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveCorrectPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveCorrectPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setCorrectMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -1429,7 +1573,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -1440,7 +1593,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -1451,23 +1617,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -1476,7 +1642,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1532,14 +1698,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -1547,14 +1713,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -1562,7 +1728,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1620,39 +1786,49 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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);
}
- 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("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMajorMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -1725,7 +1901,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -1736,7 +1921,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -1747,23 +1945,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -1772,7 +1970,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1828,14 +2026,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -1843,14 +2041,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -1858,7 +2056,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -1916,39 +2114,49 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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);
}
- 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("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setCultMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -2021,7 +2229,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -2032,7 +2249,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -2043,23 +2273,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -2068,7 +2298,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2125,14 +2355,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -2140,14 +2370,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -2155,7 +2385,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -2214,39 +2444,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveRehabilitationPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveRehabilitationPopulationHouse(vo, comMngVillageDO, communityId,
- areaPath, populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setRehabilitationMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -2319,7 +2558,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -2331,7 +2579,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -2342,23 +2603,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -2367,7 +2628,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2423,14 +2684,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -2438,14 +2699,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -2453,7 +2714,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -2511,39 +2772,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveKeyPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveKeyPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setKeyMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -2616,7 +2886,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -2627,7 +2906,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -2638,23 +2930,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -2663,7 +2955,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2719,14 +3011,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -2734,14 +3026,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -2749,7 +3041,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -2807,39 +3099,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveSentencePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveSentencePopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setSentenceMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -2912,7 +3213,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -2923,7 +3233,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -2934,23 +3257,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -2959,7 +3282,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3015,14 +3338,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -3030,14 +3353,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -3045,7 +3368,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3103,39 +3426,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveVeteransPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveVeteransPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setVeteransMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -3208,7 +3540,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -3219,7 +3560,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -3230,23 +3584,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -3255,7 +3609,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3311,14 +3665,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -3326,14 +3680,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -3341,7 +3695,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3399,39 +3753,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveDisabilityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveDisabilityPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setDisabilityMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -3504,7 +3867,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -3515,7 +3887,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -3526,23 +3911,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -3551,7 +3936,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3612,14 +3997,14 @@
Integer nub = 1;
// 查询所有人口数据放入HashMap中
- List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId,communityId));
HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
populationMap.put(key, population);
});
// 查询所有房屋信息放入到HashMap中
- List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(new QueryWrapper<ComMngPopulationHouseDO>().lambda().eq(ComMngPopulationHouseDO::getCommunityId,communityId));
HashMap<String, Object> houseMap = new HashMap<>();
houseLists.forEach(house -> {
String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo()
@@ -3627,14 +4012,14 @@
houseMap.put(key, house);
});
- List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId,communityId));
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);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -3642,7 +4027,7 @@
});
List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
- comMngPopulationCommunityTagsDAO.selectList(null);
+ comMngPopulationCommunityTagsDAO.selectList(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getCommunityId,communityId));
HashMap<String, Object> populationCommunityMap = new HashMap<>();
populationCommunityLists.forEach(populationCommunity -> {
String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
@@ -3700,39 +4085,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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 =
+ saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ } else {
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
- if (populationHouseDO == null) {
- // 房屋信息不存在建立房屋信息
- populationHouseDO = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
- populationActVO.getName());
- houseList.add(populationHouseDO);
- }
- } else {
- populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setLowSecurityMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -3805,7 +4199,16 @@
if (!labelList.contains(s))
iterator.remove();
}
- comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ }
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -3816,7 +4219,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -3827,23 +4243,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -3852,7 +4268,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3930,7 +4346,7 @@
villageMap.put(key, village);
});
- List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -3996,39 +4412,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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);
}
- 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("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationElderMistakeExcelVO mistake = new ComMngPopulationElderMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setElderMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -4103,8 +4528,15 @@
iterator.remove();
}
}
- if(userTag != null && userTag.size() > 0){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel() + "," + Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
}
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -4116,7 +4548,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -4127,23 +4572,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -4152,7 +4597,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -4229,7 +4674,7 @@
villageMap.put(key, village);
});
- List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
+ List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectListIndex(communityId);
HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
@@ -4295,39 +4740,48 @@
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(StringUtils.isNotEmpty(vo.getFloor())&&StringUtils.isNotEmpty(vo.getHouseNo())&&StringUtils.isNotEmpty(vo.getUnitNo())){
+ 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);
}
- 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("查询房屋是否存在完成");
+ }else {
+ ComMngPopulationPensionMistakeExcelVO mistake = new ComMngPopulationPensionMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setPensionMistake(mistake, vo);
+ mistake.setMistake("房屋数据填报不完整" );
+ mistakes.add(mistake);
+ log.info("房屋数据填报不完整");
+ continue;
}
- 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;
@@ -4402,8 +4856,15 @@
iterator.remove();
}
}
- if(userTag != null && userTag.size() > 0){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel() + "," + Joiner.on(",").join(userTag));
+ if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
+ }
+ else{
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
}
comMngPopulationCommunityTagsDO.setUpdateBy(userId);
updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
@@ -4415,7 +4876,20 @@
mistakes.add(mistake);
}
}
+
log.info("查询实有人口存在社区信息完成");
+
+ log.info("开始处理楼栋信息");
+ List<ComMngBuildingDO> comMngBuildingDOList= comMngBuildingDAO.selectList(new QueryWrapper<ComMngBuildingDO>().lambda().eq(ComMngBuildingDO::getVillageId,comMngVillageDO.getVillageId()).eq(ComMngBuildingDO::getName,vo.getFloor()));
+ if(comMngBuildingDOList.isEmpty()){
+ ComMngBuildingDO comMngBuildingDO=new ComMngBuildingDO();
+ comMngBuildingDO.setId(Snowflake.getId());
+ comMngBuildingDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngBuildingDO.setName(vo.getFloor());
+ comMngBuildingDO.setActId(comMngVillageDO.getCommunityId());
+ comMngBuildingDO.setStreetId(comMngVillageDO.getStreetId());
+ comMngBuildingDAO.insert(comMngBuildingDO);
+ }
}
} catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
@@ -4426,23 +4900,23 @@
if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
- this.baseMapper.updateAll(updateList);
+ this.updateBatchById(updateList);
// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ log.info("数据库更新人口完成");
}
if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
}
if (!savePopulationCommunityList.isEmpty()) {
log.info("执行数据库导入人口社区关系");
@@ -4451,7 +4925,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -4466,6 +4940,10 @@
private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,
Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
+ Integer personType = vo.getPersonType();
+ if (nonNull(personType)) {
+ populationDO.setPersonType(personType.toString());
+ }
// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
// userTagStr.split("\\(")[0]).collect(Collectors.toList());
// //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -4997,6 +5475,10 @@
ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
+ Integer personType = vo.getPersonType();
+ if (nonNull(personType)) {
+ populationDO.setPersonType(personType.toString());
+ }
populationDO.setId(Snowflake.getId());
// List<String> userTag = vo.getUserTagStr().stream().map(userTagStr ->
// userTagStr.split("\\(")[0]).collect(Collectors.toList());
@@ -6336,7 +6818,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R deletePopulations(List<Long> ids, Long communityId) {
- comMngPopulationCommunityTagsDAO.deletePopulationRelation(ids,communityId);
+ for(Long id:ids){
+ comMngPopulationCommunityTagsDAO.delete(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId,id));
+ comMngPopulationDAO.deleteById(id);
+ comMngPopulationHouseUserDAO.delete(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId,id));
+ }
return R.ok();
}
@@ -6392,6 +6878,10 @@
list.forEach(populationDO -> {
ComMngPopulationVO populationVO = new ComMngPopulationVO();
BeanUtils.copyProperties(populationDO, populationVO);
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO=comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda().eq(ComMngPopulationCommunityTagsDO::getPopulationId,populationDO.getId()));
+ if(comMngPopulationCommunityTagsDO!=null){
+ populationVO.setLabel(comMngPopulationCommunityTagsDO.getLabel());
+ }
resultList.add(populationVO);
});
}
@@ -6936,21 +7426,48 @@
int count=ageMap.get("age16").intValue()+ageMap.get("age27").intValue()+ageMap.get("age35").intValue()
+ageMap.get("age45").intValue()+ageMap.get("age55").intValue()+ageMap.get("age55over").intValue()+ageMap.get("age65").intValue()+ageMap.get("age75").intValue();
ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
- ageStatisticsVO1.setPercent(BigDecimal.valueOf(ageMap.get("age16").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
- ageStatisticsVO2.setPercent(BigDecimal.valueOf(ageMap.get("age27").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
- ageStatisticsVO3.setPercent(BigDecimal.valueOf(ageMap.get("age35").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
- ageStatisticsVO4.setPercent(BigDecimal.valueOf(ageMap.get("age45").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
- ageStatisticsVO5.setPercent(BigDecimal.valueOf(ageMap.get("age55").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
- ageStatisticsVO6.setPercent(BigDecimal.valueOf(ageMap.get("age55over").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO7.setSum(ageMap.get("age65").intValue());
- ageStatisticsVO7.setPercent(BigDecimal.valueOf(ageMap.get("age65").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
- ageStatisticsVO8.setSum(ageMap.get("age75").intValue());
- ageStatisticsVO8.setPercent(BigDecimal.valueOf(ageMap.get("age75").intValue()*100d/count).setScale(2,BigDecimal.ROUND_HALF_UP));
+ if(count == 0){
+ ageStatisticsVO1.setSum(0);
+ ageStatisticsVO2.setSum(0);
+ ageStatisticsVO3.setSum(0);
+ ageStatisticsVO4.setSum(0);
+ ageStatisticsVO5.setSum(0);
+ ageStatisticsVO6.setSum(0);
+ ageStatisticsVO7.setSum(0);
+ ageStatisticsVO8.setSum(0);
+ ageStatisticsVO1.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO2.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO3.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO4.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO5.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO6.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO7.setPercent(BigDecimal.ZERO);
+ ageStatisticsVO8.setPercent(BigDecimal.ZERO);
+ }else {
+ BigDecimal rate = BigDecimal.valueOf(ageMap.get("age16").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO1.setPercent(rate);
+ ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age27").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO2.setPercent(rate);
+ ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age35").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO3.setPercent(rate);
+ ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age45").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO4.setPercent(rate);
+ ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age55").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO5.setPercent(rate);
+ ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age55over").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO6.setPercent(rate);
+ ageStatisticsVO7.setSum(ageMap.get("age65").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age65").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO7.setPercent(rate);
+ ageStatisticsVO8.setSum(ageMap.get("age75").intValue());
+ rate = BigDecimal.valueOf(ageMap.get("age75").intValue() * 100d).divide(BigDecimal.valueOf(count), 2, BigDecimal.ROUND_HALF_UP);
+ ageStatisticsVO8.setPercent(rate);
+ }
}
agePopulationList.add(ageStatisticsVO1);
@@ -7584,7 +8101,7 @@
/**
* 综治后台-居民列表
- *
+ *
* @param populationListDTO
* 请求参数
* @return 居民列表
@@ -7624,7 +8141,7 @@
/**
* 综治后台-删除居民
- *
+ *
* @param ids
* 居民id集合
* @return 删除结果
@@ -7666,7 +8183,7 @@
/**
* 查询平台人口列表
- *
+ *
* @param populationDTO
* 请求参数
* @return 人口列表
@@ -7691,7 +8208,7 @@
/**
* 综治后台-居民标签栏统计
- *
+ *
* @return 居民统计
*/
@Override
@@ -7701,7 +8218,7 @@
/**
* 综治后台-居民导出查询居民数据
- *
+ *
* @param populationExportDTO
* 请求参数
* @return 导出结果
@@ -7749,7 +8266,7 @@
/**
* 综治后台-居民管理小区列表
- *
+ *
* @param name
* 小区名字
* @return 小区列表
@@ -7868,7 +8385,11 @@
count= comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
}
specialStatisticsVO.setSum(count);
- specialStatisticsVO.setPercent(BigDecimal.valueOf(specialStatisticsVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
+ if(countAll == 0){
+ specialStatisticsVO.setPercent(BigDecimal.ZERO);
+ }else{
+ specialStatisticsVO.setPercent(BigDecimal.valueOf(specialStatisticsVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
+ }
otherSpecialVO1.setSum(otherSpecialVO1.getSum()+count);
specialStatisticsVOList.add(specialStatisticsVO);
}
@@ -7880,10 +8401,16 @@
}
});
}
- otherSpecialVO.setPercent(BigDecimal.valueOf(otherSpecialVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
+ if(countAll == 0){
+ otherSpecialVO.setPercent(BigDecimal.ZERO);
+ otherSpecialVO1.setPercent(BigDecimal.ZERO);
+ }else{
+ otherSpecialVO.setPercent(BigDecimal.valueOf(otherSpecialVO.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
+ otherSpecialVO1.setPercent(BigDecimal.valueOf(otherSpecialVO1.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
+ }
specialStatisticsVOList.add(otherSpecialVO);
otherSpecialVO1.setSum(countAll-otherSpecialVO1.getSum());
- otherSpecialVO1.setPercent(BigDecimal.valueOf(otherSpecialVO1.getSum()*100d/countAll).setScale(2,BigDecimal.ROUND_HALF_UP));
+
specialStatisticsVOList.add(otherSpecialVO1);
indexInfo.setSpecialStatisticsVOList(specialStatisticsVOList);
// 查询网格化治理
@@ -7960,6 +8487,65 @@
indexInfo.setBigScreenGridStaticsReturn(setData(bigscreenGridsGovernanceStatisticsVO));
return R.ok(indexInfo);
+ }
+
+ /**
+ * 历史数据人员类型填充
+ * @param list
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R filledPopulationPersonType(List<ComMngPopulationServeExcelVO> list, Long communityId, Long userId) {
+ // 需要修改的人口集合
+ List<ComMngPopulationDO> updateList = new ArrayList<>();
+ log.info("开始处理导入数据");
+ List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>();
+ try {
+ // 查询所有人口数据放入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);
+ });
+ for (ComMngPopulationServeExcelVO vo : list) {
+ // 判断实有人口是否已存在
+ log.info("开始查询实有人口是否已存在");
+ ComMngPopulationDO populationDO = null;
+ String populationKey = vo.getCardNo();
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新人员类型
+ populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
+ Integer personType = vo.getPersonType();
+ if (nonNull(personType)) {
+ populationDO.setPersonType(personType.toString());
+ }
+ updateList.add(populationDO);
+ } else {
+ // 不存在实有人口,返回
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("人口信息不存在，请下载实有人口模板导入");
+ mistakes.add(mistake);
+ }
+ }
+ } catch (Exception e) {
+ log.info("出现错误，错误原因：" + e.getMessage());
+ }
+ if (!updateList.isEmpty()) {
+ log.info("执行数据库更新人口");
+ this.baseMapper.updateAll(updateList);
+ log.info("数据库更新人口完成");
+ }
+ if (!mistakes.isEmpty()) {
+ log.info("返回错误数据");
+ return R.fail(mistakes);
+ }
+ return R.ok(mistakes);
}
private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
@@ -8191,7 +8777,7 @@
/**
* 判重方法
- *
+ *
* @param key
* 主键
* @param hashMap
@@ -8301,4 +8887,4 @@
return bigScreenGridStaticsReturn;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.7.1