From c40be027ef8068b9a77bb24c94291dee25f563d8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:28:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 84 +++++++++++++++++++++++-------------------
1 files changed, 46 insertions(+), 38 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 0e8d7dc..2e09f2f 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
@@ -116,15 +116,17 @@
R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
log.info("开始导入人口数据");
log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("000", "导入数据为空！");
+ }
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- String key = Constants.POPULATION_ERROR_LIST + communityId;
+ String key = Constants.POPULATION_ERROR_LIST;
Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
// Map<String,Integer> dictMap = new HashMap<>();
// for(BcDictionaryVO vo : dictionaryR.getData()){
// dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
// }
-
int index = 2;
try {
@@ -302,45 +304,51 @@
continue;
}
vo.setDoorNo(oneData.get(7).trim());
- if(StringUtils.isEmpty(oneData.get(8))){
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第9列");
-// importErrorVO.setErrorMsg("楼排号不可为空");
-// populationImportErrorVOList.add(importErrorVO);
- index++;
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(8))){
+//// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//// importErrorVO.setErrorPosition("第" + index + "行，第9列");
+//// importErrorVO.setErrorMsg("楼排号不可为空");
+//// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setFloor(oneData.get(8).trim());
}
- vo.setFloor(oneData.get(8).trim());
- if(StringUtils.isEmpty(oneData.get(9))){
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第10列");
-// importErrorVO.setErrorMsg("单元号不可为空");
-// populationImportErrorVOList.add(importErrorVO);
- index++;
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(9))){
+//// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//// importErrorVO.setErrorPosition("第" + index + "行，第10列");
+//// importErrorVO.setErrorMsg("单元号不可为空");
+//// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setUnitNo(oneData.get(9).trim());
}
- vo.setUnitNo(oneData.get(9).trim());
- if(StringUtils.isEmpty(oneData.get(10))){
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第11列");
-// importErrorVO.setErrorMsg("户室不可为空");
-// populationImportErrorVOList.add(importErrorVO);
- index++;
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(10))){
+//// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+//// importErrorVO.setErrorPosition("第" + index + "行，第11列");
+//// importErrorVO.setErrorMsg("户室不可为空");
+//// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(10))) {
+ vo.setHouseNo(oneData.get(10).trim());
}
- vo.setHouseNo(oneData.get(10).trim());
if(StringUtils.isNotEmpty(oneData.get(11))){
vo.setBuildPurpose(oneData.get(11).trim());
}
--
Gitblit v1.7.1