From cbb99a04ff6812b6dc9ec033c68407d3966417cc Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 02 八月 2021 14:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index 5373d17..0e8d7dc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -115,6 +115,7 @@
private void saveData() {
R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
log.info("开始导入人口数据");
+ log.info("表格总数据：" + list.size());
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
String key = Constants.POPULATION_ERROR_LIST + communityId;
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 3e56e80..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,10 +407,14 @@
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);
--
Gitblit v1.7.1