From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 4381 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 2,726 insertions(+), 1,655 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 60f59a4..501e34b 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,6 +1,19 @@
package com.panzhihua.service_community.service.impl;
-import cn.hutool.core.util.IdcardUtil;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -38,7 +51,6 @@
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
import com.panzhihua.common.model.vos.user.*;
-import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
@@ -46,19 +58,9 @@
import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
+import cn.hutool.core.util.IdcardUtil;
+import lombok.extern.slf4j.Slf4j;
/**
* 实有人口Service实现类
@@ -80,6 +82,10 @@
private ComMngCarDAO comMngCarDAO;
@Resource
private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
+ @Resource
+ private ComMngPopulationCommunityTagsDAO comMngPopulationCommunityTagsDAO;
+ @Resource
+ private ComMngPopulationCommunityTagsService comMngPopulationCommunityTagsService;
@Resource
private ComMngPopulationDAO comMngPopulationDAO;
@Resource
@@ -115,18 +121,18 @@
@Value("${domain.aesKey:}")
private String aesKey;
-
-
/**
* 新增实有人口
*
- * @param comMngPopulationVO 新增信息
+ * @param comMngPopulationVO
+ * 新增信息
* @return 新增结果
*/
@Override
public R addPopulation(ComMngPopulationVO comMngPopulationVO) {
ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
- Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo()));
+ Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda()
+ .eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo()));
if (integer > 0) {
return R.fail("实有人口已经存在");
}
@@ -139,11 +145,11 @@
return R.ok(nub);
}
-
/**
* 编辑实有人口
*
- * @param comMngPopulationVO 编辑内容
+ * @param comMngPopulationVO
+ * 编辑内容
* @return 编辑结果
*/
@Override
@@ -164,7 +170,8 @@
/**
* 查询实有人口
*
- * @param comMngPopulationVO 查询条件
+ * @param comMngPopulationVO
+ * 查询条件
* @return 实有人口集合
*/
@Override
@@ -176,7 +183,8 @@
/**
* 实有人口详情
*
- * @param populationId 实有人口id
+ * @param populationId
+ * 实有人口id
* @return 实有人口详情
*/
@Override
@@ -185,50 +193,63 @@
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
return R.fail("用户信息不存在");
}
-// if(StringUtils.isNotEmpty(comMngPopulationDO.getBirthday())){//计算年龄
-// comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
-// }
+ // if(StringUtils.isNotEmpty(comMngPopulationDO.getBirthday())){//计算年龄
+ // comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
+ // }
ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
- //查询户主关系信息
-// List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
-// if (!comMngFamilyInfoVOS.isEmpty()) {
-// comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
-// }
- //查询户主关系信息
+ // 查询户主关系信息
+ // List<ComHouseMemberVo> comMngFamilyInfoVOS =
+ // populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
+ // if (!comMngFamilyInfoVOS.isEmpty()) {
+ // comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ // }
+ // 查询户主关系信息
List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByPopuId(comMngPopulationDO.getId());
if (!comMngFamilyInfoVOS.isEmpty()) {
- for (ComHouseMemberVo comHouseMemberVo : comMngFamilyInfoVOS){
+ for (ComHouseMemberVo comHouseMemberVo : comMngFamilyInfoVOS) {
comHouseMemberVo.setAge(AgeUtils.getAgeFromBirthTimes(comHouseMemberVo.getBirthDay()));
}
comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
- //设置户主关系
- List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS = comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
+ // 设置户主关系
+ List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS =
+ comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
+ .eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
if (!comMngPopulationHouseUserDOS.isEmpty()) {
- comMngPopulationVO.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
+ comMngPopulationVO
+ .setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
}
- //设置年龄
+ // 设置年龄
if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
}
+ // 设置特殊群体标签
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ comMngPopulationCommunityTagsDAO.selectOne(new QueryWrapper<ComMngPopulationCommunityTagsDO>().lambda()
+ .eq(ComMngPopulationCommunityTagsDO::getPopulationId, populationId));
+ if (null != comMngPopulationCommunityTagsDO) {
+ comMngPopulationVO.setLabel(comMngPopulationCommunityTagsDO.getLabel());
+ }
- //查询当前用户电子档信息
+ // 查询当前用户电子档信息
if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
- UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
+ UserElectronicFileVO electronicFileVO =
+ populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
if (electronicFileVO != null) {
comMngPopulationVO.setUserElectronicFileVO(electronicFileVO);
- //查询家庭成员信息
- List<ComMngFamilyInfoVO> familyInfoVOList = populationDAO.listFamilyByUserId(electronicFileVO.getUserId());
+ // 查询家庭成员信息
+ List<ComMngFamilyInfoVO> familyInfoVOList =
+ populationDAO.listFamilyByUserId(electronicFileVO.getUserId());
if (!familyInfoVOList.isEmpty()) {
comMngPopulationVO.setFamilyInfoVOList(familyInfoVOList);
}
}
}
- //查询当前用户房屋信息
+ // 查询当前用户房屋信息
List<ComMngHouseVo> houseList = comMngPopulationHouseDAO.getPopulHouseListByPopulId(populationId);
if (!houseList.isEmpty()) {
houseList.forEach(house -> {
@@ -237,16 +258,16 @@
comMngPopulationVO.setHouseList(houseList);
}
- //查询当前实有人口车辆信息
+ // 查询当前实有人口车辆信息
List<ComMngPopulationCarVO> carList = comMngCarDAO.getPopulationCarListByIdCard(comMngPopulationDO.getCardNo());
if (!carList.isEmpty()) {
comMngPopulationVO.setCarList(carList);
}
- //吸毒信息
+ // 吸毒信息
List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
- List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(new QueryWrapper<ComDrugPopulationDO>().
- lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
+ List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(
+ new QueryWrapper<ComDrugPopulationDO>().lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
if (!comDrugPopulationDOs.isEmpty()) {
comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
@@ -256,10 +277,11 @@
});
}
- //社区矫正信息
+ // 社区矫正信息
List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
- List<ComCorrectPopulationDO> comCorrectPopulationDOS = comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().
- lambda().eq(ComCorrectPopulationDO::getPopulationId, populationId));
+ List<ComCorrectPopulationDO> comCorrectPopulationDOS =
+ comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().lambda()
+ .eq(ComCorrectPopulationDO::getPopulationId, populationId));
if (!comCorrectPopulationDOS.isEmpty()) {
comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
@@ -269,10 +291,10 @@
});
}
- //精神障碍信息
+ // 精神障碍信息
List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
- List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(new QueryWrapper<ComMajorPopulationDO>().
- lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
+ List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(
+ new QueryWrapper<ComMajorPopulationDO>().lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
if (!comMajorPopulationDOs.isEmpty()) {
comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
@@ -282,10 +304,10 @@
});
}
- //邪教信息
+ // 邪教信息
List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
- List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(new QueryWrapper<ComCultPopulationDO>().
- lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
+ List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(
+ new QueryWrapper<ComCultPopulationDO>().lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
if (!comCultPopulationDOS.isEmpty()) {
comCultPopulationDOS.forEach(comCultPopulationDO -> {
ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
@@ -295,10 +317,11 @@
});
}
- //刑释信息
+ // 刑释信息
List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
- List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS = comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().
- lambda().eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
+ List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS =
+ comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
+ .eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
if (!comRehabilitationPopulationDOS.isEmpty()) {
comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
@@ -308,10 +331,10 @@
});
}
- //上访信息
+ // 上访信息
List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
- List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(new QueryWrapper<ComKeyPopulationDO>().
- lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
+ List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(
+ new QueryWrapper<ComKeyPopulationDO>().lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
if (!comKeyPopulationDOS.isEmpty()) {
comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
@@ -321,10 +344,11 @@
});
}
- //退役军人信息
+ // 退役军人信息
List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
- List<ComVeteransPopulationDO> comVeteransPopulationDOS = comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().
- lambda().eq(ComVeteransPopulationDO::getPopulationId, populationId));
+ List<ComVeteransPopulationDO> comVeteransPopulationDOS =
+ comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().lambda()
+ .eq(ComVeteransPopulationDO::getPopulationId, populationId));
if (!comVeteransPopulationDOS.isEmpty()) {
comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
@@ -334,10 +358,11 @@
});
}
- //残疾人信息
+ // 残疾人信息
List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
- List<ComDisabilityPopulationDO> comDisabilityPopulationDOS = comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().
- lambda().eq(ComDisabilityPopulationDO::getPopulationId, populationId));
+ List<ComDisabilityPopulationDO> comDisabilityPopulationDOS =
+ comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
+ .eq(ComDisabilityPopulationDO::getPopulationId, populationId));
if (!comDisabilityPopulationDOS.isEmpty()) {
comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
@@ -347,10 +372,11 @@
});
}
- //低保户信息
+ // 低保户信息
List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
- List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS = comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().
- lambda().eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
+ List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS =
+ comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
+ .eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
if (!comLowSecurityPopulationDOS.isEmpty()) {
comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
@@ -365,7 +391,8 @@
/**
* 分页查询社区
*
- * @param comMngPopulationVO 查询参数
+ * @param comMngPopulationVO
+ * 查询参数
* @return 分页集合
*/
@Override
@@ -418,27 +445,32 @@
}
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
- String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
+ String ageStartTime = DateUtils.getDateFormatString(
+ DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageStartTime)) {
comMngPopulationVO.setAgeStartTime(ageStartTime);
}
}
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())) {
- String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
+ String ageEndTime = DateUtils.getDateFormatString(
+ DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageEndTime)) {
comMngPopulationVO.setAgeEndTime(ageEndTime);
}
}
- if (comMngPopulationVO.getAgeStartTime() !=null && !"".equals(comMngPopulationVO.getAgeStartTime()) && comMngPopulationVO.getAgeEndTime() !=null && !"".equals(comMngPopulationVO.getAgeEndTime())){
+ if (comMngPopulationVO.getAgeStartTime() != null && !"".equals(comMngPopulationVO.getAgeStartTime())
+ && comMngPopulationVO.getAgeEndTime() != null && !"".equals(comMngPopulationVO.getAgeEndTime())) {
if (comMngPopulationVO.getAgeStartTime().equals(comMngPopulationVO.getAgeEndTime())) {
- Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ Date endAge =
+ DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageStartTime)) {
comMngPopulationVO.setAgeStartTimeEnd(ageStartTime);
}
} else {
- Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ Date endAge =
+ DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageStartTime)) {
comMngPopulationVO.setAgeEndTimeEnd(ageStartTime);
@@ -452,7 +484,8 @@
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.setPoliticalOutlookName(
+ PopulPoliticalOutlookEnum.getCnDescByName(populDO.getPoliticalOutlook()));
populDO.setMarriageName(PopulMarriageEnum.getCnDescByName(populDO.getMarriage()));
}
});
@@ -463,7 +496,8 @@
/**
* 删除实有人口
*
- * @param populationId 实有人口id
+ * @param populationId
+ * 实有人口id
* @return 删除结果
*/
@Override
@@ -482,7 +516,8 @@
*/
@Override
public R listPopulationAll() {
- List<ComMngPopulationDO> populationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt));
+ List<ComMngPopulationDO> populationDOS = populationDAO
+ .selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt));
List<ComMngPopulationVO> populationVOS = new ArrayList<>();
if (!ObjectUtils.isEmpty(populationDOS)) {
populationDOS.forEach(comActDO -> {
@@ -496,107 +531,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId){
- //需要新增的房屋集合
+ public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
- ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ ComPopulationActVO populationActVO = comActDAO.getPopulationActById(31L);
+ if (populationActVO == null) {
log.error("未查询到社区信息");
return R.fail("未查询到社区信息");
}
- log.info("开始查询社区信息数据完成");
+ log.info("查询社区信息数据完成");
- //查询当前社区标签列表
+ // 查询当前社区标签列表
List<String> labelList = new ArrayList<>();
- List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
+ .selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", 31));
if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
- labelList = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationServeExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ String villageKey = 31 + vo.getRoad() + vo.getDoorNo();
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -607,67 +658,64 @@
address.append(vo.getHouseNo()).append("号");
}
vo.setAddress(address.toString());
- log.info("开始查询小区街路巷是否存在完成");
+ 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())){
+ 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 = savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO =
+ savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } else {
populationHouseDO = (ComMngPopulationHouseDO)houseMap.get(houseKey);
}
vo.setHouseId(populationHouseDO.getId());
- log.info("开始查询房屋是否存在完成");
+ 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO = updatePopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
-
- ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
- setMistake(mistake, vo);
- mistake.setMistake("该实有人口已存在，执行更新，社区id：："+ populationDO.getActId());
- mistakes.add(mistake);
- }else{
- //不存在实有人口,则新增
- populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = savePopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
- log.info("开始查询实有人口是否已存在完成");
+ log.info("查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
@@ -678,34 +726,93 @@
houseUserList.add(populationHouseUserDO);
}
}
- log.info("开始查询实有人口房屋居住信息完成");
+ log.info("查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
- log.info("执行数据库导入房屋完成");
+ log.info("数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
- log.info("执行数据库导入人口完成");
+ log.info("数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
- log.info("执行数据库更新人口完成");
+ // this.updateBatchById(updateList);
+ log.info("数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
- log.info("执行数据库导入人口房屋关系完成");
+ log.info("数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -718,107 +825,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationDrugMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationDrugExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setDrugMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -832,96 +955,159 @@
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())){
+ 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 = saveDrugPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveDrugPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateDrugPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateDrugPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveDrugPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveDrugPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setDrugMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -934,107 +1120,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationCorrectMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationCorrectExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setCorrectMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -1048,96 +1250,159 @@
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())){
+ 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 = saveCorrectPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveCorrectPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateCorrectPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateCorrectPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveCorrectPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveCorrectPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setCorrectMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1150,107 +1415,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationMajorMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationMajorExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setMajorMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -1264,96 +1545,159 @@
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())){
+ 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 = saveMajorPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveMajorPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateMajorPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateMajorPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveMajorPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setMajorMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1366,107 +1710,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationCultMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationCultExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setCultMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -1480,96 +1840,159 @@
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())){
+ 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 = saveCultPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveCultPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateCultPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateCultPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveCultPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveCultPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setCultMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1582,107 +2005,125 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId,
+ Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationRehabilitationMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationRehabilitationExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ } else {
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
setRehabilitationMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -1696,96 +2137,160 @@
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())){
+ 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());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveRehabilitationPopulationHouse(vo, comMngVillageDO, communityId,
+ areaPath, populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateRehabilitationPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateRehabilitationPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveRehabilitationPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveRehabilitationPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationRehabilitationMistakeExcelVO mistake =
+ new ComMngPopulationRehabilitationMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setRehabilitationMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -1798,107 +2303,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationKeyMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationKeyExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setKeyMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -1912,96 +2433,159 @@
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())){
+ 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());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveKeyPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateKeyPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateKeyPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveKeyPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveKeyPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setKeyMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2014,107 +2598,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationSentenceMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationSentenceExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setSentenceMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -2128,96 +2728,159 @@
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())){
+ 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 = saveSentencePopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveSentencePopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateSentencePopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateSentencePopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveSentencePopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveSentencePopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setSentenceMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2230,107 +2893,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationVeteransMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationVeteransExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setVeteransMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -2344,96 +3023,159 @@
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())){
+ 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 = saveVeteransPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveVeteransPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateVeteransPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateVeteransPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveVeteransPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveVeteransPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ }else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setVeteransMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2446,107 +3188,123 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId, Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationDisabilityMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationDisabilityExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setDisabilityMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -2560,96 +3318,159 @@
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())){
+ 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 = saveDisabilityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveDisabilityPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateDisabilityPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateDisabilityPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveDisabilityPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveDisabilityPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setDisabilityMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2662,111 +3483,128 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId) {
- //需要新增的房屋集合
+ public R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId,
+ Long userId) {
+ // 需要新增的房屋集合
List<ComMngPopulationHouseDO> houseList = new ArrayList<>();
- //需要新增的人口集合
+ // 需要新增的人口集合
List<ComMngPopulationDO> saveList = new ArrayList<>();
- //需要修改的人口集合
+ // 需要修改的人口集合
List<ComMngPopulationDO> updateList = new ArrayList<>();
- //需要新增的吸毒人员集合
+ // 需要新增的吸毒人员集合
List<ComDrugPopulationDO> saveDrugList = new ArrayList<>();
- //需要修改的吸毒人员集合
+ // 需要修改的吸毒人员集合
List<ComDrugPopulationDO> updateDrugList = new ArrayList<>();
- //需要新增的人口与房屋关系集合
+ // 需要新增的人口与房屋关系集合
List<ComMngPopulationHouseUserDO> houseUserList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> savePopulationCommunityList = new ArrayList<>();
+ // 需要新增的人口与社区关系集合
+ List<ComMngPopulationCommunityTagsDO> updatePopulationCommunityList = new ArrayList<>();
log.info("开始处理导入数据");
List<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = new ArrayList<>();
try {
- //查询社区信息
+ // 查询社区信息
log.info("开始查询社区信息数据");
ComPopulationActVO populationActVO = comActDAO.getPopulationActById(communityId);
- if(populationActVO == null){
+ 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));
+ 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());
+ 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(">");
- //处理实有人口信息
+ areaPath.append(populationActVO.getProvinceName()).append(">").append(populationActVO.getCityName())
+ .append(">").append(populationActVO.getDistrictName()).append(">");
+ // 处理实有人口信息
Integer nub = 1;
- //查询所有人口数据放入HashMap中
+ // 查询所有人口数据放入HashMap中
List<ComMngPopulationDO> populationList = this.baseMapper.selectList(null);
- HashMap<String,Object> populationMap = new HashMap<>();
+ HashMap<String, Object> populationMap = new HashMap<>();
populationList.forEach(population -> {
String key = population.getCardNo();
- populationMap.put(key,population);
+ populationMap.put(key, population);
});
- //查询所有房屋信息放入到HashMap中
+ // 查询所有房屋信息放入到HashMap中
List<ComMngPopulationHouseDO> houseLists = comMngPopulationHouseDAO.selectList(null);
- HashMap<String,Object> houseMap = new HashMap<>();
+ 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);
+ 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<>();
+ HashMap<String, Object> villageMap = new HashMap<>();
villageList.forEach(village -> {
String key = village.getCommunityId() + village.getAlley() + village.getHouseNum();
- villageMap.put(key,village);
+ villageMap.put(key, village);
});
List<ComMngPopulationHouseUserDO> houseUserLists = comMngPopulationHouseUserDAO.selectList(null);
- HashMap<String,Object> houseUserMap = new HashMap<>();
+ HashMap<String, Object> houseUserMap = new HashMap<>();
houseUserLists.forEach(houseUser -> {
String key = houseUser.getPopulId() + houseUser.getHouseId() + "";
- houseUserMap.put(key,houseUser);
+ houseUserMap.put(key, houseUser);
});
+ List<ComMngPopulationCommunityTagsDO> populationCommunityLists =
+ comMngPopulationCommunityTagsDAO.selectList(null);
+ HashMap<String, Object> populationCommunityMap = new HashMap<>();
+ populationCommunityLists.forEach(populationCommunity -> {
+ String key = populationCommunity.getPopulationId() + populationCommunity.getCommunityId() + "";
+ populationCommunityMap.put(key, populationCommunity);
+ });
for (ComMngPopulationLowSecurityExcelVO vo : list) {
if (vo.getDoorNo().contains("号")) {
- vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ vo.setDoorNo(vo.getDoorNo().replace("号", ""));
}
if (StringUtils.isNotEmpty(vo.getFloor())) {
- if(vo.getFloor().contains("栋")){
- vo.setFloor(vo.getFloor().replace("栋",""));
+ if (vo.getFloor().contains("栋")) {
+ vo.setFloor(vo.getFloor().replace("栋", ""));
}
}
if (StringUtils.isNotEmpty(vo.getUnitNo())) {
- if(vo.getUnitNo().contains("单元")){
- vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ if (vo.getUnitNo().contains("单元")) {
+ vo.setUnitNo(vo.getUnitNo().replace("单元", ""));
}
}
if (StringUtils.isNotEmpty(vo.getHouseNo())) {
- if(vo.getHouseNo().contains("号")){
- vo.setHouseNo(vo.getHouseNo().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)){
+ if (!isOnly(villageKey, villageMap)) {
comMngVillageDO = (ComMngVillageDO)villageMap.get(villageKey);
- }else{
+ } else {
ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
- BeanUtils.copyProperties(vo,mistake);
+ BeanUtils.copyProperties(vo, mistake);
setLowSecurityMistake(mistake, vo);
- mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
mistakes.add(mistake);
- log.info("未查询到街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ 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("号");
+ address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName())
+ .append(populationActVO.getDistrictName()).append(populationActVO.getStreetName())
+ .append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号");
if (StringUtils.isNotEmpty(vo.getFloor())) {
address.append(vo.getFloor()).append("栋");
}
@@ -2780,96 +3618,159 @@
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())){
+ 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 = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath, populationActVO.getName());
+ if (populationHouseDO == null) {
+ // 房屋信息不存在建立房屋信息
+ populationHouseDO = saveLowSecurityPopulationHouse(vo, comMngVillageDO, communityId, areaPath,
+ populationActVO.getName());
houseList.add(populationHouseDO);
}
- }else{
+ } 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)){
- //存在实有人口信息，则更新
+ if (!isOnly(populationKey, populationMap)) {
+ // 存在实有人口信息，则更新
populationDO = (ComMngPopulationDO)populationMap.get(populationKey);
- ComMngPopulationDO updatePopulationDO = updateLowSecurityPopulationDO(vo,populationDO,labelList);
+ ComMngPopulationDO updatePopulationDO =
+ updateLowSecurityPopulationDO(vo, populationDO, communityId, userId);
updateList.add(updatePopulationDO);
- }else{
- //不存在实有人口,则新增
- populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO,labelList);
+ } else {
+ // 不存在实有人口,则新增
+ populationDO = saveLowSecurityPopulationDO(vo, populationActVO, comMngVillageDO, userId);
saveList.add(populationDO);
}
log.info("开始查询实有人口是否已存在完成");
log.info("开始查询实有人口房屋居住信息");
- //处理实有人口房屋居住信息
+ // 处理实有人口房屋居住信息
if (populationDO != null) {
ComMngPopulationHouseUserDO populationHouseUserDO = null;
String houseUserKey = populationDO.getId() + populationHouseDO.getId() + "";
- if(isOnly(houseUserKey,houseUserMap)){
+ if (isOnly(houseUserKey, houseUserMap)) {
populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
-// populationHouseUserDO.setRelation(vo.getRelation());
+ // populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
-// populationHouseUserDO.setResidence(vo.getResidence());
+ // populationHouseUserDO.setResidence(vo.getResidence());
houseUserList.add(populationHouseUserDO);
}
}
log.info("开始查询实有人口房屋居住信息完成");
+
+ log.info("开始查询实有人口存在社区信息");
+ // 处理实有人口与社区关系以及对应特殊群体标签
+ String populationCommunityKey = populationDO.getId() + populationActVO.getCommunityId() + "";
+ if (populationDO != null) {
+ ComMngPopulationCommunityTagsDO cpopulationCommunityTagsDO = null;
+ if (isOnly(populationCommunityKey, populationCommunityMap)) {
+ // 实有人口不存在于当前社区
+ cpopulationCommunityTagsDO = new ComMngPopulationCommunityTagsDO();
+ cpopulationCommunityTagsDO.setId(Snowflake.getId());
+ cpopulationCommunityTagsDO.setPopulationId(populationDO.getId());
+ cpopulationCommunityTagsDO.setCommunityId(communityId);
+ 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.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setCreateBy(userId);
+ savePopulationCommunityList.add(cpopulationCommunityTagsDO);
+ } else {
+ // 实有人口存在于当前社区，则更新
+ ComMngPopulationCommunityTagsDO comMngPopulationCommunityTagsDO =
+ (ComMngPopulationCommunityTagsDO)populationCommunityMap.get(populationCommunityKey);
+ 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();
+ }
+ comMngPopulationCommunityTagsDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationCommunityTagsDO.setUpdateBy(userId);
+ updatePopulationCommunityList.add(comMngPopulationCommunityTagsDO);
+
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ BeanUtils.copyProperties(vo, mistake);
+ setLowSecurityMistake(mistake, vo);
+ mistake.setMistake("该实有人口已存在于该社区，执行更新");
+ mistakes.add(mistake);
+ }
+ }
+ log.info("查询实有人口存在社区信息完成");
}
- }catch (Exception e){
+ } catch (Exception e) {
log.info("出现错误，错误原因：" + e.getMessage());
}
log.info("处理完成导入数据");
log.info("开始执行数据库导入");
- if(!houseList.isEmpty()){
+ if (!houseList.isEmpty()) {
log.info("执行数据库导入房屋");
comMngPopulationHouseDAO.insertAll(houseList);
log.info("执行数据库导入房屋完成");
}
- if(!saveList.isEmpty()){
+ if (!saveList.isEmpty()) {
log.info("执行数据库导入人口");
this.baseMapper.insertAll(saveList);
log.info("执行数据库导入人口完成");
}
- if(!updateList.isEmpty()){
+ if (!updateList.isEmpty()) {
log.info("执行数据库更新人口");
this.baseMapper.updateAll(updateList);
-// this.updateBatchById(updateList);
+ // this.updateBatchById(updateList);
log.info("执行数据库更新人口完成");
}
- if(!houseUserList.isEmpty()){
+ if (!houseUserList.isEmpty()) {
log.info("执行数据库导入人口房屋关系");
comMngPopulationHouseUserService.saveBatch(houseUserList);
log.info("执行数据库导入人口房屋关系完成");
+ }
+ if (!savePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库导入人口社区关系");
+ comMngPopulationCommunityTagsService.saveBatch(savePopulationCommunityList);
+ log.info("数据库导入人口社区关系完成");
+ }
+ if (!updatePopulationCommunityList.isEmpty()) {
+ log.info("执行数据库更新人口社区关系");
+ comMngPopulationCommunityTagsDAO.updateAll(updatePopulationCommunityList);
+ log.info("数据库更新人口社区关系完成");
}
log.info("执行数据库导入完成");
@@ -2880,54 +3781,61 @@
return R.ok(mistakes);
}
-
- private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,
+ Long communityId, Long userId) {
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();
- }
+ // 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){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
return populationDO;
}
- private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComMngPopulationDO populationDO,
+ Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().lambda()
- .eq(ComDrugPopulationDO::getPopulationId, populationDO.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();
- }
+ ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>()
+ .lambda().eq(ComDrugPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comDrugPopulationDO != null) {
BeanUtils.copyProperties(vo, comDrugPopulationDO);
comDrugPopulationDO.setCardNo(cardNoAES);
comDrugPopulationDAO.updateById(comDrugPopulationDO);
- }else {
+ } else {
comDrugPopulationDO = new ComDrugPopulationDO();
BeanUtils.copyProperties(vo, comDrugPopulationDO);
comDrugPopulationDO.setId(Snowflake.getId());
@@ -2939,31 +3847,36 @@
return populationDO;
}
- private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo,
+ ComMngPopulationDO populationDO, Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
+ ComCorrectPopulationDO comCorrectPopulationDO =
+ comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().lambda()
.eq(ComCorrectPopulationDO::getPopulationId, populationDO.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();
- }
+ // 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){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comCorrectPopulationDO != null) {
BeanUtils.copyProperties(vo, comCorrectPopulationDO);
comCorrectPopulationDO.setCardNo(cardNoAES);
comCorrectPopulationDAO.updateById(comCorrectPopulationDO);
- }else {
+ } else {
comCorrectPopulationDO = new ComCorrectPopulationDO();
BeanUtils.copyProperties(vo, comCorrectPopulationDO);
comCorrectPopulationDO.setId(Snowflake.getId());
@@ -2975,31 +3888,36 @@
return populationDO;
}
- private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComMngPopulationDO populationDO,
+ Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
+ ComMajorPopulationDO comMajorPopulationDO =
+ comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().lambda()
.eq(ComMajorPopulationDO::getPopulationId, populationDO.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();
- }
+ // 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){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comMajorPopulationDO != null) {
BeanUtils.copyProperties(vo, comMajorPopulationDO);
comMajorPopulationDO.setCardNo(cardNoAES);
comMajorPopulationDAO.updateById(comMajorPopulationDO);
- }else {
+ } else {
comMajorPopulationDO = new ComMajorPopulationDO();
BeanUtils.copyProperties(vo, comMajorPopulationDO);
comMajorPopulationDO.setId(Snowflake.getId());
@@ -3011,31 +3929,35 @@
return populationDO;
}
- private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateCultPopulationDO(ComMngPopulationCultExcelVO vo, ComMngPopulationDO populationDO,
+ Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().lambda().
- eq(ComCultPopulationDO::getPopulationId, populationDO.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();
- }
+ ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>()
+ .lambda().eq(ComCultPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comCultPopulationDO != null) {
BeanUtils.copyProperties(vo, comCultPopulationDO);
comCultPopulationDO.setCardNo(cardNoAES);
comCultPopulationDAO.updateById(comCultPopulationDO);
- }else {
+ } else {
comCultPopulationDO = new ComCultPopulationDO();
BeanUtils.copyProperties(vo, comCultPopulationDO);
comCultPopulationDO.setId(Snowflake.getId());
@@ -3047,31 +3969,36 @@
return populationDO;
}
- private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo,
+ ComMngPopulationDO populationDO, Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().lambda().
- eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.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();
- }
+ ComRehabilitationPopulationDO comRehabilitationPopulationDO =
+ comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().lambda()
+ .eq(ComRehabilitationPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comRehabilitationPopulationDO != null) {
BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
comRehabilitationPopulationDO.setCardNo(cardNoAES);
comRehabilitationPopulationDAO.updateById(comRehabilitationPopulationDO);
- }else {
+ } else {
comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
BeanUtils.copyProperties(vo, comRehabilitationPopulationDO);
comRehabilitationPopulationDO.setId(Snowflake.getId());
@@ -3084,31 +4011,35 @@
return populationDO;
}
- private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComMngPopulationDO populationDO,
+ Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().lambda().
- eq(ComKeyPopulationDO::getPopulationId, populationDO.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();
- }
+ ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>()
+ .lambda().eq(ComKeyPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comKeyPopulationDO != null) {
BeanUtils.copyProperties(vo, comKeyPopulationDO);
comKeyPopulationDO.setCardNo(cardNoAES);
comKeyPopulationDAO.updateById(comKeyPopulationDO);
- }else {
+ } else {
comKeyPopulationDO = new ComKeyPopulationDO();
BeanUtils.copyProperties(vo, comKeyPopulationDO);
comKeyPopulationDO.setId(Snowflake.getId());
@@ -3120,31 +4051,36 @@
return populationDO;
}
- private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateSentencePopulationDO(ComMngPopulationSentenceExcelVO vo,
+ ComMngPopulationDO populationDO, Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComSentencePopulationDO comSentencePopulationDO = comSentencePopulationDAO.selectOne(new QueryWrapper<ComSentencePopulationDO>().lambda().
- eq(ComSentencePopulationDO::getPopulationId, populationDO.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();
- }
+ ComSentencePopulationDO comSentencePopulationDO =
+ comSentencePopulationDAO.selectOne(new QueryWrapper<ComSentencePopulationDO>().lambda()
+ .eq(ComSentencePopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comSentencePopulationDO != null) {
BeanUtils.copyProperties(vo, comSentencePopulationDO);
comSentencePopulationDO.setCardNo(cardNoAES);
comSentencePopulationDAO.updateById(comSentencePopulationDO);
- }else {
+ } else {
comSentencePopulationDO = new ComSentencePopulationDO();
BeanUtils.copyProperties(vo, comSentencePopulationDO);
comSentencePopulationDO.setId(Snowflake.getId());
@@ -3156,31 +4092,36 @@
return populationDO;
}
- private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo,
+ ComMngPopulationDO populationDO, Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().lambda().
- eq(ComVeteransPopulationDO::getPopulationId, populationDO.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();
- }
+ ComVeteransPopulationDO comVeteransPopulationDO =
+ comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().lambda()
+ .eq(ComVeteransPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comVeteransPopulationDO != null) {
BeanUtils.copyProperties(vo, comVeteransPopulationDO);
comVeteransPopulationDO.setCardNo(cardNoAES);
comVeteransPopulationDAO.updateById(comVeteransPopulationDO);
- }else {
+ } else {
comVeteransPopulationDO = new ComVeteransPopulationDO();
BeanUtils.copyProperties(vo, comVeteransPopulationDO);
comVeteransPopulationDO.setId(Snowflake.getId());
@@ -3191,31 +4132,37 @@
}
return populationDO;
}
- private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+
+ private ComMngPopulationDO updateDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo,
+ ComMngPopulationDO populationDO, Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().lambda().
- eq(ComDisabilityPopulationDO::getPopulationId, populationDO.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();
- }
+ ComDisabilityPopulationDO comDisabilityPopulationDO =
+ comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().lambda()
+ .eq(ComDisabilityPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comDisabilityPopulationDO != null) {
BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
comDisabilityPopulationDO.setCardNo(cardNoAES);
comDisabilityPopulationDAO.updateById(comDisabilityPopulationDO);
- }else {
+ } else {
comDisabilityPopulationDO = new ComDisabilityPopulationDO();
BeanUtils.copyProperties(vo, comDisabilityPopulationDO);
comDisabilityPopulationDO.setId(Snowflake.getId());
@@ -3227,31 +4174,36 @@
return populationDO;
}
- private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComMngPopulationDO populationDO,List<String> labelList){
+ private ComMngPopulationDO updateLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo,
+ ComMngPopulationDO populationDO, Long communityId, Long userId) {
BeanUtils.copyProperties(vo, populationDO);
- ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().lambda().
- eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.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();
- }
+ ComLowSecurityPopulationDO comLowSecurityPopulationDO =
+ comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().lambda()
+ .eq(ComLowSecurityPopulationDO::getPopulationId, populationDO.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();
+ // }
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
- populationDO.setLabel(Joiner.on(",").join(userTag));
+ // populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setActId(communityId);
populationDO.setCardNo(cardNoAES);
+ populationDO.setUpdateBy(userId);
if (comLowSecurityPopulationDO != null) {
BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
comLowSecurityPopulationDO.setCardNo(cardNoAES);
comLowSecurityPopulationDAO.updateById(comLowSecurityPopulationDO);
- }else {
+ } else {
comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
BeanUtils.copyProperties(vo, comLowSecurityPopulationDO);
comLowSecurityPopulationDO.setId(Snowflake.getId());
@@ -3263,23 +4215,25 @@
return populationDO;
}
- private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3287,23 +4241,25 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
return populationDO;
}
- private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveDrugPopulationDO(ComMngPopulationDrugExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComDrugPopulationDO comDrugPopulationDO = new ComDrugPopulationDO();
@@ -3311,19 +4267,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comDrugPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3331,19 +4288,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comDrugPopulationDO.setId(Snowflake.getId());
comDrugPopulationDO.setCommunityId(comActDO.getCommunityId());
comDrugPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3351,7 +4309,8 @@
return populationDO;
}
- private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveCorrectPopulationDO(ComMngPopulationCorrectExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComCorrectPopulationDO comCorrectPopulationDO = new ComCorrectPopulationDO();
@@ -3359,19 +4318,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comCorrectPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3379,19 +4339,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comCorrectPopulationDO.setId(Snowflake.getId());
comCorrectPopulationDO.setCommunityId(comActDO.getCommunityId());
comCorrectPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3399,7 +4360,8 @@
return populationDO;
}
- private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveMajorPopulationDO(ComMngPopulationMajorExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComMajorPopulationDO comMajorPopulationDO = new ComMajorPopulationDO();
@@ -3407,19 +4369,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comMajorPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3427,19 +4390,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comMajorPopulationDO.setId(Snowflake.getId());
comMajorPopulationDO.setCommunityId(comActDO.getCommunityId());
comMajorPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3447,7 +4411,8 @@
return populationDO;
}
- private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveCultPopulationDO(ComMngPopulationCultExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComCultPopulationDO comCultPopulationDO = new ComCultPopulationDO();
@@ -3455,19 +4420,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comCultPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3475,19 +4441,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comCultPopulationDO.setId(Snowflake.getId());
comCultPopulationDO.setCommunityId(comActDO.getCommunityId());
comCultPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3495,7 +4462,8 @@
return populationDO;
}
- private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveRehabilitationPopulationDO(ComMngPopulationRehabilitationExcelVO vo,
+ ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComRehabilitationPopulationDO comRehabilitationPopulationDO = new ComRehabilitationPopulationDO();
@@ -3503,19 +4471,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comRehabilitationPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3523,19 +4492,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comRehabilitationPopulationDO.setId(Snowflake.getId());
comRehabilitationPopulationDO.setCommunityId(comActDO.getCommunityId());
comRehabilitationPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3543,7 +4513,8 @@
return populationDO;
}
- private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveKeyPopulationDO(ComMngPopulationKeyExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComKeyPopulationDO comKeyPopulationDO = new ComKeyPopulationDO();
@@ -3551,19 +4522,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comKeyPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3571,19 +4543,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comKeyPopulationDO.setId(Snowflake.getId());
comKeyPopulationDO.setCommunityId(comActDO.getCommunityId());
comKeyPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3591,7 +4564,8 @@
return populationDO;
}
- private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveSentencePopulationDO(ComMngPopulationSentenceExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComSentencePopulationDO comSentencePopulationDO = new ComSentencePopulationDO();
@@ -3599,19 +4573,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comSentencePopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3619,19 +4594,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comSentencePopulationDO.setId(Snowflake.getId());
comSentencePopulationDO.setCommunityId(comActDO.getCommunityId());
comSentencePopulationDO.setStreetId(comActDO.getStreetId());
@@ -3639,7 +4615,8 @@
return populationDO;
}
- private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveVeteransPopulationDO(ComMngPopulationVeteransExcelVO vo, ComPopulationActVO comActDO,
+ ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComVeteransPopulationDO comVeteransPopulationDO = new ComVeteransPopulationDO();
@@ -3647,19 +4624,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comVeteransPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3667,19 +4645,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comVeteransPopulationDO.setId(Snowflake.getId());
comVeteransPopulationDO.setCommunityId(comActDO.getCommunityId());
comVeteransPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3687,7 +4666,8 @@
return populationDO;
}
- private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveDisabilityPopulationDO(ComMngPopulationDisabilityExcelVO vo,
+ ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
ComDisabilityPopulationDO comDisabilityPopulationDO = new ComDisabilityPopulationDO();
@@ -3695,19 +4675,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comDisabilityPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3715,19 +4696,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comDisabilityPopulationDO.setId(Snowflake.getId());
comDisabilityPopulationDO.setCommunityId(comActDO.getCommunityId());
comDisabilityPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3735,7 +4717,8 @@
return populationDO;
}
- private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo, ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO,List<String> labelList) {
+ private ComMngPopulationDO saveLowSecurityPopulationDO(ComMngPopulationLowSecurityExcelVO vo,
+ ComPopulationActVO comActDO, ComMngVillageDO comMngVillageDO, Long userId) {
ComMngPopulationDO populationDO = new ComMngPopulationDO();
ComLowSecurityPopulationDO comLowSecurityPopulationDO = new ComLowSecurityPopulationDO();
BeanUtils.copyProperties(vo, populationDO);
@@ -3743,19 +4726,20 @@
Long populationId = Snowflake.getId();
populationDO.setId(populationId);
comLowSecurityPopulationDO.setPopulationId(populationId);
- 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();
- }
+ // 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.setLabel(Joiner.on(",").join(userTag));
populationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDO.setCardNoStr(vo.getCardNo());
populationDO.setUpdateAt(new Date());
@@ -3763,19 +4747,20 @@
String cardNoAES = populationDO.getCardNo();
try {
cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("身份证加密失败");
}
populationDO.setCardNo(cardNoAES);
- //新增的时候默认绑定房屋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);
-// }
+ populationDO.setCreateBy(userId);
+ // 新增的时候默认绑定房屋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);
+ // this.baseMapper.insert(populationDO);
comLowSecurityPopulationDO.setId(Snowflake.getId());
comLowSecurityPopulationDO.setCommunityId(comActDO.getCommunityId());
comLowSecurityPopulationDO.setStreetId(comActDO.getStreetId());
@@ -3783,8 +4768,9 @@
return populationDO;
}
- private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -3801,7 +4787,8 @@
populationHouseDO.setUpdateAt(new Date());
populationHouseDO.setConstructPurpose(vo.getBuildPurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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()));
@@ -3820,12 +4807,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveDrugPopulationHouse(ComMngPopulationDrugExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveDrugPopulationHouse(ComMngPopulationDrugExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -3840,14 +4828,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -3861,12 +4850,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveCorrectPopulationHouse(ComMngPopulationCorrectExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveCorrectPopulationHouse(ComMngPopulationCorrectExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -3881,14 +4871,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -3902,12 +4893,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveMajorPopulationHouse(ComMngPopulationMajorExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveMajorPopulationHouse(ComMngPopulationMajorExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -3922,14 +4914,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -3943,12 +4936,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveCultPopulationHouse(ComMngPopulationCultExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ 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());
@@ -3963,14 +4957,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -3984,12 +4979,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveRehabilitationPopulationHouse(ComMngPopulationRehabilitationExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ 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());
@@ -4004,14 +5000,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -4025,12 +5022,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveKeyPopulationHouse(ComMngPopulationKeyExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveKeyPopulationHouse(ComMngPopulationKeyExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -4045,14 +5043,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -4066,12 +5065,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveSentencePopulationHouse(ComMngPopulationSentenceExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveSentencePopulationHouse(ComMngPopulationSentenceExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -4086,14 +5086,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -4107,12 +5108,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveVeteransPopulationHouse(ComMngPopulationVeteransExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveVeteransPopulationHouse(ComMngPopulationVeteransExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -4127,14 +5129,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -4148,12 +5151,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveDisabilityPopulationHouse(ComMngPopulationDisabilityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveDisabilityPopulationHouse(ComMngPopulationDisabilityExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -4168,14 +5172,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -4189,12 +5194,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseDO saveLowSecurityPopulationHouse(ComMngPopulationLowSecurityExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseDO saveLowSecurityPopulationHouse(ComMngPopulationLowSecurityExcelVO vo,
+ ComMngVillageDO comMngVillageDO, Long communityId, StringBuilder areaPath, String actName) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
@@ -4209,14 +5215,15 @@
populationHouseDO.setCode(vo.getHouseNo());
populationHouseDO.setAddress(vo.getAddress());
populationHouseDO.setUpdateAt(new Date());
-// populationHouseDO.setConstructPurpose(vo.getHousePurpose());
+ // populationHouseDO.setConstructPurpose(vo.getHousePurpose());
StringBuilder housePath = new StringBuilder();
- housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
+ 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) {
-// }
+ // try {
+ // populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ // } catch (Exception e) {
+ // }
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
@@ -4230,12 +5237,13 @@
if (vo.getControlStatus() != null) {
populationHouseDO.setControlStatus(vo.getControlStatus());
}
-// comMngPopulationHouseDAO.insert(populationHouseDO);
+ // comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
}
- private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
- //查询该房屋未建立，执行建立房屋信息
+ private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo,
+ ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
+ // 查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setPopulId(comMngPopulationDO.getId());
@@ -4250,8 +5258,10 @@
/**
* 确认导入实有人口（有则更新，无则新建）
*
- * @param list 用户信息
- * @param communityId 社区id
+ * @param list
+ * 用户信息
+ * @param communityId
+ * 社区id
* @return 导入结果
*/
@Override
@@ -4259,16 +5269,21 @@
if (list.size() == 0) {
return R.fail("数据为空！");
}
- List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
- //查询该社区所有(实有房屋)小区
-// List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
+ List<ComMngPopulationDO> comMngPopulationDOS = populationDAO
+ .selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
+ // 查询该社区所有(实有房屋)小区
+ // List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new
+ // QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
ComActDO comActDO = comActDAO.selectById(communityId);
ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
list.forEach(vo -> {
ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
- //查询街路巷是否存在
- ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
-// ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
+ // 查询街路巷是否存在
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>()
+ .eq("alley", vo.getRoad()).eq("house_num", vo.getDoorNo()).eq("community_id", communityId));
+ // ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village ->
+ // village.getAlley().equals(vo.getRoad()) &&
+ // village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
BeanUtils.copyProperties(vo, comMngPopulationDO);
if (comMngVillageDO == null) {
throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
@@ -4276,21 +5291,23 @@
comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
comMngPopulationDO.setActId(comActDO.getCommunityId());
comMngPopulationDO.setStreetId(comActDO.getStreetId());
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ List<String> userTag =
+ vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
comMngPopulationDO.setLabel(Joiner.on(",").join(userTag));
comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
populationDOList.add(comMngPopulationDO);
});
if (!populationDOList.isEmpty()) {
- //循环遍历待导入人员信息，如果数据库存在则更新，如果不存在则新建
+ // 循环遍历待导入人员信息，如果数据库存在则更新，如果不存在则新建
populationDOList.forEach(population -> {
try {
- //加密身份证号码
+ // 加密身份证号码
String cardNo = AESUtil.encrypt128(population.getCardNo(), aesKey);
population.setCardNo(cardNo);
- //查询这个用户是否存在
- ComMngPopulationDO comMngPopulationDO = this.populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
+ // 查询这个用户是否存在
+ ComMngPopulationDO comMngPopulationDO =
+ this.populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
.eq(ComMngPopulationDO::getCardNo, population.getCardNo()));
if (comMngPopulationDO != null) {
population.setId(comMngPopulationDO.getId());
@@ -4320,7 +5337,8 @@
/**
* 根据id修改实有人口标签
*
- * @param populationTagDTO 请求参数
+ * @param populationTagDTO
+ * 请求参数
* @return 修改结果
*/
@Override
@@ -4349,7 +5367,7 @@
public R deletePopulations(List<Long> Ids) {
if (!Ids.isEmpty()) {
Ids.forEach(id -> {
- //清除用户房屋居住信息
+ // 清除用户房屋居住信息
comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
});
}
@@ -4363,12 +5381,14 @@
/**
* 根据社区id查询所有实有人口
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 查询结果
*/
@Override
public R getPopulationListByCommunityId(Long communityId) {
- List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id", communityId));
+ List<ComMngPopulationDO> list =
+ populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id", communityId));
List<ComMngPopulationVO> resultList = new ArrayList<>();
if (list.size() > 0) {
list.forEach(populationDO -> {
@@ -4383,7 +5403,8 @@
/**
* 根据id集合查询实有人口
*
- * @param Ids 实有人口id集合
+ * @param Ids
+ * 实有人口id集合
* @return 查询结果
*/
@Override
@@ -4402,7 +5423,8 @@
@Override
public R getPopulationListByVillageId(Long villageId) {
- List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
+ List<ComMngPopulationDO> list =
+ populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
List<ComMngPopulationVO> resultList = new ArrayList<>();
if (list.size() > 0) {
list.forEach(populationDO -> {
@@ -4436,23 +5458,22 @@
populationDO.setStreetId(comActDO.getStreetId());
}
- //查询当前用户所有房屋id
+ // 查询当前用户所有房屋id
List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
- //清除用户房屋居住信息
+ // 清除用户房屋居住信息
comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(vo.getId());
if (!houseIds.isEmpty()) {
houseIds.forEach(houseId -> {
- //查询当前房屋下是否有人口信息，如果没有则将房屋设置为空户
+ // 查询当前房屋下是否有人口信息，如果没有则将房屋设置为空户
List<Long> oldHouseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByhHosueId(houseId);
if (oldHouseIds.isEmpty()) {
- //修改房屋信息为空户
+ // 修改房屋信息为空户
comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId, 1);
}
});
}
-
- //更新用户的房屋信息
+ // 更新用户的房屋信息
Long houseId = null;
List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
if (!vo.getHouseEditDTOList().isEmpty()) {
@@ -4463,20 +5484,20 @@
populationHouseUserDO.setHouseId(houseEditDto.getId());
populationHouseUserDO.setRelation(houseEditDto.getRelation());
if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
- houseId = houseEditDto.getId();//居住地
+ houseId = houseEditDto.getId();// 居住地
populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.yes);
- }else {
+ } else {
populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.no);
}
populationHouseUserDOList.add(populationHouseUserDO);
- //修改房屋信息不为空户
+ // 修改房屋信息不为空户
comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(), 2);
}
}
comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);
- if (houseId != null) {//居住地更新
+ if (houseId != null) {// 居住地更新
ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(houseId);
if (houseDO != null) {
populationDO.setRoad(houseDO.getAlley());
@@ -4484,8 +5505,9 @@
populationDO.setFloor(houseDO.getFloor());
populationDO.setUnitNo(houseDO.getUnitNo());
populationDO.setHouseNo(houseDO.getHouseNo());
- ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().lambda()
- .eq(ComMngVillageDO::getAlley, houseDO.getAlley()).eq(ComMngVillageDO::getHouseNum, houseDO.getHouseNum())
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(
+ new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getAlley, houseDO.getAlley())
+ .eq(ComMngVillageDO::getHouseNum, houseDO.getHouseNum())
.eq(ComMngVillageDO::getCommunityId, communityId));
if (comMngVillageDO != null) {
populationDO.setVillageId(comMngVillageDO.getVillageId());
@@ -4496,19 +5518,20 @@
}
}
-// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
-// .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
-// if (comMngPopulationHouseUserDO != null) {
-// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
-// comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
-// }else {
-// comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
-// comMngPopulationHouseUserDO.setId(Snowflake.getId());
-// comMngPopulationHouseUserDO.setPopulId(vo.getId());
-// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
-// comMngPopulationHouseUserDO.setCreateAt(new Date());
-// comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
-// }
+ // ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new
+ // QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
+ // .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
+ // if (comMngPopulationHouseUserDO != null) {
+ // comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+ // comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
+ // }else {
+ // comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
+ // comMngPopulationHouseUserDO.setId(Snowflake.getId());
+ // comMngPopulationHouseUserDO.setPopulId(vo.getId());
+ // comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+ // comMngPopulationHouseUserDO.setCreateAt(new Date());
+ // comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
+ // }
if (populationDAO.updateById(populationDO) > 0) {
return R.ok();
} else {
@@ -4518,20 +5541,21 @@
@Override
public R specialInputUser(PageInputUserDTO pageInputUserDTO) {
- IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum()
- , pageInputUserDTO.getPageSize()), pageInputUserDTO);
+ IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(
+ new Page<>(pageInputUserDTO.getPageNum(), pageInputUserDTO.getPageSize()), pageInputUserDTO);
return R.ok(iPage);
}
/**
* 删除特殊群体人员
*
- * @param id 特殊群体id
+ * @param id
+ * 特殊群体id
* @return 删除结果
*/
@Override
public R deleteSpecialInputUser(Long id) {
- //查询特殊群体人员
+ // 查询特殊群体人员
ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
if (populationDO == null) {
return R.fail("未查询到该记录");
@@ -4546,20 +5570,21 @@
@Override
public R specialInputUserTags(PageInputUserDTO comMngUserTagDTO) {
- IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(new Page<>(comMngUserTagDTO.getPageNum()
- , comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
+ IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(
+ new Page<>(comMngUserTagDTO.getPageNum(), comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
return R.ok(iPage);
}
@Override
public R saveSpecialInputUserTags(ComMngTagVO comMngTagVO) {
if (null != comMngTagVO.getId() && comMngTagVO.getId() != 0) {
- //修改
+ // 修改
ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(comMngTagVO.getId());
if (null == comMngUserTagDO) {
return R.fail("该标签不存在");
}
- ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(
+ new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
if (null != checkCreditCode && comMngUserTagDO.getId() != checkCreditCode.getId()) {
return R.fail("该标签已存在，标签名称重复");
}
@@ -4570,9 +5595,10 @@
return R.ok();
}
} else {
- //新增
- Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
- .eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
+ // 新增
+ Integer count = comMngUserTagDAO.selectCount(
+ new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName())
+ .eq(ComMngUserTagDO::getCommunityId, comMngTagVO.getCommunityId()));
if (count > 0) {
return R.fail("该标签已存在，标签名称重复");
}
@@ -4589,7 +5615,7 @@
@Override
public R deleteSpecialInputUserTags(Long id) {
- //查询特殊群体人员
+ // 查询特殊群体人员
ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(id);
if (comMngUserTagDO == null) {
return R.fail("该标签不存在");
@@ -4604,7 +5630,8 @@
/**
* 查询实有人口电子档信息
*
- * @param populationId 实有人口id
+ * @param populationId
+ * 实有人口id
* @return 实有人口电子档信息
*/
@Override
@@ -4613,9 +5640,10 @@
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
return R.fail("用户信息不存在");
}
- //查询当前用户电子档信息
+ // 查询当前用户电子档信息
if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
- UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
+ UserElectronicFileVO electronicFileVO =
+ populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
if (electronicFileVO != null) {
return R.ok(electronicFileVO);
}
@@ -4636,7 +5664,8 @@
/**
* 实有人口统计
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计结果
*/
@Override
@@ -4653,7 +5682,8 @@
ComMngPopulationDO comMngPopulation = new ComMngPopulationDO();
if (comMngPopulationDO.getLabel() != null) {
if (!comMngPopulationDO.getLabel().contains(comMngPopulationTagCardNoDTO.getLabel())) {
- comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
+ comMngPopulation.setLabel(
+ comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
}
} else {
comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel());
@@ -4671,10 +5701,7 @@
public ComMngPopulationDO getPopulationByCardNo(String cardNo) {
try {
String aesCardNo = AESUtil.encrypt128(cardNo, aesKey);
- return baseMapper.selectOne(
- new QueryWrapper<ComMngPopulationDO>()
- .eq("card_no", aesCardNo)
- );
+ return baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().eq("card_no", aesCardNo));
} catch (Exception e) {
log.error("根据身份证查询业务-加密证件信息出错:{}", e.getCause());
}
@@ -4684,52 +5711,57 @@
/**
* 首页大屏统计接口
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计结果
*/
@Override
public R getScreenIndex(Long communityId) {
- //创建统计返回参数
+ // 创建统计返回参数
IndexStatisticsVO statisticsVO = new IndexStatisticsVO();
- //查询基础数据模块
+ // 查询基础数据模块
IndexBasicsStatisticsVO basicsStatisticsVO = comMngPopulationDAO.getScreenIndexByBasics(communityId);
statisticsVO.setBasicsStatistics(basicsStatisticsVO);
- //查询实有人口统计模块
+ // 查询实有人口统计模块
IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
- //查询实有人口性别统计
- List<IndexPopulationSexStatisticsVO> sexPopulationList = comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
+ // 查询实有人口性别统计
+ List<IndexPopulationSexStatisticsVO> sexPopulationList =
+ comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
populationStatisticsVO.setSexPopulationList(sexPopulationList);
- //查询实有人口年龄统计
+ // 查询实有人口年龄统计
List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(communityId);
populationStatisticsVO.setAgePopulationList(agePopulationList);
statisticsVO.setPopulationStatisticsVO(populationStatisticsVO);
- //查询实有人口实时治理信息
- List<IndexEventListStatisticsVO> eventListStatisticsList = comMngPopulationDAO.getScreenIndexByEventList(communityId);
+ // 查询实有人口实时治理信息
+ List<IndexEventListStatisticsVO> eventListStatisticsList =
+ comMngPopulationDAO.getScreenIndexByEventList(communityId);
statisticsVO.setEventListStatisticsList(eventListStatisticsList);
- //查询社区治理动态信息
+ // 查询社区治理动态信息
IndexDynamicStatisticsVO dynamicStatisticsVO = comMngPopulationDAO.getScreenIndexByDynamic(communityId);
- dynamicStatisticsVO.setCultureActivityTotal(dynamicStatisticsVO.getPbTotal() + dynamicStatisticsVO.getActTotal());
+ dynamicStatisticsVO
+ .setCultureActivityTotal(dynamicStatisticsVO.getPbTotal() + dynamicStatisticsVO.getActTotal());
statisticsVO.setDynamicStatisticsVO(dynamicStatisticsVO);
- //查询网格化治理
+ // 查询网格化治理
IndexEventGridStatisticsVO eventGridStatisticsVO = new IndexEventGridStatisticsVO();
List<IndexGridStatisticsVO> gridStatisticsList = new ArrayList<>();
- //查询网格化事件数据
+ // 查询网格化事件数据
IndexGridEventStatisticsVO gridEventStatistics = comMngPopulationDAO.getGridEventStatisticsList(communityId);
eventGridStatisticsVO.setGridEventStatisticsList(gridEventStatistics);
- //查询网格数据
+ // 查询网格数据
List<EventGridDataVO> gridDataList = comMngPopulationDAO.getGridDataListByCommunityId(communityId);
if (!gridDataList.isEmpty()) {
gridDataList.forEach(gridData -> {
if (gridData != null) {
IndexGridStatisticsVO gridStatisticsVO = new IndexGridStatisticsVO();
gridStatisticsVO.setEventData(gridData.getGridName());
- //根据网格id查询网格事件列表
- IndexGridEventStatisticsVO gridEventList = comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
+ // 根据网格id查询网格事件列表
+ IndexGridEventStatisticsVO gridEventList =
+ comMngPopulationDAO.getGridEventByGirdId(gridData.getId());
gridStatisticsVO.setGridEventStatisticsList(gridEventList);
gridStatisticsList.add(gridStatisticsVO);
}
@@ -4738,14 +5770,14 @@
eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
statisticsVO.setEventGridStatisticsVO(eventGridStatisticsVO);
- //查询党建数据
+ // 查询党建数据
BigScreenStatisticPartyBuild statisticPartyBuild = bigScreenDAO.partybuild(communityId);
statisticsVO.setStatisticPartyBuild(statisticPartyBuild);
- //查询特殊人群统计
+ // 查询特殊人群统计
List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
- //查询特殊人群标签列表
+ // 查询特殊人群标签列表
List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
otherSpecialVO.setTitle("其他");
@@ -4754,7 +5786,7 @@
userTagList.forEach(userTag -> {
if (userTag != null) {
if (userTag.getSysFlag().equals(0)) {
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
} else {
if (StringUtils.isNotEmpty(userTag.getTagName())) {
@@ -4778,15 +5810,15 @@
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(264);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("高龄老人")){
+ } else if (userTag.getTagName().equals("高龄老人")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
specialStatisticsVOList.add(specialStatisticsVO);
- }else{
+ } else {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
specialStatisticsVO.setSum(count);
specialStatisticsVOList.add(specialStatisticsVO);
}
@@ -4844,38 +5876,37 @@
/**
* 事件大屏统计接口
*
- * @param screenEventDTO 请求参数
+ * @param screenEventDTO
+ * 请求参数
* @return 统计结果
*/
@Override
public R getScreenEvent(BigScreenEventDTO screenEventDTO) {
Long communityId = screenEventDTO.getCommunityId();
- //创建统计返回参数
+ // 创建统计返回参数
EventStatisticsVO statisticsVO = new EventStatisticsVO();
- //查询页面左边数据
+ // 查询页面左边数据
EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
- //查询左上数据
+ // 查询左上数据
EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
- //查询时间频发月份
+ // 查询时间频发月份
List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
leftTopStatisticsVO.setOftenMonth(monthList);
leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
- //查询左下数据
+ // 查询左下数据
EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
statisticsVO.setLeftStatisticsVO(leftStatisticsVO);
- //查询事件播报模块数据
+ // 查询事件播报模块数据
EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
if (newStatisticsVO != null) {
- //查询事件资源文件
+ // 查询事件资源文件
List<EventResourceDO> eventResourceDOList =
- eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
- .eq(EventResourceDO::getClassification, 1)
- .eq(EventResourceDO::getRefId, newStatisticsVO.getId())
- );
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1).eq(EventResourceDO::getRefId, newStatisticsVO.getId()));
List<EventResourceVO> picList = new ArrayList<>();
List<EventResourceVO> audioList = new ArrayList<>();
List<EventResourceVO> videoList = new ArrayList<>();
@@ -4902,39 +5933,41 @@
newStatisticsVO.setPics(picList);
newStatisticsVO.setVideos(videoList);
- //查询事件流转记录
- List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId());
+ // 查询事件流转记录
+ List<EventTransferRecordVO> transferRecordList =
+ this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId());
newStatisticsVO.setTransferRecordList(transferRecordList);
}
statisticsVO.setNewStatisticsVO(newStatisticsVO);
- //查询网格数据
+ // 查询网格数据
List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
statisticsVO.setGridStatisticsList(gridStatisticsList);
- //查询社区事件列表
+ // 查询社区事件列表
List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
statisticsVO.setGridIncidentList(gridIncidentList);
- //查询小区列表
+ // 查询小区列表
List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
- if(!villageStatisticsList.isEmpty()){
+ if (!villageStatisticsList.isEmpty()) {
villageStatisticsList.forEach(village -> {
- CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
- if(villageStatisticsVO != null){
+ CivilVillageStatisticsVO villageStatisticsVO =
+ this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
+ if (villageStatisticsVO != null) {
village.setPeopleNum(villageStatisticsVO.getPeopleNum());
village.setHouseNum(villageStatisticsVO.getHouseNum());
village.setRegisterNum(villageStatisticsVO.getRegisterNum());
village.setFlowNum(villageStatisticsVO.getFlowNum());
-// BeanUtils.copyProperties(villageStatisticsVO,village);
+ // BeanUtils.copyProperties(villageStatisticsVO,village);
}
});
}
statisticsVO.setVillageStatisticsList(villageStatisticsList);
- //查询统计人口数据
+ // 查询统计人口数据
ComMngPopulationTotalVO populationTotalVO = populationDAO.getPopulationTotalByAdmin(communityId);
- if(communityId.equals(2L)){
+ if (communityId.equals(2L)) {
populationTotalVO.setSpecialTotal(36);
}
statisticsVO.setPopulationTotalVO(populationTotalVO);
@@ -4945,18 +5978,19 @@
/**
* 民生大屏统计接口
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 统计结果
*/
@Override
public R getScreenCivil(Long communityId) {
- //创建统计返回参数
+ // 创建统计返回参数
CivilStatisticsVO civilStatisticsVO = new CivilStatisticsVO();
- //查询特殊人群统计
+ // 查询特殊人群统计
List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
- //查询特殊人群标签列表
+ // 查询特殊人群标签列表
List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
otherSpecialVO.setTitle("其他");
@@ -4965,7 +5999,7 @@
userTagList.forEach(userTag -> {
if (userTag != null) {
if (userTag.getSysFlag().equals(0)) {
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
} else {
if (StringUtils.isNotEmpty(userTag.getTagName())) {
@@ -4989,15 +6023,15 @@
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(264);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("高龄老人")){
+ } else if (userTag.getTagName().equals("高龄老人")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
specialStatisticsVOList.add(specialStatisticsVO);
- }else{
+ } else {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
specialStatisticsVO.setSum(count);
specialStatisticsVOList.add(specialStatisticsVO);
}
@@ -5006,7 +6040,7 @@
}
});
}
- //计算特殊人群总数
+ // 计算特殊人群总数
specialStatisticsVOList.add(otherSpecialVO);
Integer specialNum = 0;
if (!specialStatisticsVOList.isEmpty()) {
@@ -5017,23 +6051,28 @@
civilStatisticsVO.setSpecialNum(specialNum);
civilStatisticsVO.setSpecialStatisticsList(specialStatisticsVOList);
- //计算环比上月增长率
+ // 计算环比上月增长率
BigDecimal rate = BigDecimal.ZERO;
- CivilPopulationStatisticsVO populationStatisticsVO = this.baseMapper.getCivilScreenPopulation(communityId, DateUtils.getFirstDayOfMonth());
+ CivilPopulationStatisticsVO populationStatisticsVO =
+ this.baseMapper.getCivilScreenPopulation(communityId, DateUtils.getFirstDayOfMonth());
if (populationStatisticsVO != null) {
if (populationStatisticsVO.getToMonthSpecialTotal().equals(0)) {
rate = BigDecimal.valueOf(100);
} else {
- rate = BigDecimal.valueOf(populationStatisticsVO.getSpecialTotal() - populationStatisticsVO.getToMonthSpecialTotal()).divide(BigDecimal.valueOf(populationStatisticsVO.getToMonthSpecialTotal()), 3, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100));
+ rate = BigDecimal
+ .valueOf(populationStatisticsVO.getSpecialTotal() - populationStatisticsVO.getToMonthSpecialTotal())
+ .divide(BigDecimal.valueOf(populationStatisticsVO.getToMonthSpecialTotal()), 3,
+ BigDecimal.ROUND_HALF_UP)
+ .multiply(BigDecimal.valueOf(100));
}
}
civilStatisticsVO.setRate(rate);
- //查询网格数据
+ // 查询网格数据
List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
civilStatisticsVO.setGridStatisticsList(gridStatisticsList);
- //查询小区列表
+ // 查询小区列表
List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);
@@ -5048,51 +6087,51 @@
comActPopulationScreenVO.setLocalNum(vo.getLocalTotal() == null ? 0 : vo.getLocalTotal().longValue());
comActPopulationScreenVO.setOutNum(vo.getOutTotal() == null ? 0 : vo.getOutTotal().longValue());
- //查询特殊人群统计
+ // 查询特殊人群统计
List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
- //查询特殊人群标签列表
+ // 查询特殊人群标签列表
List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
otherSpecialVO.setTitle("其他");
otherSpecialVO.setSum(0);
- if(!userTagList.isEmpty()){
+ if (!userTagList.isEmpty()) {
userTagList.forEach(userTag -> {
- if(userTag != null){
- if(userTag.getSysFlag().equals(0)){
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ if (userTag != null) {
+ if (userTag.getSysFlag().equals(0)) {
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
- }else{
- if(StringUtils.isNotEmpty(userTag.getTagName())){
- if(userTag.getTagName().equals("特扶家庭")){
+ } else {
+ if (StringUtils.isNotEmpty(userTag.getTagName())) {
+ if (userTag.getTagName().equals("特扶家庭")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(22);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("低保户")){
+ } else if (userTag.getTagName().equals("低保户")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(94);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("低收入人群")){
+ } else if (userTag.getTagName().equals("低收入人群")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(2);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("退役军人")){
+ } else if (userTag.getTagName().equals("退役军人")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(264);
specialStatisticsVOList.add(specialStatisticsVO);
- }else if(userTag.getTagName().equals("高龄老人")){
+ } else if (userTag.getTagName().equals("高龄老人")) {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
specialStatisticsVOList.add(specialStatisticsVO);
- }else{
+ } else {
IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
specialStatisticsVO.setTitle(userTag.getTagName());
- Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName(),communityId);
specialStatisticsVO.setSum(count);
specialStatisticsVOList.add(specialStatisticsVO);
}
@@ -5101,44 +6140,45 @@
}
});
}
- //计算特殊人群总数
+ // 计算特殊人群总数
specialStatisticsVOList.add(otherSpecialVO);
Integer specialNum = 0;
- if(!specialStatisticsVOList.isEmpty()){
- for (IndexSpecialStatisticsVO special:specialStatisticsVOList) {
+ if (!specialStatisticsVOList.isEmpty()) {
+ for (IndexSpecialStatisticsVO special : specialStatisticsVOList) {
specialNum += special.getSum();
}
}
comActPopulationScreenVO.setSpecialNum(specialNum.longValue());
- //统计已使用社区通人数
+ // 统计已使用社区通人数
Long count = populationDAO.countUsedCommunityPopulation(communityId);
comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
-// comActPopulationScreenVO.setUsedCommunityNum(1183L);
+ // comActPopulationScreenVO.setUsedCommunityNum(1183L);
- //统计性别
+ // 统计性别
Map<String, Long> sexMap = populationDAO.countBySex(communityId);
comActPopulationScreenVO.setWoman(sexMap.get("woman") == null ? 0L : sexMap.get("woman"));
comActPopulationScreenVO.setManNum(sexMap.get("man") == null ? 0L : sexMap.get("man"));
- int manPoint = (int) (((double) comActPopulationScreenVO.getManNum() / (double) comActPopulationScreenVO.getTotalNum()) * 100);
+ int manPoint =
+ (int)(((double)comActPopulationScreenVO.getManNum() / (double)comActPopulationScreenVO.getTotalNum())
+ * 100);
comActPopulationScreenVO.setManPoint(manPoint);
comActPopulationScreenVO.setWomanPoint(100 - manPoint);
- //统计年龄结构
+ // 统计年龄结构
setAgeGroup(comActPopulationScreenVO, communityId);
- //统计学历
+ // 统计学历
setCultureGroup(comActPopulationScreenVO, communityId);
- //查询网格数据
+ // 查询网格数据
List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
comActPopulationScreenVO.setGridStatisticsList(gridStatisticsList);
- //查询小区列表
+ // 查询小区列表
List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
comActPopulationScreenVO.setVillageStatisticsList(villageStatisticsList);
return R.ok(comActPopulationScreenVO);
}
-
private void setCultureGroup(ComActPopulationScreenVO comActPopulationScreenVO, Long communityId) {
Map<String, Long> cultureMap = populationDAO.countByCulture(communityId);
@@ -5225,7 +6265,8 @@
/**
* 获取社区网格
*
- * @param communityId 社区id
+ * @param communityId
+ * 社区id
* @return 网格数据
*/
@Override
@@ -5236,13 +6277,14 @@
/**
* 事件大屏查询事件详情
*
- * @param eventDetailDTO 请求参数
+ * @param eventDetailDTO
+ * 请求参数
* @return 事件详情
*/
@Override
public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
- if (eventDetailDTO.getType().equals(7)) {//随手拍详情
+ if (eventDetailDTO.getType().equals(7)) {// 随手拍详情
statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
if (statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())) {
statisticsVO.setDangerLevel("0");
@@ -5263,15 +6305,13 @@
}
statisticsVO.setPics(picList);
}
- } else {//事件详情
+ } else {// 事件详情
statisticsVO = this.baseMapper.getEventScreenEventDetail(eventDetailDTO.getEventId());
if (statisticsVO != null) {
- //查询事件资源文件
+ // 查询事件资源文件
List<EventResourceDO> eventResourceDOList =
- eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
- .eq(EventResourceDO::getClassification, 1)
- .eq(EventResourceDO::getRefId, statisticsVO.getId())
- );
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1).eq(EventResourceDO::getRefId, statisticsVO.getId()));
List<EventResourceVO> picList = new ArrayList<>();
List<EventResourceVO> audioList = new ArrayList<>();
List<EventResourceVO> videoList = new ArrayList<>();
@@ -5298,20 +6338,24 @@
statisticsVO.setPics(picList);
statisticsVO.setVideos(videoList);
- //查询事件流转记录
- List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
- if(!transferRecordList.isEmpty()){
+ // 查询事件流转记录
+ List<EventTransferRecordVO> transferRecordList =
+ this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
+ if (!transferRecordList.isEmpty()) {
transferRecordList.forEach(transfer -> {
- if(transfer.getFromType().equals(EventTransferRecordVO.fromType.wgy)){
- //查询上级网格信息
- EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
+ if (transfer.getFromType().equals(EventTransferRecordVO.fromType.wgy)) {
+ // 查询上级网格信息
+ EventTransferRecordDetailVO transferRecordDetailVO =
+ this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
+ transfer.setSuperiorRelationship(
+ transferRecordDetailVO.getStreetName() + "-" + transferRecordDetailVO.getCommunityName()
+ + "-" + transferRecordDetailVO.getGridName());
+ } else if (transfer.getFromType().equals(EventTransferRecordVO.fromType.sq)) {
+ // 查询上级社区信息
+ EventTransferRecordDetailVO transferRecordDetailVO =
+ this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
- + transferRecordDetailVO.getCommunityName() + "-" + transferRecordDetailVO.getGridName());
- }else if(transfer.getFromType().equals(EventTransferRecordVO.fromType.sq)){
- //查询上级社区信息
- EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
- transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
- + transferRecordDetailVO.getCommunityName());
+ + transferRecordDetailVO.getCommunityName());
}
});
}
@@ -5324,13 +6368,15 @@
/**
* 获取人口数据信息
*
- * @param populationListDTO 请求参数
+ * @param populationListDTO
+ * 请求参数
* @return 人口数据
*/
@Override
- public R pagePopulationListApp(PagePopulationListDTO populationListDTO){
- IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
- if(!pagePopulationList.getRecords().isEmpty()){
+ public R pagePopulationListApp(PagePopulationListDTO populationListDTO) {
+ IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(
+ new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO);
+ if (!pagePopulationList.getRecords().isEmpty()) {
pagePopulationList.getRecords().forEach(population -> {
population.setAge(IdcardUtil.getAgeByIdCard(population.getCardNo()));
});
@@ -5341,18 +6387,20 @@
/**
* 根据人口id获取人口详情
*
- * @param populationId 人口id
- * @return 人口详情
+ * @param populationId
+ * 人口id
+ * @return 人口详情
*/
@Override
- public R getPopulationDetailApp(Long populationId){
+ public R getPopulationDetailApp(Long populationId) {
PopulationDetailVO detail = this.baseMapper.getPopulationDetailApp(populationId);
- if(detail != null){
+ if (detail != null) {
detail.setAge(IdcardUtil.getAgeByIdCard(detail.getCardNo()));
- if(StringUtils.isNotEmpty(detail.getCultureLevel())){
- detail.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(Integer.parseInt(detail.getCultureLevel())));
+ if (StringUtils.isNotEmpty(detail.getCultureLevel())) {
+ detail
+ .setCultureLevel(PopulCultureLevelEnum.getCnDescByName(Integer.parseInt(detail.getCultureLevel())));
}
- if(StringUtils.isNotEmpty(detail.getMarriage())){
+ if (StringUtils.isNotEmpty(detail.getMarriage())) {
detail.setMarriage(PopulMarriageEnum.getCnDescByName(Integer.parseInt(detail.getMarriage())));
}
}
@@ -5366,13 +6414,13 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R getPopulationRepairByApp(){
+ public R getPopulationRepairByApp() {
List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>());
- if(!populationDOList.isEmpty()){
+ if (!populationDOList.isEmpty()) {
populationDOList.forEach(population -> {
try {
- population.setCardNo(AESUtil.encrypt128(population.getCardNoStr(),aesKey));
- }catch (Exception e){
+ population.setCardNo(AESUtil.encrypt128(population.getCardNoStr(), aesKey));
+ } catch (Exception e) {
}
this.baseMapper.updateById(population);
@@ -5383,33 +6431,37 @@
/**
* 综治后台-居民列表
- * @param populationListDTO 请求参数
- * @return 居民列表
+ *
+ * @param populationListDTO
+ * 请求参数
+ * @return 居民列表
*/
@Override
- public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO){
- if(StringUtils.isNotEmpty(populationListDTO.getKeyWord())){
+ public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO) {
+ if (StringUtils.isNotEmpty(populationListDTO.getKeyWord())) {
try {
- populationListDTO.setCardNo(AESUtil.encrypt128(populationListDTO.getKeyWord(),aesKey));
- }catch (Exception e){
+ populationListDTO.setCardNo(AESUtil.encrypt128(populationListDTO.getKeyWord(), aesKey));
+ } catch (Exception e) {
log.error("转换身份证号码失败");
}
}
- IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
- if(!populationListIPage.getRecords().isEmpty()){
+ IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(
+ new Page(populationListDTO.getPageNum(), populationListDTO.getPageSize()), populationListDTO);
+ if (!populationListIPage.getRecords().isEmpty()) {
populationListIPage.getRecords().forEach(population -> {
try {
Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
population.setAge(age);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("当前人口身份证获取年龄失败，实有人口id：" + population.getId());
}
- //查询此用户在当前房屋是否是户主
- Integer relation = this.baseMapper.getPopulationRelationByHouseId(population.getHouseId(),population.getId());
- if(relation == null || relation != 1){
+ // 查询此用户在当前房屋是否是户主
+ Integer relation =
+ this.baseMapper.getPopulationRelationByHouseId(population.getHouseId(), population.getId());
+ if (relation == null || relation != 1) {
population.setIsRelation(2);
- }else{
+ } else {
population.setIsRelation(1);
}
});
@@ -5419,13 +6471,15 @@
/**
* 综治后台-删除居民
- * @param ids 居民id集合
- * @return 删除结果
+ *
+ * @param ids
+ * 居民id集合
+ * @return 删除结果
*/
@Override
- public R delGridPopulationAdmin(List<Long> ids){
+ public R delGridPopulationAdmin(List<Long> ids) {
Integer count = this.baseMapper.getPopulationVisitingCount(ids);
- if(count > 0){
+ if (count > 0) {
return R.ok("您选择的数据中存在被引用的，无法删除");
}
this.baseMapper.deleteBatchIds(ids);
@@ -5437,20 +6491,19 @@
QueryWrapper<ComMngPopulationDO> query = new QueryWrapper<>();
query.isNull("house_id");
List<ComMngPopulationDO> list = baseMapper.selectList(query);
- list.forEach(e->{
+ list.forEach(e -> {
QueryWrapper<ComMngPopulationHouseDO> houseQuery = new QueryWrapper<>();
- houseQuery.lambda().eq(ComMngPopulationHouseDO::getCommunityId,e.getActId())
- .eq(ComMngPopulationHouseDO::getAlley,e.getRoad())
- .eq(ComMngPopulationHouseDO::getFloor,e.getFloor())
- .eq(ComMngPopulationHouseDO::getUnitNo,e.getUnitNo())
- .eq(ComMngPopulationHouseDO::getHouseNo,e.getHouseNo());
+ houseQuery.lambda().eq(ComMngPopulationHouseDO::getCommunityId, e.getActId())
+ .eq(ComMngPopulationHouseDO::getAlley, e.getRoad()).eq(ComMngPopulationHouseDO::getFloor, e.getFloor())
+ .eq(ComMngPopulationHouseDO::getUnitNo, e.getUnitNo())
+ .eq(ComMngPopulationHouseDO::getHouseNo, e.getHouseNo());
List<ComMngPopulationHouseDO> houseList = comMngPopulationHouseDAO.selectList(houseQuery);
- if(!CollectionUtils.isEmpty(houseList)){
+ if (!CollectionUtils.isEmpty(houseList)) {
UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper();
- updateWrapper.eq("id",e.getId());
+ updateWrapper.eq("id", e.getId());
ComMngPopulationDO populationDO = new ComMngPopulationDO();
populationDO.setHouseId(houseList.get(0).getId());
- baseMapper.update(populationDO,updateWrapper);
+ baseMapper.update(populationDO, updateWrapper);
}
});
return R.ok();
@@ -5458,19 +6511,22 @@
/**
* 查询平台人口列表
- * @param populationDTO 请求参数
- * @return 人口列表
+ *
+ * @param populationDTO
+ * 请求参数
+ * @return 人口列表
*/
@Override
- public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO){
+ public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO) {
- IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(new Page(populationDTO.getPageNum(),populationDTO.getPageSize()),populationDTO);
- if(!populationVOIPage.getRecords().isEmpty()){
+ IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(
+ new Page(populationDTO.getPageNum(), populationDTO.getPageSize()), populationDTO);
+ if (!populationVOIPage.getRecords().isEmpty()) {
populationVOIPage.getRecords().forEach(population -> {
try {
Integer age = IdcardUtil.getAgeByIdCard(population.getIdCard());
population.setAge(age);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("人员身份证转换年龄失败，人员id：" + population.getId());
}
});
@@ -5480,48 +6536,54 @@
/**
* 综治后台-居民标签栏统计
- * @return 居民统计
+ *
+ * @return 居民统计
*/
@Override
- public R getGridPopulationStatistics(Long communityId){
+ public R getGridPopulationStatistics(Long communityId) {
return R.ok(this.baseMapper.getGridPopulationStatistics(communityId));
}
/**
* 综治后台-居民导出查询居民数据
- * @param populationExportDTO 请求参数
- * @return 导出结果
+ *
+ * @param populationExportDTO
+ * 请求参数
+ * @return 导出结果
*/
@Override
- public R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO){
- //结果集
+ public R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO) {
+ // 结果集
List<ComMngPopulationExportExcelVO> resultPopulationList = new ArrayList<>();
- //查询人口信息
- List<ComMngPopulationListVO> populationListVOList = this.baseMapper.getGridPopulationAdminLists(populationExportDTO);
- if(!populationListVOList.isEmpty()){
+ // 查询人口信息
+ List<ComMngPopulationListVO> populationListVOList =
+ this.baseMapper.getGridPopulationAdminLists(populationExportDTO);
+ if (!populationListVOList.isEmpty()) {
populationListVOList.forEach(population -> {
ComMngPopulationExportExcelVO populationExportExcelVO = new ComMngPopulationExportExcelVO();
- BeanUtils.copyProperties(population,populationExportExcelVO);
- if(population.getSex() != null){
+ BeanUtils.copyProperties(population, populationExportExcelVO);
+ if (population.getSex() != null) {
populationExportExcelVO.setSex(PopulSexEnum.getCnDescByName(population.getSex()));
}
- if(population.getPoliticalOutlook() != null){
- populationExportExcelVO.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(population.getPoliticalOutlook()));
+ if (population.getPoliticalOutlook() != null) {
+ populationExportExcelVO.setPoliticalOutlook(
+ PopulPoliticalOutlookEnum.getCnDescByName(population.getPoliticalOutlook()));
}
- if(population.getIsHouse() != null){
- if(!population.getIsHouse().equals(0L)){
+ if (population.getIsHouse() != null) {
+ if (!population.getIsHouse().equals(0L)) {
populationExportExcelVO.setIsHouse("是");
- }else{
+ } else {
populationExportExcelVO.setIsHouse("否");
}
}
- if(population.getEventStatus() != null){
- populationExportExcelVO.setEventStatus(EventStatusEnum.getCnDescByName(population.getEventStatus()));
+ if (population.getEventStatus() != null) {
+ populationExportExcelVO
+ .setEventStatus(EventStatusEnum.getCnDescByName(population.getEventStatus()));
}
try {
Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
populationExportExcelVO.setAge(age);
- }catch (Exception e){
+ } catch (Exception e) {
log.error("当前人口身份证获取年龄失败，实有人口id：" + population.getId());
}
resultPopulationList.add(populationExportExcelVO);
@@ -5532,22 +6594,24 @@
/**
* 综治后台-居民管理小区列表
- * @param name 小区名字
- * @return 小区列表
+ *
+ * @param name
+ * 小区名字
+ * @return 小区列表
*/
@Override
- public R relationVillage(String name){
+ public R relationVillage(String name) {
List<ComMngPopulationVillageVO> populationVillageList = new ArrayList<>();
QueryWrapper<ComMngVillageDO> villageQuery = new QueryWrapper<>();
- if(StringUtils.isNotEmpty(name)){
- villageQuery.lambda().like(ComMngVillageDO::getName,name);
+ if (StringUtils.isNotEmpty(name)) {
+ villageQuery.lambda().like(ComMngVillageDO::getName, name);
}
List<ComMngVillageDO> villageList = comActVillageDAO.selectList(villageQuery);
- if(!villageList.isEmpty()){
+ if (!villageList.isEmpty()) {
villageList.forEach(village -> {
ComMngPopulationVillageVO populationVillageVO = new ComMngPopulationVillageVO();
- BeanUtils.copyProperties(village,populationVillageVO);
+ BeanUtils.copyProperties(village, populationVillageVO);
populationVillageList.add(populationVillageVO);
});
}
@@ -5555,11 +6619,12 @@
}
@Override
- public R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO){
- return R.ok(this.baseMapper.getVillagePopulationAdmin(new Page(villagePopulationDTO.getPageNum(),villagePopulationDTO.getPageSize()),villagePopulationDTO));
+ public R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO) {
+ return R.ok(this.baseMapper.getVillagePopulationAdmin(
+ new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
}
- private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo){
+ private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo) {
mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
@@ -5574,62 +6639,62 @@
mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
- private void setDrugMistake(ComMngPopulationDrugMistakeExcelVO mvo, ComMngPopulationDrugExcelVO vo){
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ private void setDrugMistake(ComMngPopulationDrugMistakeExcelVO mvo, ComMngPopulationDrugExcelVO vo) {
+ // mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
+ // mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
+ 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.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+ // mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+ // mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ }
+
+ private void setCorrectMistake(ComMngPopulationCorrectMistakeExcelVO mvo, ComMngPopulationCorrectExcelVO vo) {
+ // mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+ // mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
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.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
- }
-
- private void setCorrectMistake(ComMngPopulationCorrectMistakeExcelVO mvo, ComMngPopulationCorrectExcelVO vo){
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
- mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
- 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.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
mvo.setIsCorrectGroup(PopulHouseUseEnum.getCnDescByName(vo.getIsCorrectGroup()));
mvo.setIsMissControl(PopulHouseUseEnum.getCnDescByName(vo.getIsMissControl()));
mvo.setIsAgainCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsAgainCrime()));
mvo.setIsOutControl(PopulHouseUseEnum.getCnDescByName(vo.getIsOutControl()));
mvo.setIsRecidivist(PopulHouseUseEnum.getCnDescByName(vo.getIsRecidivist()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+ // mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+ // mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
- private void setMajorMistake(ComMngPopulationMajorMistakeExcelVO mvo, ComMngPopulationMajorExcelVO vo){
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ private void setMajorMistake(ComMngPopulationMajorMistakeExcelVO mvo, ComMngPopulationMajorExcelVO vo) {
+ // mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
- mvo.setCustodyRelation(PopulRelationEnum.getCnDescByName(vo.getCustodyRelation()));
-// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
+// mvo.setCustodyRelation(PopulRelationEnum.getCnDescByName(vo.getCustodyRelation()));
+ // mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
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.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
mvo.setIsCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsCrime()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+ // mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+ // mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
- private void setCultMistake(ComMngPopulationCultMistakeExcelVO mvo, ComMngPopulationCultExcelVO vo){
+ private void setCultMistake(ComMngPopulationCultMistakeExcelVO mvo, ComMngPopulationCultExcelVO vo) {
mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
+ // mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
@@ -5637,125 +6702,131 @@
mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
mvo.setIsExternalPublicity(PopulHouseUseEnum.getCnDescByName(vo.getIsExternalPublicity()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+ // mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+ // mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
}
- private void setRehabilitationMistake(ComMngPopulationRehabilitationMistakeExcelVO mvo, ComMngPopulationRehabilitationExcelVO vo){
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ 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.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.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+ // mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
mvo.setIsRecidivist(PopulHouseUseEnum.getCnDescByName(vo.getIsRecidivist()));
mvo.setIsAgainCrime(PopulHouseUseEnum.getCnDescByName(vo.getIsAgainCrime()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // 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()));
+ 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.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.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()));
+ // 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 setSentenceMistake(ComMngPopulationSentenceMistakeExcelVO mvo, ComMngPopulationSentenceExcelVO vo){
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ private void setSentenceMistake(ComMngPopulationSentenceMistakeExcelVO mvo, ComMngPopulationSentenceExcelVO vo) {
+ // mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ // 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.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()));
+ // 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 setVeteransMistake(ComMngPopulationVeteransMistakeExcelVO mvo, ComMngPopulationVeteransExcelVO vo){
- mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
+ private void setVeteransMistake(ComMngPopulationVeteransMistakeExcelVO mvo, ComMngPopulationVeteransExcelVO vo) {
+// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ // 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.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
-// mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // 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 setDisabilityMistake(ComMngPopulationDisabilityMistakeExcelVO mvo, ComMngPopulationDisabilityExcelVO vo){
-// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ private void setDisabilityMistake(ComMngPopulationDisabilityMistakeExcelVO mvo,
+ ComMngPopulationDisabilityExcelVO vo) {
+ // mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
+ // mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ // 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.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
-// mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
-// mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
-// mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
+ // mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
+ // 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 setLowSecurityMistake(ComMngPopulationLowSecurityMistakeExcelVO mvo, ComMngPopulationLowSecurityExcelVO vo){
-// mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
-// mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ private void setLowSecurityMistake(ComMngPopulationLowSecurityMistakeExcelVO mvo,
+ ComMngPopulationLowSecurityExcelVO vo) {
+ // mvo.setRegiterNature(PopulRegiterNatureEnum.getCnDescByName(vo.getRegiterNature()));
+ // mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
-// mvo.setPatientRelation(PopulRelationEnum.getCnDescByName(vo.getPatientRelation()));
+ // 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.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+ // mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
-// mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
-// mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
-// mvo.setIsRehab(PopulHouseUseEnum.getCnDescByName(vo.getIsRehab()));
-// mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
-// mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
-// mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ // mvo.setIsVeteransTraining(PopulHouseUseEnum.getCnDescByName(vo.getIsVeteransTraining()));
+ // mvo.setIsBusiness(PopulHouseUseEnum.getCnDescByName(vo.getIsBusiness()));
+ // 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 主键
- * @param hashMap 数据集
- * @return 存在即为false 不存在则为true
+ *
+ * @param key
+ * 主键
+ * @param hashMap
+ * 数据集
+ * @return 存在即为false 不存在则为true
*/
- private boolean isOnly(String key,HashMap<String,Object> hashMap){
+ private boolean isOnly(String key, HashMap<String, Object> hashMap) {
return ObjectUtils.isEmpty(hashMap.get(key));
}
--
Gitblit v1.7.1