From 07ba29f8b474c102cda0e1e5549b1ca1c90ca16b Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 05 八月 2021 18:55:35 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 584 ++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java | 10
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java | 100 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 20
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 26
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java | 77 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 639 ++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java | 105 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java | 89 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 12
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java | 548 ++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java | 5
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java | 14
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java | 12
22 files changed, 2,263 insertions(+), 32 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index 0b374f2..c17f897 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -157,9 +157,13 @@
public static final String CORRECT_POPULATION_ERROR_LIST = "CORRECT_POPULATION_ERROR_LIST_";
- public static final String Major_POPULATION_ERROR_LIST = "Major_POPULATION_ERROR_LIST_";
+ public static final String MAJOR_POPULATION_ERROR_LIST = "MAJOR_POPULATION_ERROR_LIST_";
- public static final String Cult_POPULATION_ERROR_LIST = "Cult_POPULATION_ERROR_LIST_";
+ public static final String CULT_POPULATION_ERROR_LIST = "CULT_POPULATION_ERROR_LIST_";
+
+ public static final String REHABILITATION_POPULATION_ERROR_LIST = "REHABILITATION_POPULATION_ERROR_LIST_";
+
+ public static final String KEY_POPULATION_ERROR_LIST = "KEY_POPULATION_ERROR_LIST_";
/**
* 高德地图获取天气url
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
index 305ee56..b2b9906 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
@@ -109,7 +109,7 @@
throw new ServiceException("500", "导入数据为空！");
}
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- String key = Constants.Cult_POPULATION_ERROR_LIST + communityId;
+ String key = Constants.CULT_POPULATION_ERROR_LIST + communityId;
Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
// Map<String,Integer> dictMap = new HashMap<>();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
new file mode 100644
index 0000000..7697b6f
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
@@ -0,0 +1,548 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.excel.CustomSheetWriteHandler;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationKeyMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @description: 重点上访人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationKeyExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ private CommunityService communityService;
+
+ private Long communityId;
+
+ private static int headSize = 0;
+
+ private Map<Integer, String> headData;
+
+ private String userName;
+ // FTP 登录密码
+ private String password;
+ // FTP 服务器地址IP地址
+ private String host;
+ // FTP 端口
+ private int port;
+ private String excelUrl;
+
+ private StringRedisTemplate stringRedisTemplate;
+
+ public static String loadUrl;
+
+ public ComMngPopulationKeyExcelListen(CommunityService communityService, Long communityId, String userName, String password, String host, int port, String excelUrl, StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userName = userName;
+ this.password = password;
+ this.host = host;
+ this.port = port;
+ this.excelUrl = excelUrl;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入重点上访人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("500", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.KEY_POPULATION_ERROR_LIST + communityId;
+
+ 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 {
+ ArrayList<ComMngPopulationKeyExcelVO> voList = Lists.newArrayList();
+// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationKeyMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationKeyExcelVO vo = new ComMngPopulationKeyExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))){
+ vo.setSerialNumber(oneData.get(0));
+ }
+ //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ //判断身份证号码位数
+ if(oneData.get(3).length() != 18){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+// //设置用户年龄
+// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+ }
+ if(StringUtils.isNotEmpty(oneData.get(2))){
+ vo.setNation(oneData.get(2));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(4))){
+ vo.setPhone(oneData.get(4));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(5))){
+ vo.setNativePlace(oneData.get(5));
+ }
+ if(StringUtils.isEmpty(oneData.get(6))){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(6));
+ if(StringUtils.isEmpty(oneData.get(7))){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(7).trim());
+ if(StringUtils.isEmpty(oneData.get(8))){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("楼排号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setFloor(oneData.get(8).trim());
+ if(StringUtils.isEmpty(oneData.get(9))){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("单元号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setUnitNo(oneData.get(9).trim());
+ if(StringUtils.isEmpty(oneData.get(10))){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("户室不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseNo(oneData.get(10).trim());
+ if(StringUtils.isNotEmpty(oneData.get(11))){
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
+ if(isOk.equals(-1)){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ }else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(12))){
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(12).trim());
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(13))){
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim());
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(14))){
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(14));
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(15))){
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(15));
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ }else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(16))){
+ vo.setCensusRegister(oneData.get(16).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(17))){
+ vo.setRemark(oneData.get(17).trim());
+ }
+ vo.getUserTagStr().add("重点上访人员");
+ for (int i = 18; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
+ }
+ }
+ //将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if(StringUtils.isNotEmpty(distinctPass)){
+ vo.setDistinctPass(distinctPass);
+ }
+ }catch (Exception e){
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ //客户需要暂时注释，等客户处理完成需要恢复
+// if(populationImportErrorVOList.isEmpty()){
+// R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+// if (!R.isOk(r)) {
+// throw new ServiceException(r.getMsg());
+// }
+// }else{
+// throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+// }
+ //根据list中的IdCard城市来去重
+ List<ComMngPopulationKeyExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationKeyExcelVO::getDistinctPass)).collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationKeyExcelVO(newVoList, communityId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationKeyMistakeExcelVO> list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationKeyMistakeExcelVO.class);
+// String errMsg = r.getMsg();
+// List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+// if(!errorList.isEmpty()){
+// populationImportErrorVOList.addAll(errorList);
+// }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ }else{
+ log.info("业务层处理逻辑失败");
+ if(!mistakes.isEmpty()){
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行");
+// importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+// populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "导入失败111");
+ }
+ }
+
+ private void setKeyMistake(Map<Integer, String> map, ComMngPopulationKeyMistakeExcelVO vo){
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setNativePlace(map.get(5));
+ vo.setRoad(map.get(6));
+ vo.setDoorNo(map.get(7));
+ vo.setFloor(map.get(8));
+ vo.setUnitNo(map.get(9));
+ vo.setHouseNo(map.get(10));
+ vo.setIsRent(map.get(11));
+ vo.setHouseStatus(map.get(12));
+ vo.setHousePurpose(map.get(13));
+ vo.setControlStatus(map.get(14));
+ vo.setOutOrLocal(map.get(15));
+ vo.setCensusRegister(map.get(16));
+ vo.setRemark(map.get(17));
+ }
+
+ private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {
+ //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
+ String ftpUrl = "/mnt/data/web/excel/";
+ String name = "实有人口错误数据.xlsx";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComMngPopulationMistakeExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("实有人口错误数据").build();
+ excelWriter.write(vo, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ private String convertMarriage(String ma) {
+
+ if(Objects.equals("已",ma) || Objects.equals("一",ma)){
+ ma = "已婚";
+ }else if(Objects.equals("未",ma) || Objects.equals("未婚婚",ma)){
+ ma = "未婚";
+ }else if(Objects.equals("初",ma)){
+ ma = "初婚";
+ }else if(Objects.equals("再",ma)){
+ ma = "再婚";
+ }else if(Objects.equals("复",ma)){
+ ma = "复婚";
+ }else if(Objects.equals("丧",ma) || Objects.equals("丧偶偶",ma)){
+ ma = "丧偶";
+ }else if(Objects.equals("离",ma) || Objects.equals("离异",ma) || Objects.equals("离异婚",ma)){
+ ma = "离婚";
+ }else if(Objects.equals("分",ma)){
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if(ra.contains("户主")){
+ ra = "户主";
+ }else if(Objects.equals(ra,"女儿")){
+ ra = "女";
+ }else if(Objects.equals(ra,"儿子") || Objects.equals(ra,"儿")){
+ ra = "子";
+ }else if(Objects.equals(ra,"大女")){
+ ra = "长女";
+ }else if(Objects.equals(ra,"二女") || Objects.equals(ra,"此女")){
+ ra = "次女";
+ }else if(Objects.equals(ra,"二子")){
+ ra = "次子";
+ }else if(Objects.equals(ra,"长男") || ra.contains("长子")){
+ ra = "长子";
+ }else if(Objects.equals(ra,"非亲属") || ra.contains("女友") || ra.contains("女朋友")
+ || ra.contains("男友") || ra.contains("男朋友")){
+ ra = "其他";
+ }else if(Objects.equals(ra,"姐")){
+ ra = "姐姐";
+ }else if(Objects.equals(ra,"户主")){
+ ra = "本人";
+ }else if(Objects.equals(ra,"妻子") || Objects.equals(ra,"媳妇")){
+ ra = "妻";
+ }else if(Objects.equals(ra,"哥") || Objects.equals(ra,"哥哥")){
+ ra = "兄";
+ }else if(Objects.equals(ra,"丈夫")){
+ ra = "夫";
+ }else if(Objects.equals(ra,"丈母娘")){
+ ra = "岳母";
+ }else if(Objects.equals(ra,"继子") || Objects.equals(ra,"养子")){
+ ra = "养子或继子";
+ }else if(Objects.equals(ra,"继女") || Objects.equals(ra,"养女")){
+ ra = "养女或继女";
+ }else if(ra.contains("儿媳")||ra.contains("长媳")){
+ ra = "儿媳";
+ }else if(Objects.equals(ra,"三姨") || Objects.equals(ra,"姨姨")){
+ ra = "姨母";
+ }else if(Objects.equals(ra,"二外孙女")){
+ ra = "外孙女";
+ }else if(Objects.equals(ra,"外孙")){
+ ra = "外孙子";
+ }else if(Objects.equals(ra,"侄儿")){
+ ra = "侄子";
+ }else if(ra.contains("表")){
+ ra = "表兄弟、表姐妹";
+ }else if(Objects.equals(ra,"继父") || Objects.equals(ra,"养父")){
+ ra = "继父或养父";
+ }else if(Objects.equals(ra,"父")){
+ ra = "父亲";
+ }else if(Objects.equals(ra,"弟弟")){
+ ra = "弟";
+ }else if(Objects.equals(ra,"孙")){
+ ra = "孙子";
+ }else if(Objects.equals(ra,"孙媳妇") || Objects.equals(ra,"外孙媳妇")){
+ ra = "孙媳妇或外孙媳妇";
+ }else if(Objects.equals(ra,"妹")){
+ ra = "妹妹";
+ }else if(Objects.equals(ra,"祖父母")){
+ ra = "祖父母或外祖父母";
+ }else if(Objects.equals(ra,"姐妹") || Objects.equals(ra,"兄弟")){
+ ra = "兄弟姐妹";
+ }else if(Objects.equals(ra,"其他姐妹") || Objects.equals(ra,"其他兄弟")){
+ ra = "其他兄弟姐妹";
+ }else if(Objects.equals(ra,"奶奶")){
+ ra = "祖母";
+ }else if(Objects.equals(ra,"爷爷")){
+ ra = "祖父";
+ }else if(Objects.equals(ra,"爷爷")){
+ ra = "祖父";
+ }else if(ra.contains("堂")){
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
index 1845c14..4d1c347 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -18,6 +18,7 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorMistakeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationMistakeExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.PayUtil;
@@ -121,7 +122,7 @@
throw new ServiceException("500", "导入数据为空！");
}
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- String key = Constants.Major_POPULATION_ERROR_LIST + communityId;
+ String key = Constants.MAJOR_POPULATION_ERROR_LIST + communityId;
Map<String,String> dictMap = dictionaryR.getData().stream().collect(Collectors.toMap(BcDictionaryVO::getDictName,BcDictionaryVO::getDictValue));
// Map<String,Integer> dictMap = new HashMap<>();
@@ -323,7 +324,16 @@
vo.setGuarDianPhone(oneData.get(17).trim());
}
if(StringUtils.isNotEmpty(oneData.get(18))){
- vo.setPatientRelation(oneData.get(18).trim());
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的与患者关系有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPatientRelation(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(19))){
vo.setDiagnose(oneData.get(19).trim());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
new file mode 100644
index 0000000..c459757
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -0,0 +1,584 @@
+package com.panzhihua.common.listen;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONArray;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.constants.BcDictionaryConstants;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
+import com.panzhihua.common.excel.CustomSheetWriteHandler;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.ListUtils;
+import com.panzhihua.common.utlis.PayUtil;
+import com.panzhihua.common.utlis.SFTPUtil;
+import com.panzhihua.common.utlis.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @description: 刑释人员导入监听
+ * @author: txb
+ */
+@Slf4j
+public class ComMngPopulationRehabilitationExcelListen extends AnalysisEventListener<Map<Integer, String>> {
+ private CommunityService communityService;
+
+ private Long communityId;
+
+ private static int headSize = 0;
+
+ private Map<Integer, String> headData;
+
+ private String userName;
+ // FTP 登录密码
+ private String password;
+ // FTP 服务器地址IP地址
+ private String host;
+ // FTP 端口
+ private int port;
+ private String excelUrl;
+
+ private StringRedisTemplate stringRedisTemplate;
+
+ public static String loadUrl;
+
+ public ComMngPopulationRehabilitationExcelListen(CommunityService communityService, Long communityId, String userName, String password, String host, int port, String excelUrl, StringRedisTemplate stringRedisTemplate) {
+ this.communityService = communityService;
+ this.communityId = communityId;
+ this.userName = userName;
+ this.password = password;
+ this.host = host;
+ this.port = port;
+ this.excelUrl = excelUrl;
+ this.stringRedisTemplate = stringRedisTemplate;
+ }
+
+ /**
+ * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
+ */
+ private static final int BATCH_COUNT = 5000;
+ List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
+
+ @Override
+ public void invoke(Map<Integer, String> data, AnalysisContext context) {
+ list.add(data);
+ if (list.size() >= BATCH_COUNT) {
+ saveData();
+ list.clear();
+ }
+ }
+
+ /**
+ * 这里会一行行的返回头
+ *
+ * @param headMap
+ * @param context
+ */
+ @Override
+ public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+ headSize = headMap.size();
+ headData = headMap;
+ }
+
+ @Override
+ public void doAfterAllAnalysed(AnalysisContext context) {
+ saveData();
+ log.info("所有数据解析完成！");
+ }
+
+ /**
+ * 不是固定的列只能手动处理
+ */
+ private void saveData() {
+ R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
+ log.info("开始导入刑释人员数据");
+ log.info("表格总数据：" + list.size());
+ if (list.size() == 0) {
+ throw new ServiceException("500", "导入数据为空！");
+ }
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ String key = Constants.REHABILITATION_POPULATION_ERROR_LIST + communityId;
+
+ 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 {
+ ArrayList<ComMngPopulationRehabilitationExcelVO> voList = Lists.newArrayList();
+// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ ArrayList<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = Lists.newArrayList();
+ for (Map<Integer, String> oneData : list) {
+ ComMngPopulationRehabilitationExcelVO vo = new ComMngPopulationRehabilitationExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))){
+ vo.setSerialNumber(oneData.get(0));
+ }
+ //姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
+ if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
+
+ //判断身份证号码位数
+ if(oneData.get(3).length() != 18){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
+// //设置用户年龄
+// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
+ }
+ }
+ if(StringUtils.isNotEmpty(oneData.get(2))){
+ vo.setNation(oneData.get(2));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(4))){
+ vo.setPhone(oneData.get(4));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(5))){
+ vo.setNativePlace(oneData.get(5));
+ }
+ if(StringUtils.isEmpty(oneData.get(6))){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("街路巷不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setRoad(oneData.get(6));
+ if(StringUtils.isEmpty(oneData.get(7))){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("小区号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setDoorNo(oneData.get(7).trim());
+ if(StringUtils.isEmpty(oneData.get(8))){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("楼排号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setFloor(oneData.get(8).trim());
+ if(StringUtils.isEmpty(oneData.get(9))){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("单元号不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setUnitNo(oneData.get(9).trim());
+ if(StringUtils.isEmpty(oneData.get(10))){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("户室不可为空");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseNo(oneData.get(10).trim());
+ if(StringUtils.isNotEmpty(oneData.get(11))){
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11));
+ if(isOk.equals(-1)){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否租住有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRent(isOk);
+ }else {
+ vo.setIsRent(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(12))){
+ Integer isOk = PopulHouseStatusEnum.getCodeByName(oneData.get(12).trim());
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHouseStatus(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(13))){
+ Integer isOk = PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim());
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的房屋用途有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(13).trim()));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(14))){
+ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(14));
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的管控状态有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setControlStatus(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(15))){
+ Integer isOk = PopulOutOrLocalEnum.getCodeByName(oneData.get(15));
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的本地/外地有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setOutOrLocal(isOk);
+ }else {
+ vo.setOutOrLocal(PopulOutOrLocalEnum.getCodeByName("本地"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(16))){
+ vo.setCensusRegister(oneData.get(16).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(17))){
+ vo.setMainRelatives(oneData.get(17).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(18))){
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
+ if(isOk.equals(-1)){
+ index++;
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的与人员关系有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setPatientRelation(isOk);
+ }
+ if(StringUtils.isNotEmpty(oneData.get(19))){
+ vo.setRehabReasonAndType(oneData.get(19).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(20))){
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(20));
+ if(isOk.equals(-1)){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否列管有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsRehab(isOk);
+ }else {
+ vo.setIsRehab(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(21))){
+ vo.setRemark(oneData.get(21).trim());
+ }
+ vo.getUserTagStr().add("刑满释放");
+ for (int i = 22; i < headSize; i++) {
+ if (oneData.get(i) != null && oneData.get(i).equals("是")) {
+ vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
+ }
+ }
+ //将重复的数据进行MD5加密实现去重
+ String distinct = vo.getName() + vo.getCardNo() + vo.getRoad() + vo.getDoorNo() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
+ try {
+ String distinctPass = PayUtil.MD5(distinct);
+ if(StringUtils.isNotEmpty(distinctPass)){
+ vo.setDistinctPass(distinctPass);
+ }
+ }catch (Exception e){
+ log.error("组装MD5加密字段失败，数据表格行数：" + index);
+ continue;
+ }
+ voList.add(vo);
+ index++;
+ }
+ //客户需要暂时注释，等客户处理完成需要恢复
+// if(populationImportErrorVOList.isEmpty()){
+// R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+// if (!R.isOk(r)) {
+// throw new ServiceException(r.getMsg());
+// }
+// }else{
+// throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+// }
+ //根据list中的IdCard城市来去重
+ List<ComMngPopulationRehabilitationExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngPopulationRehabilitationExcelVO::getDistinctPass)).collect(Collectors.toList());
+ log.info("开始进入业务层处理逻辑");
+ R r = communityService.listSavePopulationRehabilitationExcelVO(newVoList, communityId);
+ log.info("业务层处理逻辑完成");
+ if (!R.isOk(r)) {
+ log.info("业务层处理成功");
+ List<ComMngPopulationRehabilitationMistakeExcelVO> list = JSONArray.parseArray(JSONArray.toJSONString(r.getData()), ComMngPopulationRehabilitationMistakeExcelVO.class);
+// String errMsg = r.getMsg();
+// List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+// if(!errorList.isEmpty()){
+// populationImportErrorVOList.addAll(errorList);
+// }
+ mistakes.addAll(list);
+ log.info("将错误数据存入redis中");
+ valueOperations.set(key,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
+ log.info("将错误数据存入redis中成功");
+ throw new ServiceException("500", key);
+ }else{
+ log.info("业务层处理逻辑失败");
+ if(!mistakes.isEmpty()){
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中");
+ valueOperations.set(key,JSONArray.toJSONString(mistakes),1, TimeUnit.HOURS);
+ log.info("业务层处理逻辑失败，将错误数据缓存到redis中成功");
+ throw new ServiceException("500", key);
+ }
+ }
+ } catch (NumberFormatException e) {
+ log.info("处理数据时失败");
+ e.printStackTrace();
+// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+// importErrorVO.setErrorPosition("第" + index + "行");
+// importErrorVO.setErrorMsg("数据格式有误，请检查文档内数据");
+// populationImportErrorVOList.add(importErrorVO);
+ log.error("数据格式有误，第" + index + "行");
+ throw new ServiceException("500", "导入失败111");
+ }
+ }
+
+ private void setRehabilitationMistake(Map<Integer, String> map, ComMngPopulationRehabilitationMistakeExcelVO vo){
+ vo.setSerialNumber(map.get(0));
+ vo.setName(map.get(1));
+ vo.setCardNo(map.get(3));
+ vo.setNation(map.get(2));
+ vo.setPhone(map.get(4));
+ vo.setNativePlace(map.get(5));
+ vo.setRoad(map.get(6));
+ vo.setDoorNo(map.get(7));
+ vo.setFloor(map.get(8));
+ vo.setUnitNo(map.get(9));
+ vo.setHouseNo(map.get(10));
+ vo.setIsRent(map.get(11));
+ vo.setHouseStatus(map.get(12));
+ vo.setHousePurpose(map.get(13));
+ vo.setControlStatus(map.get(14));
+ vo.setOutOrLocal(map.get(15));
+ vo.setCensusRegister(map.get(16));
+ vo.setMainRelatives(map.get(17));
+ vo.setPatientRelation(map.get(18));
+ vo.setRehabReasonAndType(map.get(19));
+ vo.setIsRehab(map.get(20));
+ vo.setRemark(map.get(21));
+ }
+
+ private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {
+ //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
+ String ftpUrl = "/mnt/data/web/excel/";
+ String name = "实有人口错误数据.xlsx";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComMngPopulationMistakeExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("实有人口错误数据").build();
+ excelWriter.write(vo, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
+
+ private String convertMarriage(String ma) {
+
+ if(Objects.equals("已",ma) || Objects.equals("一",ma)){
+ ma = "已婚";
+ }else if(Objects.equals("未",ma) || Objects.equals("未婚婚",ma)){
+ ma = "未婚";
+ }else if(Objects.equals("初",ma)){
+ ma = "初婚";
+ }else if(Objects.equals("再",ma)){
+ ma = "再婚";
+ }else if(Objects.equals("复",ma)){
+ ma = "复婚";
+ }else if(Objects.equals("丧",ma) || Objects.equals("丧偶偶",ma)){
+ ma = "丧偶";
+ }else if(Objects.equals("离",ma) || Objects.equals("离异",ma) || Objects.equals("离异婚",ma)){
+ ma = "离婚";
+ }else if(Objects.equals("分",ma)){
+ ma = "分居";
+ }
+
+ return ma;
+ }
+
+ private String convertRelation(String ra) {
+ if(ra.contains("户主")){
+ ra = "户主";
+ }else if(Objects.equals(ra,"女儿")){
+ ra = "女";
+ }else if(Objects.equals(ra,"儿子") || Objects.equals(ra,"儿")){
+ ra = "子";
+ }else if(Objects.equals(ra,"大女")){
+ ra = "长女";
+ }else if(Objects.equals(ra,"二女") || Objects.equals(ra,"此女")){
+ ra = "次女";
+ }else if(Objects.equals(ra,"二子")){
+ ra = "次子";
+ }else if(Objects.equals(ra,"长男") || ra.contains("长子")){
+ ra = "长子";
+ }else if(Objects.equals(ra,"非亲属") || ra.contains("女友") || ra.contains("女朋友")
+ || ra.contains("男友") || ra.contains("男朋友")){
+ ra = "其他";
+ }else if(Objects.equals(ra,"姐")){
+ ra = "姐姐";
+ }else if(Objects.equals(ra,"户主")){
+ ra = "本人";
+ }else if(Objects.equals(ra,"妻子") || Objects.equals(ra,"媳妇")){
+ ra = "妻";
+ }else if(Objects.equals(ra,"哥") || Objects.equals(ra,"哥哥")){
+ ra = "兄";
+ }else if(Objects.equals(ra,"丈夫")){
+ ra = "夫";
+ }else if(Objects.equals(ra,"丈母娘")){
+ ra = "岳母";
+ }else if(Objects.equals(ra,"继子") || Objects.equals(ra,"养子")){
+ ra = "养子或继子";
+ }else if(Objects.equals(ra,"继女") || Objects.equals(ra,"养女")){
+ ra = "养女或继女";
+ }else if(ra.contains("儿媳")||ra.contains("长媳")){
+ ra = "儿媳";
+ }else if(Objects.equals(ra,"三姨") || Objects.equals(ra,"姨姨")){
+ ra = "姨母";
+ }else if(Objects.equals(ra,"二外孙女")){
+ ra = "外孙女";
+ }else if(Objects.equals(ra,"外孙")){
+ ra = "外孙子";
+ }else if(Objects.equals(ra,"侄儿")){
+ ra = "侄子";
+ }else if(ra.contains("表")){
+ ra = "表兄弟、表姐妹";
+ }else if(Objects.equals(ra,"继父") || Objects.equals(ra,"养父")){
+ ra = "继父或养父";
+ }else if(Objects.equals(ra,"父")){
+ ra = "父亲";
+ }else if(Objects.equals(ra,"弟弟")){
+ ra = "弟";
+ }else if(Objects.equals(ra,"孙")){
+ ra = "孙子";
+ }else if(Objects.equals(ra,"孙媳妇") || Objects.equals(ra,"外孙媳妇")){
+ ra = "孙媳妇或外孙媳妇";
+ }else if(Objects.equals(ra,"妹")){
+ ra = "妹妹";
+ }else if(Objects.equals(ra,"祖父母")){
+ ra = "祖父母或外祖父母";
+ }else if(Objects.equals(ra,"姐妹") || Objects.equals(ra,"兄弟")){
+ ra = "兄弟姐妹";
+ }else if(Objects.equals(ra,"其他姐妹") || Objects.equals(ra,"其他兄弟")){
+ ra = "其他兄弟姐妹";
+ }else if(Objects.equals(ra,"奶奶")){
+ ra = "祖母";
+ }else if(Objects.equals(ra,"爷爷")){
+ ra = "祖父";
+ }else if(Objects.equals(ra,"爷爷")){
+ ra = "祖父";
+ }else if(ra.contains("堂")){
+ ra = "堂兄弟、堂姐妹";
+ }
+
+ return ra;
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java
new file mode 100644
index 0000000..01e79a2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyExcelVO.java
@@ -0,0 +1,105 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 批量导入重点上访人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationKeyExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private Integer isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private Integer outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 17)
+ private String remark;
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 性别（1.男 2.女）
+ */
+ private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 扩展字段用逗号隔开
+ */
+ private List<String> userTagStr = Lists.newArrayList();
+
+ private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java
new file mode 100644
index 0000000..37a1ce5
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationKeyMistakeExcelVO.java
@@ -0,0 +1,77 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 批量导入重点上访人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationKeyMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "备注", index = 17)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 18)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
index 4e812ed..90aa740 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -74,7 +74,7 @@
private String guarDianPhone;
@ExcelProperty(value = "与患者关系", index = 18)
- private String patientRelation;
+ private Integer patientRelation;
@ExcelProperty(value = "目前诊断", index = 19)
private String diagnose;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
index cb03286..8581632 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
@@ -17,6 +17,9 @@
@EncryptDecryptClass
public class ComMngPopulationRehabilitationExcelVO implements Serializable {
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
@ExcelProperty(value = "姓名", index = 1)
private String name;
@@ -70,7 +73,7 @@
private String mainRelatives;
@ExcelProperty(value = "与人员关系", index = 18)
- private String patientRelation;
+ private Integer patientRelation;
@ExcelProperty(value = "列管原因及类型", index = 19)
private String rehabReasonAndType;
@@ -106,4 +109,9 @@
private List<String> userTagStr = Lists.newArrayList();
private Long houseId;
+
+ /**
+ * 地址
+ */
+ private String address;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java
new file mode 100644
index 0000000..b82350c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationMistakeExcelVO.java
@@ -0,0 +1,89 @@
+package com.panzhihua.common.model.vos.community;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @description: 批量导入刑释人员
+ * @author: txb
+ */
+@Data
+@EncryptDecryptClass
+public class ComMngPopulationRehabilitationMistakeExcelVO implements Serializable {
+
+ @ExcelProperty(value = "序号", index = 0)
+ private String serialNumber;
+
+ @ExcelProperty(value = "姓名", index = 1)
+ private String name;
+
+ @ExcelProperty(value = "民族", index = 2)
+ private String nation;
+
+ @ExcelProperty(value = "身份证号码", index = 3)
+ @EncryptDecryptField
+ private String cardNo;
+
+ @ExcelProperty(value = "联系电话", index = 4)
+ private String phone;
+
+ @ExcelProperty(value = "籍贯", index = 5)
+ private String nativePlace;
+
+ @ExcelProperty(value = "街/路/巷", index = 6)
+ private String road;
+
+ @ExcelProperty(value = "小区号", index = 7)
+ private String doorNo;
+
+ @ExcelProperty(value = "楼排号", index = 8)
+ private String floor;
+
+ @ExcelProperty(value = "单元号", index = 9)
+ private String unitNo;
+
+ @ExcelProperty(value = "户室（房间号）", index = 10)
+ private String houseNo;
+
+ @ExcelProperty(value = "是否租住", index = 11)
+ private String isRent;
+
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 12)
+ private String houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 13)
+ private String housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 14)
+ private String controlStatus;
+
+ @ExcelProperty(value = "外地/本地（1.本地 2.外地）", index = 15)
+ private String outOrLocal;
+
+ @ExcelProperty(value = "户口所在地", index = 16)
+ private String censusRegister;
+
+ @ExcelProperty(value = "主要亲属", index = 17)
+ private String mainRelatives;
+
+ @ExcelProperty(value = "与人员关系", index = 18)
+ private String patientRelation;
+
+ @ExcelProperty(value = "列管原因及类型", index = 19)
+ private String rehabReasonAndType;
+
+ @ExcelProperty(value = "是否列管", index = 20)
+ private String isRehab;
+
+ @ExcelProperty(value = "备注", index = 21)
+ private String remark;
+
+ @ExcelProperty(value = "错误信息", index = 22)
+ private String mistake;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index c40abb5..bd08849 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -97,6 +97,9 @@
@NotBlank(groups = {AddGroup.class},message = "政治面貌不可为空")
private Integer politicalOutlook;
+ @ApiModelProperty("政治面貌名称")
+ private String politicalOutlookName;
+
@ApiModelProperty("工作单位")
private String workCompany;
@@ -151,8 +154,14 @@
@ApiModelProperty("文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他)")
private Integer cultureLevel;
+ @ApiModelProperty("文化程度名称")
+ private String cultureLevelName;
+
@ApiModelProperty("婚姻状况(10.未婚 20.已婚 21.初婚 22.再婚 23.复婚 30.丧偶 40.离婚 90.未说明的婚姻状况 60.其他)")
private Integer marriage;
+
+ @ApiModelProperty("婚姻状况名称")
+ private String marriageName;
@ApiModelProperty("健康状况")
private String healthy;
@@ -172,6 +181,9 @@
@ApiModelProperty("与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)")
private Integer relation;
+ @ApiModelProperty("与户主关系名称")
+ private String relationName;
+
@ApiModelProperty("房屋列表")
private List<ComMngHouseVo> houseList;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 1da298f..571d299 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1743,6 +1743,26 @@
R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);
/**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importRehabilitation")
+ R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/importKey")
+ R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
* 确认导入实有人口（有则更新，无则新建）
*
* @param list 用户信息
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
index e473815..202bc6d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java
@@ -333,8 +333,8 @@
String openid = userResult.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"微心愿审核失败"
- , DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),comActMicroWishVO1.getRejectReason());
+ WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"微心愿"
+ , DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comActMicroWishVO1.getRejectReason());
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
}
@@ -372,7 +372,7 @@
String openid = userResult.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"微心愿审核"
+ WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"微心愿"
, DateUtils.format(comActMicroWishVO1.getExamineAt(),DateUtils.ymdhms_format),"审核通过");
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -437,8 +437,8 @@
String openid = userResult.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"随手拍审核失败"
- , DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),comActEasyPhotoVO.getRejectReason());
+ WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"随手拍"
+ , DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comActEasyPhotoVO.getRejectReason());
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
}
@@ -463,7 +463,7 @@
String openid = userResult.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"随手拍审核"
+ WxUtil.sendSubscribeSHZT(openid,util.getAppAccessToken(),"随手拍"
, DateUtils.format(comActEasyPhotoVO1.getExamineAt(),DateUtils.ymdhms_format),"审核通过");
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
index 251b89a..0a3e756 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -431,7 +431,7 @@
String openid = userResult.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"用户志愿者审核"
+ WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"志愿者认证"
, DateUtils.format(comMngVolunteerMngVO1.getCreateAt(),DateUtils.ymdhms_format),"审核通过");
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
@@ -450,8 +450,8 @@
String openid = userResult.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"用户志愿者审核失败"
- , DateUtils.format(comMngVolunteerMngVO1.getCreateAt(),DateUtils.ymdhms_format),comMngVolunteerMngVO1.getRejectReson());
+ WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"志愿者认证"
+ , DateUtils.format(comMngVolunteerMngVO1.getCreateAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + comMngVolunteerMngVO1.getRejectReson());
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
index 83d50fc..f9ff0ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -600,7 +600,7 @@
String openid = r1.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"用户党员认证", DateUtils.format(vo1.getCreateAt(),DateUtils.ymdhms_format),"审核通过");
+ WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"党员认证", DateUtils.format(vo1.getCreateAt(),DateUtils.ymdhms_format),"审核通过");
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
}
@@ -629,7 +629,7 @@
String openid = r2.getData().toString();
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"用户党员认证失败", DateUtils.format(vo1.getCreateAt(),DateUtils.ymdhms_format),partyBuildingMemberVO.getRefuseReason());
+ WxUtil.sendSubscribeRZSH(openid,util.getAppAccessToken(),"党员认证", DateUtils.format(vo1.getCreateAt(),DateUtils.ymdhms_format),"审核驳回，驳回原因：" + partyBuildingMemberVO.getRefuseReason());
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
index b42b580..069d474 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
@@ -176,6 +176,42 @@
return R.ok();
}
+ @ApiOperation(value = "excel导入刑释人员")
+ @PostMapping(value = "/serve/importRehabilitation", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R importRehabilitation(@RequestParam MultipartFile file, HttpServletRequest request) {
+ //获取文件名
+ String fileName = file.getOriginalFilename();
+ log.info("传入文件名字【{}】", fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ ComMngPopulationRehabilitationExcelListen comMngPopulationRehabilitationExcelListen = new ComMngPopulationRehabilitationExcelListen(communityService, this.getCommunityId(),userName,password,host,port,excelUrl,stringRedisTemplate);
+ EasyExcel.read(inputStream, null, comMngPopulationRehabilitationExcelListen).sheet().doRead();
+ } catch (IOException e) {
+ log.error("导入模板失败【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+
+ @ApiOperation(value = "excel导入重点上访人员")
+ @PostMapping(value = "/serve/importKey", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ public R importKey(@RequestParam MultipartFile file, HttpServletRequest request) {
+ //获取文件名
+ String fileName = file.getOriginalFilename();
+ log.info("传入文件名字【{}】", fileName);
+ InputStream inputStream = null;
+ try {
+ inputStream = file.getInputStream();
+ ComMngPopulationRehabilitationExcelListen comMngPopulationRehabilitationExcelListen = new ComMngPopulationRehabilitationExcelListen(communityService, this.getCommunityId(),userName,password,host,port,excelUrl,stringRedisTemplate);
+ EasyExcel.read(inputStream, null, comMngPopulationRehabilitationExcelListen).sheet().doRead();
+ } catch (IOException e) {
+ log.error("导入模板失败【{}】", e.getMessage());
+ e.printStackTrace();
+ }
+ return R.ok();
+ }
+
/**
* 确认导入实有人口（有则更新，无则新建）
*
@@ -2166,7 +2202,7 @@
}
@ApiOperation(value = "下载导入失败吸毒人员数据")
- @PostMapping("/download/error/Drugpopulation")
+ @PostMapping("/download/error/populationDrug")
public R downloadErrorDrugPopulation(@RequestParam(value = "key") String key) {
List<ComMngPopulationDrugMistakeExcelVO> list = new ArrayList<>();
Boolean isExits = stringRedisTemplate.hasKey(key);
@@ -2222,7 +2258,7 @@
}
@ApiOperation(value = "下载导入失败社区矫正人员数据")
- @PostMapping("/download/error/Correctpopulation")
+ @PostMapping("/download/error/populationCorrect")
public R downloadErrorCorrectPopulation(@RequestParam(value = "key") String key) {
List<ComMngPopulationCorrectMistakeExcelVO> list = new ArrayList<>();
Boolean isExits = stringRedisTemplate.hasKey(key);
@@ -2278,7 +2314,7 @@
}
@ApiOperation(value = "下载导入失败重精人员数据")
- @PostMapping("/download/error/Majorpopulation")
+ @PostMapping("/download/error/populationMajor")
public R downloadErrorMajorPopulation(@RequestParam(value = "key") String key) {
List<ComMngPopulationMajorMistakeExcelVO> list = new ArrayList<>();
Boolean isExits = stringRedisTemplate.hasKey(key);
@@ -2334,7 +2370,7 @@
}
@ApiOperation(value = "下载导入失败邪教人员数据")
- @PostMapping("/download/error/Cultpopulation")
+ @PostMapping("/download/error/populationCult")
public R downloadErrorCultPopulation(@RequestParam(value = "key") String key) {
List<ComMngPopulationCultMistakeExcelVO> list = new ArrayList<>();
Boolean isExits = stringRedisTemplate.hasKey(key);
@@ -2388,4 +2424,60 @@
return R.fail();
}
}
+
+ @ApiOperation(value = "下载导入失败刑释人员数据")
+ @PostMapping("/download/error/populationRehabilitation")
+ public R downloadErrorRehabilitationPopulation(@RequestParam(value = "key") String key) {
+ List<ComMngPopulationRehabilitationMistakeExcelVO> list = new ArrayList<>();
+ Boolean isExits = stringRedisTemplate.hasKey(key);
+ ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
+ if(isExits){
+ String json = valueOperations.get(key);
+ list= JSONArray.parseArray(json,ComMngPopulationRehabilitationMistakeExcelVO.class);
+ }
+// List<ComMngPopulationMistakeExcelVO> list = JSON.parseArray(mistakes,ComMngPopulationMistakeExcelVO.class);
+ //生成动态模板excel通过ftp工具上传到主节点，然后返回模板下载地址
+ String ftpUrl = "/mnt/data/web/excel/";
+ String nowDate = DateUtils.getCurrentDateString();
+ String name = "刑释人员错误数据" + nowDate +".xlsx";
+ try {
+ SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
+ sftp.login();
+ boolean existDir = sftp.isExistDir(ftpUrl + name);
+ if (!existDir) {
+ String property = System.getProperty("user.dir");
+ String fileName = property + File.separator + name;
+ // 这里 需要指定写用哪个class去写
+ ExcelWriter excelWriter = null;
+ InputStream inputStream = null;
+ try {
+ excelWriter = EasyExcel.write(fileName, ComMngPopulationRehabilitationMistakeExcelVO.class).registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()).registerWriteHandler(new CustomSheetWriteHandler()).build();
+ WriteSheet writeSheet = EasyExcel.writerSheet("刑释人员错误数据").build();
+ excelWriter.write(list, writeSheet);
+ excelWriter.finish();
+ File file = new File(fileName);
+ inputStream = new FileInputStream(file);
+ sftp.uploadMore(ftpUrl, name, inputStream);
+ sftp.logout();
+ inputStream.close();
+ String absolutePath = file.getAbsolutePath();
+ boolean delete = file.delete();
+ log.info("删除excel【{}】结果【{}】", absolutePath, delete);
+ } finally {
+ // 千万别忘记finish 会帮忙关闭流
+ if (inputStream != null) {
+ inputStream.close();
+ }
+ if (excelWriter != null) {
+ excelWriter.finish();
+ }
+ }
+ }
+ return R.ok(excelUrl + name);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("文件传输失败【{}】", e.getMessage());
+ return R.fail();
+ }
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index 9eef09f..52e1c71 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -382,6 +382,32 @@
}
/**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("population/importRehabilitation")
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId);
+ }
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importKey")
+ public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+ return comMngPopulationService.listSaveKeyPopulation(list, communityId);
+ }
+
+ /**
* 确认导入实有人口（有则更新，无则新建）
*
* @param list 用户信息
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
index ecf66ca..4c7d089 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -116,6 +116,24 @@
*/
R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId);
+ /**
+ * 批量导入刑释人员
+ *
+ * @param list 刑释人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId);
+
+ /**
+ * 批量导入重点上访人员
+ *
+ * @param list 重点上访人员数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId);
+
/**
* 确认导入实有人口（有则更新，无则新建）
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
index cd20120..3b29d58 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java
@@ -535,7 +535,8 @@
public R timedTaskActivityNotice(){
//查询所有即将开始的活动
List<ComActActivityDO> actActivityList = comActActivityDAO.selectList(new QueryWrapper<ComActActivityDO>().lambda()
- .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1)));
+ .le(ComActActivityDO::getBeginAt, DateUtils.addDays(new Date(),1))
+ .ge(ComActActivityDO::getBeginAt,new Date()));
if(!actActivityList.isEmpty()){
WxXCXTempSend util = new WxXCXTempSend();
try {
@@ -553,7 +554,7 @@
WxUtil.sendSubscribeHDJJKS(openid,accessToken,actActivity.getActivityName()
, com.panzhihua.common.utlis.DateUtils.format(actActivity.getBeginAt()
,com.panzhihua.common.utlis.DateUtils.ymdhms_format),actActivity.getActivityAddr()
- ,actSignList.size()+"");
+ ,actSignList.size()+"人");
}
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index fc7ddf8..2ecd3e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -463,13 +463,23 @@
//审核通过判断随手拍是否有活动并计算用户收益
comActUserWalletService.examineAddMoney(easyPhotoDO.getActivityType(),easyPhotoDO.getId(),easyPhotoDO.getSponsorId(),grantRewardDTO.getAmount());
+ String activityType = "";
+ if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.yz)){
+ activityType = "优质";
+ }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.jl)){
+ activityType = "精良";
+ }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.pt)){
+ activityType = "普通";
+ }else if(easyPhotoDO.getActivityType().equals(ComActEasyPhotoDO.activityType.yb)){
+ activityType = "一般";
+ }
//发放奖励以后给用户推送消息
Map<String,String> map = comActActSignDAO.getUserOpenId(easyPhotoDO.getSponsorId());
if(map != null){
String openid = map.get("openid");
WxXCXTempSend util = new WxXCXTempSend();
try {
- WxUtil.sendSubscribeJLDZ(openid,util.getAppAccessToken(),easyPhotoDO.getDetail(),grantRewardDTO.getAmount(),"发放随手拍奖励");
+ WxUtil.sendSubscribeJLDZ(openid,util.getAppAccessToken(),"随手拍有奖活动",grantRewardDTO.getAmount(),activityType);
}catch (Exception e){
log.error("消息推送失败，失败原因：" + e.getMessage());
}
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 c5154f7..9a065ae 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
@@ -1,17 +1,14 @@
package com.panzhihua.service_community.service.impl;
import cn.hutool.core.util.IdcardUtil;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
-import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
@@ -21,12 +18,10 @@
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
-import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
@@ -38,7 +33,6 @@
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationVillageVO;
-import com.panzhihua.common.model.vos.grid.admin.ComMngSubordinateVO;
import com.panzhihua.common.model.vos.grid.admin.excel.ComMngPopulationExportExcelVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
@@ -319,6 +313,10 @@
iPage.getRecords().forEach(populDO -> {
if (StringUtils.isNotEmpty(populDO.getBirthday())) {
populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
+ populDO.setRelationName(PopulRelationEnum.getCnDescByName(populDO.getRelation()));
+ populDO.setCultureLevelName(PopulCultureLevelEnum.getCnDescByName(populDO.getCultureLevel()));
+ populDO.setPoliticalOutlookName(PopulPoliticalOutlookEnum.getCnDescByName(populDO.getPoliticalOutlook()));
+ populDO.setMarriageName(PopulMarriageEnum.getCnDescByName(populDO.getMarriage()));
}
});
}
@@ -969,6 +967,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId) {
//需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
@@ -1171,6 +1170,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId) {
//需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
@@ -1372,6 +1372,412 @@
return R.ok(mistakes);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId) {
+ //需要新增的房屋集合
+ List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
+ //需要新增的人口集合
+ List<ComMngPopulationDO> saveList = new ArrayList<>();
+ //需要修改的人口集合
+ List<ComMngPopulationDO> updateList = new ArrayList<>();
+ //需要新增的人口与房屋关系集合
+ List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+
+ log.info("开始处理导入数据");
+ List<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = new ArrayList<>();
+ try {
+ //查询社区信息
+ log.info("开始查询社区信息数据");
+ ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
+ if(populationActVO == null){
+ log.error("未查询到社区信息");
+ return R.fail("未查询到社区信息");
+ }
+ log.info("开始查询社区信息数据完成");
+
+ //查询当前社区标签列表
+ List<String> labelList = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+
+ StringBuilder areaPath = new StringBuilder();
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
+ //处理实有人口信息
+ Integer nub = 1;
+
+ //查询所有人口数据放入HashMap中
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ HashMap<String,Object> populationMap = new HashMap<>();
+ populationList.forEach(population -> {
+ String key = population.getCardNo();
+ populationMap.put(key,population);
+ });
+ //查询所有房屋信息放入到HashMap中
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ HashMap<String,Object> houseMap = new HashMap<>();
+ houseLists.forEach(house -> {
+ String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
+ houseMap.put(key,house);
+ });
+
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ 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);
+ HashMap<String,Object> houseUserMap = new HashMap<>();
+ houseUserLists.forEach(houseUser -> {
+ String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
+ houseUserMap.put(key,houseUser);
+ });
+
+
+ for (ComMngPopulationRehabilitationExcelVO vo : list) {
+ if (vo.getDoorNo().contains("号")) {
+ vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ }
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
+ log.info("开始查询小区街路巷是否存在");
+ //查询小区街路巷是否存在
+ ComMngVillageDO comMngVillageDO = null;
+ String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
+ if(!isOnly(villageKey,villageMap)){
+ comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
+ }else{
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setRehabilitationMistake(mistake, vo);
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistakes.add(mistake);
+ log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ continue;
+ }
+ StringBuilder address = new StringBuilder();
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
+ .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
+
+ vo.setAddress(address.toString());
+ log.info("开始查询小区街路巷是否存在完成");
+
+ log.info("开始查询房屋是否存在");
+ //先判断房屋是否存在
+ ComMngPopulationHouseDO populationHouseDO = null;
+ String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
+ if(isOnly(houseKey,houseMap)){
+ if(!houseList.isEmpty()){
+ for (ComMngPopulationHouseDO house:houseList) {
+ if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
+ && house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
+ && house.getHouseNo().equals(vo.getHouseNo())){
+ populationHouseDO = house;
+ break;
+ }
+ }
+ }
+ if(populationHouseDO == null){
+ //房屋信息不存在建立房屋信息
+ populationHouseDO = saveRehabilitationPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ }else{
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ }
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("开始查询房屋是否存在完成");
+
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
+ //空户处理完房屋信息，直接返回
+ continue;
+ }
+ String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ //判断实有人口是否已存在
+ log.info("开始查询实有人口是否已存在");
+ ComMngPopulationDO populationDO = null;
+ String populationKey = vo.getCardNo();
+ if(!isOnly(populationKey,populationMap)){
+ //存在实有人口信息，则更新
+ populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
+ ComMngPopulationDO updatePopulationDO = updateRehabilitationPopulationDO(vo,populationDO,labelList);
+ updateList.add(updatePopulationDO);
+ }else{
+ //不存在实有人口,则新增
+ populationDO = saveRehabilitationPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ saveList.add(populationDO);
+ }
+ log.info("开始查询实有人口是否已存在完成");
+
+ log.info("开始查询实有人口房屋居住信息");
+ //处理实有人口房屋居住信息
+ if (populationDO != null) {
+ ComMngPopulationHouseUserDO populationHouseUserDO = null;
+ String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
+ if(isOnly(houseUserKey,houseUserMap)){
+ populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
+ populationHouseUserDO.setHouseId(populationHouseDO.getId());
+ populationHouseUserDO.setPopulId(populationDO.getId());
+// populationHouseUserDO.setRelation(vo.getRelation());
+ populationHouseUserDO.setRelationId(vo.getIsRent());
+// populationHouseUserDO.setResidence(vo.getResidence());
+ houseUserList.add(populationHouseUserDO);
+ }
+ }
+ log.info("开始查询实有人口房屋居住信息完成");
+ }
+ }catch (Exception e){
+ log.info("出现错误，错误原因：" + e.getMessage());
+ }
+ log.info("处理完成导入数据");
+
+ log.info("开始执行数据库导入");
+ if(!houseList.isEmpty()){
+ log.info("执行数据库导入房屋");
+ comMngPopulationHouseDAO.insertAll(houseList);
+ log.info("执行数据库导入房屋完成");
+ }
+ if(!saveList.isEmpty()){
+ log.info("执行数据库导入人口");
+ this.baseMapper.insertAll(saveList);
+ log.info("执行数据库导入人口完成");
+ }
+ if(!updateList.isEmpty()){
+ log.info("执行数据库更新人口");
+ this.baseMapper.updateAll(updateList);
+// this.updateBatchById(updateList);
+ log.info("执行数据库更新人口完成");
+ }
+ if(!houseUserList.isEmpty()){
+ log.info("执行数据库导入人口房屋关系");
+ comMngPopulationHouseUserService.saveBatch(houseUserList);
+ log.info("执行数据库导入人口房屋关系完成");
+ }
+ log.info("执行数据库导入完成");
+
+ if (!mistakes.isEmpty()) {
+ log.info("返回错误数据");
+ return R.fail(mistakes);
+ }
+ return R.ok(mistakes);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId) {
+ //需要新增的房屋集合
+ List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
+ //需要新增的人口集合
+ List<ComMngPopulationDO> saveList = new ArrayList<>();
+ //需要修改的人口集合
+ List<ComMngPopulationDO> updateList = new ArrayList<>();
+ //需要新增的人口与房屋关系集合
+ List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+
+ log.info("开始处理导入数据");
+ List<ComMngPopulationKeyMistakeExcelVO> mistakes = new ArrayList<>();
+ try {
+ //查询社区信息
+ log.info("开始查询社区信息数据");
+ ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
+ if(populationActVO == null){
+ log.error("未查询到社区信息");
+ return R.fail("未查询到社区信息");
+ }
+ log.info("开始查询社区信息数据完成");
+
+ //查询当前社区标签列表
+ List<String> labelList = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+
+ StringBuilder areaPath = new StringBuilder();
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName()).append(">").append(populationActVO.getDistrictName()).append(">");
+ //处理实有人口信息
+ Integer nub = 1;
+
+ //查询所有人口数据放入HashMap中
+ List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
+ HashMap<String,Object> populationMap = new HashMap<>();
+ populationList.forEach(population -> {
+ String key = population.getCardNo();
+ populationMap.put(key,population);
+ });
+ //查询所有房屋信息放入到HashMap中
+ List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
+ HashMap<String,Object> houseMap = new HashMap<>();
+ houseLists.forEach(house -> {
+ String key = house.getCommunityId() + house.getVillageId() + house.getFloor() + house.getUnitNo() + house.getHouseNo();
+ houseMap.put(key,house);
+ });
+
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(null);
+ 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);
+ HashMap<String,Object> houseUserMap = new HashMap<>();
+ houseUserLists.forEach(houseUser -> {
+ String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
+ houseUserMap.put(key,houseUser);
+ });
+
+
+ for (ComMngPopulationKeyExcelVO vo : list) {
+ if (vo.getDoorNo().contains("号")) {
+ vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ }
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
+ log.info("开始查询小区街路巷是否存在");
+ //查询小区街路巷是否存在
+ ComMngVillageDO comMngVillageDO = null;
+ String villageKey = communityId + vo.getRoad() + vo.getDoorNo();
+ if(!isOnly(villageKey,villageMap)){
+ comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
+ }else{
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setKeyMistake(mistake, vo);
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistakes.add(mistake);
+ log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ continue;
+ }
+ StringBuilder address = new StringBuilder();
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName())
+ .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
+ .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
+
+ vo.setAddress(address.toString());
+ log.info("开始查询小区街路巷是否存在完成");
+
+ log.info("开始查询房屋是否存在");
+ //先判断房屋是否存在
+ ComMngPopulationHouseDO populationHouseDO = null;
+ String houseKey = communityId + comMngVillageDO.getVillageId() + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
+ if(isOnly(houseKey,houseMap)){
+ if(!houseList.isEmpty()){
+ for (ComMngPopulationHouseDO house:houseList) {
+ if(house.getVillageId().equals(comMngVillageDO.getVillageId()) && house.getCommunityId().equals(communityId)
+ && house.getFloor().equals(vo.getFloor()) && house.getUnitNo().equals(vo.getUnitNo())
+ && house.getHouseNo().equals(vo.getHouseNo())){
+ populationHouseDO = house;
+ break;
+ }
+ }
+ }
+ if(populationHouseDO == null){
+ //房屋信息不存在建立房屋信息
+ populationHouseDO = saveKeyPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ houseList.add(populationHouseDO);
+ }
+ }else{
+ populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
+ }
+ vo.setHouseId(populationHouseDO.getId());
+ log.info("开始查询房屋是否存在完成");
+
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
+ //空户处理完房屋信息，直接返回
+ continue;
+ }
+ String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ //判断实有人口是否已存在
+ log.info("开始查询实有人口是否已存在");
+ ComMngPopulationDO populationDO = null;
+ String populationKey = vo.getCardNo();
+ if(!isOnly(populationKey,populationMap)){
+ //存在实有人口信息，则更新
+ populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
+ ComMngPopulationDO updatePopulationDO = updateKeyPopulationDO(vo,populationDO,labelList);
+ updateList.add(updatePopulationDO);
+ }else{
+ //不存在实有人口,则新增
+ populationDO = saveKeyPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ saveList.add(populationDO);
+ }
+ log.info("开始查询实有人口是否已存在完成");
+
+ log.info("开始查询实有人口房屋居住信息");
+ //处理实有人口房屋居住信息
+ if (populationDO != null) {
+ ComMngPopulationHouseUserDO populationHouseUserDO = null;
+ String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
+ if(isOnly(houseUserKey,houseUserMap)){
+ populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
+ populationHouseUserDO.setHouseId(populationHouseDO.getId());
+ populationHouseUserDO.setPopulId(populationDO.getId());
+// populationHouseUserDO.setRelation(vo.getRelation());
+ populationHouseUserDO.setRelationId(vo.getIsRent());
+// populationHouseUserDO.setResidence(vo.getResidence());
+ houseUserList.add(populationHouseUserDO);
+ }
+ }
+ log.info("开始查询实有人口房屋居住信息完成");
+ }
+ }catch (Exception e){
+ log.info("出现错误，错误原因：" + e.getMessage());
+ }
+ log.info("处理完成导入数据");
+
+ log.info("开始执行数据库导入");
+ if(!houseList.isEmpty()){
+ log.info("执行数据库导入房屋");
+ comMngPopulationHouseDAO.insertAll(houseList);
+ log.info("执行数据库导入房屋完成");
+ }
+ if(!saveList.isEmpty()){
+ log.info("执行数据库导入人口");
+ this.baseMapper.insertAll(saveList);
+ log.info("执行数据库导入人口完成");
+ }
+ if(!updateList.isEmpty()){
+ log.info("执行数据库更新人口");
+ this.baseMapper.updateAll(updateList);
+// this.updateBatchById(updateList);
+ log.info("执行数据库更新人口完成");
+ }
+ if(!houseUserList.isEmpty()){
+ log.info("执行数据库导入人口房屋关系");
+ comMngPopulationHouseUserService.saveBatch(houseUserList);
+ log.info("执行数据库导入人口房屋关系完成");
+ }
+ log.info("执行数据库导入完成");
+
+ if (!mistakes.isEmpty()) {
+ log.info("返回错误数据");
+ return R.fail(mistakes);
+ }
+ return R.ok(mistakes);
+ }
+
private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
BeanUtils.copyProperties(vo, populationDO);
@@ -1458,6 +1864,48 @@
}
private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ BeanUtils.copyProperties(vo, populationDO);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCardNo(cardNoAES);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ BeanUtils.copyProperties(vo, populationDO);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ String cardNoAES = populationDO.getCardNo();
+ try {
+ cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ }catch (Exception e){
+ log.error("身份证加密失败");
+ }
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCardNo(cardNoAES);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
BeanUtils.copyProperties(vo, populationDO);
List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
//如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
@@ -1615,6 +2063,70 @@
}
private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ ComMngPopulationDO populationDO = new ComMngPopulationDO();
+ BeanUtils.copyProperties(vo, populationDO);
+ populationDO.setId(Snowflake.getId());
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDO.setCardNoStr(vo.getCardNo());
+ populationDO.setUpdateAt(new Date());
+ //新增的时候默认绑定房屋id
+// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
+// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
+// populationDO.setHouseId(vo.getHouseId());
+// }else{
+// populationDO.setHouseId(null);
+// }
+
+// this.baseMapper.insert(populationDO);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ ComMngPopulationDO populationDO = new ComMngPopulationDO();
+ BeanUtils.copyProperties(vo, populationDO);
+ populationDO.setId(Snowflake.getId());
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!labelList.contains(s))
+ iterator.remove();
+ }
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDO.setCardNoStr(vo.getCardNo());
+ populationDO.setUpdateAt(new Date());
+ //新增的时候默认绑定房屋id
+// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
+// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
+// populationDO.setHouseId(vo.getHouseId());
+// }else{
+// populationDO.setHouseId(null);
+// }
+
+// this.baseMapper.insert(populationDO);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
populationDO.setId(Snowflake.getId());
@@ -1811,6 +2323,88 @@
}
private ComMngPopulationHouseDO saveCultPopulationHouse(ComMngPopulationCultExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
+ //查询该房屋未建立，执行建立房屋信息
+ ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
+ populationHouseDO.setId(Snowflake.getId());
+ populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
+ populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
+ populationHouseDO.setAlley(vo.getRoad());
+ populationHouseDO.setHouseNum(vo.getDoorNo());
+ populationHouseDO.setStatus(vo.getIsRent());
+ populationHouseDO.setCommunityId(communityId);
+ populationHouseDO.setFloor(vo.getFloor());
+ populationHouseDO.setUnitNo(vo.getUnitNo());
+ populationHouseDO.setHouseNo(vo.getHouseNo());
+ populationHouseDO.setCode(vo.getHouseNo());
+ populationHouseDO.setAddress(vo.getAddress());
+ populationHouseDO.setUpdateAt(new Date());
+// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ StringBuilder housePath = new StringBuilder();
+ housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ populationHouseDO.setPath(areaPath.toString() + housePath.toString());
+// try {
+// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+// } catch (Exception e) {
+// }
+
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
+ populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
+ }
+ if (vo.getHouseStatus() != null) {
+ populationHouseDO.setStatus(vo.getHouseStatus());
+ }
+ if (vo.getHousePurpose() != null) {
+ populationHouseDO.setPurpose(vo.getHousePurpose());
+ }
+ if (vo.getControlStatus() != null) {
+ populationHouseDO.setControlStatus(vo.getControlStatus());
+ }
+// comMngPopulationHouseDAO.insert(populationHouseDO);
+ return populationHouseDO;
+ }
+
+ private ComMngPopulationHouseDO saveRehabilitationPopulationHouse(ComMngPopulationRehabilitationExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
+ //查询该房屋未建立，执行建立房屋信息
+ ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
+ populationHouseDO.setId(Snowflake.getId());
+ populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
+ populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
+ populationHouseDO.setAlley(vo.getRoad());
+ populationHouseDO.setHouseNum(vo.getDoorNo());
+ populationHouseDO.setStatus(vo.getIsRent());
+ populationHouseDO.setCommunityId(communityId);
+ populationHouseDO.setFloor(vo.getFloor());
+ populationHouseDO.setUnitNo(vo.getUnitNo());
+ populationHouseDO.setHouseNo(vo.getHouseNo());
+ populationHouseDO.setCode(vo.getHouseNo());
+ populationHouseDO.setAddress(vo.getAddress());
+ populationHouseDO.setUpdateAt(new Date());
+// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ StringBuilder housePath = new StringBuilder();
+ housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ populationHouseDO.setPath(areaPath.toString() + housePath.toString());
+// try {
+// populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+// } catch (Exception e) {
+// }
+
+ if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
+ populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
+ }
+ if (vo.getHouseStatus() != null) {
+ populationHouseDO.setStatus(vo.getHouseStatus());
+ }
+ if (vo.getHousePurpose() != null) {
+ populationHouseDO.setPurpose(vo.getHousePurpose());
+ }
+ if (vo.getControlStatus() != null) {
+ populationHouseDO.setControlStatus(vo.getControlStatus());
+ }
+// comMngPopulationHouseDAO.insert(populationHouseDO);
+ return populationHouseDO;
+ }
+
+ private ComMngPopulationHouseDO saveKeyPopulationHouse(ComMngPopulationKeyExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
//查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
@@ -3222,6 +3816,7 @@
private void setMajorMistake(ComMngPopulationMajorMistakeExcelVO mvo, ComMngPopulationMajorExcelVO vo){
// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+ mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
@@ -3249,6 +3844,38 @@
// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
+ private void setRehabilitationMistake(ComMngPopulationRehabilitationMistakeExcelVO mvo, ComMngPopulationRehabilitationExcelVO vo){
+// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+ mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
+ mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
+ mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
+// mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
+ mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+ mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
+// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ }
+
+ private void setKeyMistake(ComMngPopulationKeyMistakeExcelVO mvo, ComMngPopulationKeyExcelVO vo){
+// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
+ mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
+ mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
+// mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+// mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
+ mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+// mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
+// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ }
+
/**
* 判重方法
* @param key 主键
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 18f592d..ee08b9f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -674,7 +674,7 @@
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = util.getAppAccessToken();
//用户实名认证推送消息
- WxUtil.sendSubscribeRZSH(user.getOpenid(),accessToken,"用户实名认证", com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(),"审核通过");
+ WxUtil.sendSubscribeRZSH(user.getOpenid(),accessToken,"实名认证", com.panzhihua.common.utlis.DateUtils.getCurrentDateStr(),"认证成功");
}catch (Exception e){
log.error("推送用户订阅消息失败，失败原因：" + e.getMessage());
}
--
Gitblit v1.7.1