From 7671fa0c16cc3d4daa9795d68c057bb7a4de2b5f Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 17:14:19 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 08af58e..ffe1f9c 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
@@ -393,6 +393,7 @@
StringBuilder areaPath = new StringBuilder();
areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
//处理实有人口信息
+ Integer nub = 1;
for (ComMngPopulationServeExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
vo.setDoorNo(vo.getDoorNo().replace("号",""));
@@ -406,14 +407,21 @@
if(vo.getHouseNo().contains("号")){
vo.setHouseNo(vo.getHouseNo().replace("号",""));
}
+ log.info("开始查询小区街路巷是否存在");
//查询小区街路巷是否存在
ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
+ log.info("开始导入数据，行数:" + nub + "对象数据：" + vo.toString());
+ nub++;
+ log.info("街路巷对象：" + comMngVillageDO);
+ log.info("街路巷对象是否为空：" + ObjectUtils.isEmpty(comMngVillageDO));
+ log.info("街路巷对象是否为空2：" + (comMngVillageDO == null));
if (comMngVillageDO == null) {
ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
BeanUtils.copyProperties(vo,mistake);
setMistake(mistake, vo);
mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
+ log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
continue;
}
StringBuilder address = new StringBuilder();
@@ -422,7 +430,9 @@
.append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
vo.setAddress(address.toString());
+ log.info("开始查询小区街路巷是否存在完成");
+ log.info("开始查询房屋是否存在");
//先判断房屋是否存在
ComMngPopulationHouseDO populationHouseDO = comMngPopulationHouseDAO.selectOne(new QueryWrapper<ComMngPopulationHouseDO>().lambda()
.eq(ComMngPopulationHouseDO::getCommunityId, communityId).eq(ComMngPopulationHouseDO::getVillageId, comMngVillageDO.getVillageId())
@@ -446,6 +456,7 @@
}
vo.setHouseId(populationHouseDO.getId());
}
+ log.info("开始查询房屋是否存在完成");
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
//空户处理完房屋信息，直接返回
@@ -453,6 +464,7 @@
}
String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
//判断实有人口是否已存在
+ log.info("开始查询实有人口是否已存在");
ComMngPopulationDO populationDO = null;
List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
.eq(ComMngPopulationDO::getCardNo, cardNoAES));
@@ -478,7 +490,9 @@
ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList);
updateList.add(updatePopulationDO);
}
+ log.info("开始查询实有人口是否已存在完成");
+ log.info("开始查询实有人口房屋居住信息");
//处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>()
@@ -495,6 +509,7 @@
houseUserList.add(populationHouseUserDO);
}
}
+ log.info("开始查询实有人口房屋居住信息完成");
}
}catch (Exception e){
log.info("出现错误，错误原因：" + e.getMessage());
--
Gitblit v1.7.1