From 9ef6c6c5aa5a5efb6f26ad67bc31320a9ccbe3f8 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 28 九月 2022 10:18:06 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 514 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 371 insertions(+), 143 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 2e1ef35..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;
/**
* 新增实有人口
@@ -719,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()
@@ -734,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() + "";
@@ -749,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() + "";
@@ -937,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());
@@ -1028,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()
@@ -1043,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() + "";
@@ -1058,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() + "";
@@ -1232,7 +1246,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -1247,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());
@@ -1258,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("执行数据库导入人口社区关系");
@@ -1283,7 +1314,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1339,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()
@@ -1354,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() + "";
@@ -1369,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() + "";
@@ -1543,7 +1574,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -1558,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());
@@ -1569,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("执行数据库导入人口社区关系");
@@ -1594,7 +1642,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1650,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()
@@ -1665,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() + "";
@@ -1680,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() + "";
@@ -1854,7 +1902,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -1869,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());
@@ -1880,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("执行数据库导入人口社区关系");
@@ -1905,7 +1970,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1961,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()
@@ -1976,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() + "";
@@ -1991,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() + "";
@@ -2165,7 +2230,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -2180,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());
@@ -2191,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("执行数据库导入人口社区关系");
@@ -2216,7 +2298,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2273,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()
@@ -2288,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() + "";
@@ -2303,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() + "";
@@ -2477,7 +2559,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -2493,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());
@@ -2504,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("执行数据库导入人口社区关系");
@@ -2529,7 +2628,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2585,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()
@@ -2600,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() + "";
@@ -2615,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() + "";
@@ -2788,7 +2887,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -2803,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());
@@ -2814,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("执行数据库导入人口社区关系");
@@ -2839,7 +2955,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2895,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()
@@ -2910,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() + "";
@@ -2925,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() + "";
@@ -3098,7 +3214,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -3113,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());
@@ -3124,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("执行数据库导入人口社区关系");
@@ -3149,7 +3282,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3205,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()
@@ -3220,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() + "";
@@ -3235,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() + "";
@@ -3408,7 +3541,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -3423,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());
@@ -3434,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("执行数据库导入人口社区关系");
@@ -3459,7 +3609,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3515,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()
@@ -3530,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() + "";
@@ -3545,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() + "";
@@ -3718,7 +3868,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -3733,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());
@@ -3744,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("执行数据库导入人口社区关系");
@@ -3769,7 +3936,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -3830,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()
@@ -3845,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() + "";
@@ -3860,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() + "";
@@ -4033,7 +4200,11 @@
iterator.remove();
}
if(StringUtils.isNotEmpty(comMngPopulationCommunityTagsDO.getLabel())){
- comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+Joiner.on(",").join(userTag));
+ for(String tag:userTag){
+ if(!comMngPopulationCommunityTagsDO.getLabel().contains(tag)){
+ comMngPopulationCommunityTagsDO.setLabel(comMngPopulationCommunityTagsDO.getLabel()+","+tag);
+ }
+ }
}
else{
comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
@@ -4048,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());
@@ -4059,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("执行数据库导入人口社区关系");
@@ -4084,7 +4268,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -4162,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() + "";
@@ -4344,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);
@@ -4357,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());
@@ -4368,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("执行数据库导入人口社区关系");
@@ -4393,7 +4597,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -4470,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() + "";
@@ -4652,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);
@@ -4665,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());
@@ -4676,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("执行数据库导入人口社区关系");
@@ -4701,7 +4925,7 @@
}
if (!updatePopulationCommunityList.isEmpty()) {
log.info("执行数据库更新人口社区关系");
- comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ comMngPopulationCommunityTagsService.updateBatchById(updatePopulationCommunityList);
log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -6654,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);
});
}
--
Gitblit v1.7.1