From 0f71799671c2143d894b31df22d99524285a8d5c Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 11 六月 2021 13:22:31 +0800
Subject: [PATCH] 实有人口、楼栋数据导入
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 158 +++++++++++++++++++++++++++-------------------------
1 files changed, 83 insertions(+), 75 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 f8bf9a7..bdfc8fe 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
@@ -16,10 +16,12 @@
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -135,15 +137,15 @@
}
}
if(StringUtils.isNotEmpty(oneData.get(2))){
- String nation = oneData.get(2);
- if(!nation.contains("族")){
- ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第3列");
- importErrorVO.setErrorMsg("您填写的民族格式有误");
- populationImportErrorVOList.add(importErrorVO);
- index++;
- continue;
- }
+// String nation = oneData.get(2);
+// if(!nation.contains("族")){
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行，第3列");
+// importErrorVO.setErrorMsg("您填写的民族格式有误");
+// populationImportErrorVOList.add(importErrorVO);
+// index++;
+// continue;
+// }
vo.setNation(oneData.get(2));
}
if(StringUtils.isNotEmpty(oneData.get(3))){
@@ -159,7 +161,7 @@
vo.setPoliticalOutlook(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(4))){
- Integer isOk = PopulIsOkEnum.getCodeByName(oneData.get(4));
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(4));
if(isOk.equals(-1)){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorPosition("第" + index + "行，第5列");
@@ -170,6 +172,7 @@
}
vo.setIsRent(isOk);
}
+ //TODO 先存中文后期改为枚举
if(StringUtils.isNotEmpty(oneData.get(5))){
Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(5));
if(isOk.equals(-1)){
@@ -228,64 +231,16 @@
}
vo.setHouseNo(oneData.get(10).trim());
if(StringUtils.isNotEmpty(oneData.get(11))){
- vo.setPhone(oneData.get(11).trim());
+ vo.setBuildPurpose(oneData.get(11).trim());
}
if(StringUtils.isNotEmpty(oneData.get(12))){
- vo.setNativePlace(oneData.get(12).trim());
+ vo.setBuildArea(oneData.get(12).trim());
}
if(StringUtils.isNotEmpty(oneData.get(13))){
- Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(13));
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(13).trim());
if(isOk.equals(-1)){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
importErrorVO.setErrorPosition("第" + index + "行，第14列");
- importErrorVO.setErrorMsg("您填写的文化程度有误");
- populationImportErrorVOList.add(importErrorVO);
- index++;
- continue;
- }
- vo.setCultureLevel(isOk);
- }
- if(StringUtils.isNotEmpty(oneData.get(14))){
- Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(14));
- if(isOk.equals(-1)){
- ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第14列");
- importErrorVO.setErrorMsg("您填写的婚姻状况有误");
- populationImportErrorVOList.add(importErrorVO);
- index++;
- continue;
- }
- vo.setMarriage(isOk);
- }
- if(StringUtils.isNotEmpty(oneData.get(15))){
- vo.setHealthy(oneData.get(15).trim());
- }
- if(StringUtils.isNotEmpty(oneData.get(16))){
- vo.setWorkCompany(oneData.get(16).trim());
- }
- if(StringUtils.isNotEmpty(oneData.get(17))){
- vo.setRemark(oneData.get(17).trim());
- }
- if(StringUtils.isNotEmpty(oneData.get(18))){
- vo.setCensusRegister(oneData.get(18).trim());
- }
- if(StringUtils.isNotEmpty(oneData.get(19))){
- Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(19));
- if(isOk.equals(-1)){
- ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第20列");
- importErrorVO.setErrorMsg("您填写的外地or本地有误");
- populationImportErrorVOList.add(importErrorVO);
- index++;
- continue;
- }
- vo.setOutOrLocal(isOk);
- }
- if(StringUtils.isNotEmpty(oneData.get(20))){
- Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(20));
- if(isOk.equals(-1)){
- ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第21列");
importErrorVO.setErrorMsg("您填写的房屋状态有误");
populationImportErrorVOList.add(importErrorVO);
index++;
@@ -293,43 +248,96 @@
}
vo.setHouseStatus(isOk);
}
- if(StringUtils.isNotEmpty(oneData.get(21))){
- Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(21));
+ if(StringUtils.isNotEmpty(oneData.get(14))){
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim());
if(isOk.equals(-1)){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第22列");
+ importErrorVO.setErrorPosition("第" + index + "行，第15列");
importErrorVO.setErrorMsg("您填写的房屋用途有误");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
}
- vo.setHousePurpose(isOk);
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim()));
}
- if(StringUtils.isNotEmpty(oneData.get(22))){
- Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(22));
+ if(StringUtils.isNotEmpty(oneData.get(15))){
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(15));
if(isOk.equals(-1)){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第23列");
+ importErrorVO.setErrorPosition("第" + index + "行，第16列");
importErrorVO.setErrorMsg("您填写的管控状态有误");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
}
- vo.setControlStatus(isOk);
+ vo.setHouseStatus(isOk);
}
- if(StringUtils.isNotEmpty(oneData.get(23))){
- Integer isOk = PopulIsOksEnum.getCodeByName(oneData.get(23));
+
+ if(StringUtils.isNotEmpty(oneData.get(16))){
+ vo.setPhone(oneData.get(16).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(17))){
+ vo.setNativePlace(oneData.get(17).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(18))){
+ Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(18));
if(isOk.equals(-1)){
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorPosition("第" + index + "行，第23列");
- importErrorVO.setErrorMsg("您填写的是否是居住地有误");
+ importErrorVO.setErrorPosition("第" + index + "行，第19列");
+ importErrorVO.setErrorMsg("您填写的文化程度有误");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
}
- vo.setIsResidence(isOk);
+ vo.setCultureLevel(isOk);
}
- for (int i = 24; i < headSize; i++) {
+ if(StringUtils.isNotEmpty(oneData.get(19))){
+ Integer isOk = PopulMarriageEnum.getCodeByName(oneData.get(19));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第20列");
+ importErrorVO.setErrorMsg("您填写的婚姻状况有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setMarriage(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(20))){
+ vo.setHealthy(oneData.get(20).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(21))){
+ vo.setWorkCompany(oneData.get(21).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(22))){
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(22));
+ if(isOk.equals(-1)){
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第23列");
+ importErrorVO.setErrorMsg("您填写的外地or本地有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(23))){
+ vo.setCensusRegister(oneData.get(23).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(24))){
+ vo.setRemark(oneData.get(24).trim());
+ }
+
+ if(StringUtils.isNotEmpty(oneData.get(25))){
+ vo.setIdCardPositive(oneData.get(25).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(26))){
+ vo.setIdCardBack(oneData.get(26).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(27))){
+ vo.setHouseHold(oneData.get(27).trim());
+ }
+ for (int i = 28; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
}
--
Gitblit v1.7.1