From a39945f76232c423d9610f60c98cd3ec53e98cbd Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 08 六月 2021 18:29:53 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 670 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 635 insertions(+), 35 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 643ba93..62a9965 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,66 +1,96 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+import com.panzhihua.common.enums.PopulIsOksEnum;
+import com.panzhihua.common.exceptions.ServiceException;
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
-import com.panzhihua.service_community.dao.ComActDAO;
-import com.panzhihua.service_community.dao.ComMngPopulationDAO;
-import com.panzhihua.service_community.model.dos.ComActActivityDO;
-import com.panzhihua.service_community.model.dos.ComActDO;
-import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+import com.panzhihua.common.model.vos.area.AreaAddressVO;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.utlis.*;
+import com.panzhihua.service_community.dao.*;
+import com.panzhihua.service_community.model.dos.*;
+import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import com.panzhihua.service_community.service.ComMngPopulationService;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 实有人口Service实现类
*/
@Service
-public class ComMngPopulationServiceImpl implements ComMngPopulationService {
+public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
@Resource
private ComMngPopulationDAO populationDAO;
+ @Resource
+ private ComActDAO comActDAO;
+ @Resource
+ private ComActVillageDAO comActVillageDAO;
+ @Resource
+ private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
+ @Resource
+ private ComStreetDAO comStreetDAO;
+ @Resource
+ private ComMngCarDAO comMngCarDAO;
+ @Resource
+ private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
+ @Resource
+ private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Value("${domain.aesKey:}")
+ private String aesKey;
/**
* 新增实有人口
+ *
* @param comMngPopulationVO 新增信息
* @return 新增结果
*/
@Override
public R addPopulation(ComMngPopulationVO comMngPopulationVO) {
- ComMngPopulationDO comMngPopulationDO=new ComMngPopulationDO();
+ ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
Integer integer = populationDAO.selectCount(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getCardNo, comMngPopulationVO.getCardNo()));
- if (integer>0) {
+ if (integer > 0) {
return R.fail("实有人口已经存在");
}
- BeanUtils.copyProperties(comMngPopulationVO,comMngPopulationDO);
+ BeanUtils.copyProperties(comMngPopulationVO, comMngPopulationDO);
int nub = populationDAO.insert(comMngPopulationDO);
- if(nub < 1){
+ if (nub < 1) {
return R.fail();
}
return R.ok(nub);
}
+
/**
* 编辑实有人口
+ *
* @param comMngPopulationVO 编辑内容
* @return 编辑结果
*/
@@ -70,10 +100,10 @@
if (comMngPopulationDO == null) {
return R.fail("未查询到人口记录");
}
- BeanUtils.copyProperties(comMngPopulationVO,comMngPopulationDO);
+ BeanUtils.copyProperties(comMngPopulationVO, comMngPopulationDO);
int nub = populationDAO.updateById(comMngPopulationDO);
- if(nub < 1){
+ if (nub < 1) {
return R.fail();
}
return R.ok();
@@ -101,15 +131,47 @@
public R detailPopulation(Long populationId) {
ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
- return R.fail();
+ return R.fail("用户信息不存在");
}
- ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
- BeanUtils.copyProperties(comMngPopulationDO,comMngPopulationVO);
+ if(StringUtils.isNotEmpty(comMngPopulationDO.getBirthday())){//计算年龄
+ comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
+ }
- //查询家庭成员信息
- List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = populationDAO.listFamilyByUserId(comMngPopulationDO.getId());
- if(!comMngFamilyInfoVOS.isEmpty()){
+ ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
+ BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
+
+ //查询户主关系信息
+ List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
+ if (!comMngFamilyInfoVOS.isEmpty()) {
comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+
+ //查询当前用户电子档信息
+ if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
+ UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
+ if(electronicFileVO != null){
+ comMngPopulationVO.setUserElectronicFileVO(electronicFileVO);
+ //查询家庭成员信息
+ 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 ->{
+
+ });
+ comMngPopulationVO.setHouseList(houseList);
+ }
+
+ //查询当前实有人口车辆信息
+ List<ComMngPopulationCarVO> carList = comMngCarDAO.getPopulationCarListByIdCard(comMngPopulationDO.getCardNo());
+ if(!carList.isEmpty()){
+ comMngPopulationVO.setCarList(carList);
}
return R.ok(comMngPopulationVO);
}
@@ -125,15 +187,72 @@
Page page = new Page<>();
Long pageNum = comMngPopulationVO.getPageNum();
Long pageSize = comMngPopulationVO.getPageSize();
- if (null==pageNum||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null==pageSize||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
+
+ if(comMngPopulationVO.getHouseId() != null){
+ ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(comMngPopulationVO.getHouseId());
+ if(houseDO != null){
+ switch (comMngPopulationVO.getLevel()){
+ case 1:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ break;
+ case 2:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ break;
+ case 3:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ comMngPopulationVO.setFloor(houseDO.getFloor());
+ break;
+ case 4:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ comMngPopulationVO.setFloor(houseDO.getFloor());
+ comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
+ break;
+ case 5:
+ comMngPopulationVO.setRoad(houseDO.getAlley());
+ comMngPopulationVO.setDoorNo(houseDO.getHouseNum());
+ comMngPopulationVO.setFloor(houseDO.getFloor());
+ comMngPopulationVO.setUnitNo(houseDO.getUnitNo());
+ comMngPopulationVO.setHouseNo(houseDO.getHouseNo());
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())){
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)),"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()) + 1)),"yyyy-MM-dd");
+ if(StringUtils.isNotEmpty(ageEndTime)){
+ comMngPopulationVO.setAgeEndTime(ageEndTime);
+ }
+ }
+
IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
+ if(!iPage.getRecords().isEmpty()){
+ iPage.getRecords().forEach(populDO -> {
+ if(StringUtils.isNotEmpty(populDO.getBirthday())){
+ populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -146,7 +265,7 @@
@Override
public R deletePopulation(Long populationId) {
int delete = populationDAO.deleteById(populationId);
- if (delete>0) {
+ if (delete > 0) {
return R.ok();
}
return R.fail();
@@ -160,15 +279,280 @@
@Override
public R listPopulationAll() {
List<ComMngPopulationDO> populationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().orderByDesc(ComMngPopulationDO::getCreateAt));
- List<ComMngPopulationVO> populationVOS=new ArrayList<>();
+ List<ComMngPopulationVO> populationVOS = new ArrayList<>();
if (!ObjectUtils.isEmpty(populationDOS)) {
populationDOS.forEach(comActDO -> {
- ComMngPopulationVO populationVO=new ComMngPopulationVO();
- BeanUtils.copyProperties(comActDO,populationVO);
+ ComMngPopulationVO populationVO = new ComMngPopulationVO();
+ BeanUtils.copyProperties(comActDO, populationVO);
populationVOS.add(populationVO);
});
}
return R.ok(populationVOS);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception{
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ //查询该社区
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ //查询该社区的省市区地址
+ AreaAddressVO areaAddressVO = populationDAO.getAreaAddress(comActDO.getProvinceCode(),comActDO.getCityCode(),comActDO.getAreaCode());
+ //查询社区上街道信息
+ String street = "";
+ if(comActDO.getStreetId() != null){
+ ComStreetDO streetDO = comStreetDAO.selectById(comActDO.getStreetId());
+ if(streetDO != null){
+ street = streetDO.getName();
+ }
+ }
+ int index = 2;
+ //处理实有人口信息
+ List<ComMngPopulationDO> savePopulList = new ArrayList<>();
+ List<ComMngPopulationHouseDO> saveHouseList = new ArrayList<>();
+ for (ComMngPopulationServeExcelVO vo : list) {
+ String address = "";
+ //查询街路巷是否存在
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+ if (comMngVillageDO == null) {
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("查无:" + vo.getRoad() + vo.getDoorNo() + "小区/房租地址，请先新建地址");
+ importErrorVO.setErrorPosition("第" + index + "行，第7、8列");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+
+ if(!comMngVillageDO.getHouseNum().contains("号")){
+ comMngVillageDO.setHouseNum(comMngVillageDO.getHouseNum() + "号");
+ }
+
+ address = areaAddressVO.getProvince() + areaAddressVO.getCity()
+ + areaAddressVO.getDistrict() + street + comMngVillageDO.getAlley() + comMngVillageDO.getHouseNum()
+ + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
+ vo.setAddress(address);
+
+ //先判断房屋是否存在
+ ComMngPopulationHouseDO populationHouseDO = comMngPopulationHouseDAO.selectOne(new QueryWrapper<ComMngPopulationHouseDO>().lambda()
+ .eq(ComMngPopulationHouseDO::getCommunityId,communityId).eq(ComMngPopulationHouseDO::getVillageId,comMngVillageDO.getVillageId())
+ .eq(ComMngPopulationHouseDO::getFloor,vo.getFloor()).eq(ComMngPopulationHouseDO::getUnitNo,vo.getUnitNo())
+ .eq(ComMngPopulationHouseDO::getHouseNo,vo.getHouseNo()));
+ if(populationHouseDO == null){
+ boolean isExits = true;
+ if(!saveHouseList.isEmpty()){
+ for (ComMngPopulationHouseDO saveHouse:saveHouseList){
+ if(saveHouse.getVillageId().equals(comMngVillageDO.getVillageId())
+ && saveHouse.getFloor().equals(vo.getFloor()) && saveHouse.getUnitNo().equals(vo.getUnitNo())
+ && saveHouse.getHouseNo().equals(vo.getHouseNo())){
+ populationHouseDO = saveHouse;
+ isExits = false;
+ break;
+ }
+ }
+ }
+ if(isExits){
+ //查询该房屋未建立，执行建立房屋信息
+ populationHouseDO = new ComMngPopulationHouseDO();
+ populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
+ populationHouseDO.setCommunityId(communityId);
+ populationHouseDO.setFloor(vo.getFloor());
+ populationHouseDO.setUnitNo(vo.getUnitNo());
+ populationHouseDO.setHouseNo(vo.getHouseNo());
+ populationHouseDO.setAddress(address);
+ populationHouseDO.setUpdateAt(new Date());
+ if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
+ populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
+ }
+ if(vo.getHouseStatus() != null){
+ populationHouseDO.setStatus(vo.getHouseStatus());
+ }
+ if(vo.getHousePurpose() != null){
+ populationHouseDO.setPurpose(vo.getHousePurpose());
+ }
+ if(vo.getControlStatus() != null){
+ populationHouseDO.setControlStatus(vo.getControlStatus());
+ }
+ comMngPopulationHouseDAO.insert(populationHouseDO);
+ saveHouseList.add(populationHouseDO);
+ }
+ }
+
+ if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
+ //空户处理完房屋信息，直接返回
+ continue;
+ }
+
+ //判断实有人口是否已存在
+ ComMngPopulationDO populationDO = this.baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
+ .eq(ComMngPopulationDO::getCardNo,AESUtil.encrypt128(vo.getCardNo(), aesKey)).eq(ComMngPopulationDO::getName,vo.getName()));
+ if(populationDO == null){
+ if(savePopulList.size() > 0){
+ String name = vo.getName();
+ String cardNo = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ if(savePopulList.stream().anyMatch(populDo -> name.equals(populDo.getName()) && cardNo.equals(populDo.getCardNo()))){
+ //实有人口已存在，判断录入的这个房屋信息是否是用户的居住地
+ for (ComMngPopulationDO savePopul:savePopulList) {
+ if(savePopul.getName().equals(name) && savePopul.getCardNo().equals(cardNo)){
+ if(vo.getIsResidence() != null && vo.getIsResidence().equals(PopulIsOksEnum.YES.getCode())) {
+ savePopul.setRoad(vo.getRoad());
+ savePopul.setDoorNo(vo.getDoorNo());
+ savePopul.setFloor(vo.getFloor());
+ savePopul.setUnitNo(vo.getUnitNo());
+ savePopul.setHouseNo(vo.getHouseNo());
+ savePopul.setHouseAddress(vo.getAddress());
+ savePopul.setHouseId(populationHouseDO.getId());
+ savePopul.setCardNo(cardNo);
+ savePopul.setPhone(AESUtil.encrypt128(savePopul.getPhone(), aesKey));
+ this.baseMapper.updateById(savePopul);
+ }
+ populationDO = savePopul;
+ break;
+ }
+ }
+ }else{
+ //不存在实有人口则新增
+ populationDO = new ComMngPopulationDO();
+ BeanUtils.copyProperties(vo,populationDO);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDO.setHouseAddress(address);
+ populationDO.setHouseId(populationHouseDO.getId());
+ populationDO.setUpdateAt(new Date());
+ this.baseMapper.insert(populationDO);
+ savePopulList.add(populationDO);
+ index++;
+ }
+ }else {
+ //不存在实有人口则新增
+ populationDO = new ComMngPopulationDO();
+ BeanUtils.copyProperties(vo,populationDO);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDO.setHouseAddress(address);
+ populationDO.setHouseId(populationHouseDO.getId());
+ populationDO.setUpdateAt(new Date());
+ this.baseMapper.insert(populationDO);
+ savePopulList.add(populationDO);
+ index++;
+ }
+ }else {
+ //实有人口已存在，判断录入的这个房屋信息是否是用户的居住地
+ if(vo.getIsResidence() != null && vo.getIsResidence().equals(PopulIsOksEnum.YES.getCode())){
+ populationDO.setRoad(vo.getRoad());
+ populationDO.setDoorNo(vo.getDoorNo());
+ populationDO.setFloor(vo.getFloor());
+ populationDO.setUnitNo(vo.getUnitNo());
+ populationDO.setHouseNo(vo.getHouseNo());
+ populationDO.setHouseAddress(address);
+ populationDO.setCardNo(AESUtil.encrypt128(populationDO.getCardNo(), aesKey));
+ populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+ populationDO.setHouseId(populationHouseDO.getId());
+ this.baseMapper.updateById(populationDO);
+ }
+ }
+
+ //处理实有房屋居住信息
+ if(populationDO != null){
+ ComMngPopulationHouseUserDO populationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>()
+ .lambda().eq(ComMngPopulationHouseUserDO::getHouseId,populationHouseDO.getId())
+ .eq(ComMngPopulationHouseUserDO::getPopulId,populationDO.getId()));
+ if(populationHouseUserDO == null){
+ populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setHouseId(populationHouseDO.getId());
+ populationHouseUserDO.setPopulId(populationDO.getId());
+ populationHouseUserDO.setRelation(populationDO.getRelation());
+ comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
+ }
+ }
+ }
+ //如果有错误，返回错误
+ //暂时注释，等客户完成任务需要恢复
+ /*if(!populationImportErrorVOList.isEmpty()){
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+ this.saveBatch(populationDOList);*/
+
+ if(!populationImportErrorVOList.isEmpty()){
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+ return R.ok();
+ }
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @Override
+ public R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId) {
+ 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));
+ 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);
+ BeanUtils.copyProperties(vo, comMngPopulationDO);
+ if (comMngVillageDO == null) {
+ throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
+ }
+ 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());
+ 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()
+ .eq(ComMngPopulationDO::getCardNo, population.getCardNo()));
+ if(comMngPopulationDO != null){
+ population.setId(comMngPopulationDO.getId());
+ BeanUtils.copyProperties(population,comMngPopulationDO);
+ this.populationDAO.updateById(population);
+ }else{
+ this.populationDAO.insert(population);
+ }
+ }catch (Exception e){
+ log.error("导入实有人口失败");
+ }
+ });
+ }
+ return R.ok("共计导入实有人口数量：" + populationDOList.size());
+ }
+
+ public boolean isNumeric(String str) {
+ for (int i = 0; i < str.length(); i++) {
+ System.out.println(str.charAt(i));
+ if (!Character.isDigit(str.charAt(i))) {
+ return false;
+ }
+ }
+ return true;
}
/**
@@ -190,4 +574,220 @@
}
return R.ok();
}
+
+ /**
+ * 批量删除实有人口
+ * @param Ids
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R deletePopulations(List<Long> Ids) {
+ if(!Ids.isEmpty()){
+ Ids.forEach(id -> {
+ //清除用户房屋居住信息
+ comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
+ });
+ }
+ int delete = populationDAO.deleteBatchIds(Ids);
+ if (delete > 0) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 根据社区id查询所有实有人口
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @Override
+ public R getPopulationListByCommunityId(Long 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 -> {
+ ComMngPopulationVO populationVO=new ComMngPopulationVO();
+ BeanUtils.copyProperties(populationDO,populationVO);
+ resultList.add(populationVO);
+ });
+ }
+ return R.ok(resultList);
+ }
+
+ /**
+ * 根据id集合查询实有人口
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @Override
+ public R getPopulationLists(List<Long> Ids) {
+ List<ComMngPopulationDO> list = populationDAO.selectBatchIds(Ids);
+ List<ComMngPopulationVO> resultList = new ArrayList<>();
+ if(list.size() > 0){
+ list.forEach(populationDO -> {
+ ComMngPopulationVO populationVO = new ComMngPopulationVO();
+ BeanUtils.copyProperties(populationDO,populationVO);
+ resultList.add(populationVO);
+ });
+ }
+ return R.ok(resultList);
+ }
+
+ @Override
+ public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception{
+ ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
+ if(populationDO == null){
+ return R.fail();
+ }
+ BeanUtils.copyProperties(vo,populationDO);
+ if(StringUtils.isEmpty(vo.getLabel())){
+ populationDO.setLabel(null);
+ }
+ if(StringUtils.isEmpty(vo.getRemark())){
+ populationDO.setRemark(null);
+ }
+ populationDO.setCardNo(null);
+ populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
+
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ if(comActDO != null){
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ }
+
+ //查询当前用户所有房屋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()){
+ for (ComMngPopulationHouseEditDTO houseEditDto:vo.getHouseEditDTOList()) {
+ ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setPopulId(populationDO.getId());
+ populationHouseUserDO.setHouseId(houseEditDto.getId());
+ if(houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)){
+ houseId = houseEditDto.getId();//居住地
+ }
+ populationHouseUserDOList.add(populationHouseUserDO);
+
+ //修改房屋信息不为空户
+ comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(),2);
+ }
+ }
+ comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);
+
+ if(houseId != null){//居住地更新
+ ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(houseId);
+ if(houseDO != null){
+ populationDO.setRoad(houseDO.getAlley());
+ populationDO.setDoorNo(houseDO.getHouseNum());
+ 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())
+ .eq(ComMngVillageDO::getCommunityId,communityId));
+ if (comMngVillageDO != null) {
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ }
+ }
+ }
+ }
+ populationDO.setUpdateAt(new Date());
+ if(populationDAO.updateById(populationDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail("修改失败");
+ }
+ }
+
+ @Override
+ public R specialInputUser(PageInputUserDTO pageInputUserDTO){
+ IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum()
+ ,pageInputUserDTO.getPageSize()), pageInputUserDTO);
+ return R.ok(iPage);
+ }
+
+ /**
+ * 删除特殊群体人员
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ @Override
+ public R deleteSpecialInputUser(Long id){
+ //查询特殊群体人员
+ ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
+ if(populationDO == null){
+ return R.fail("未查询到该记录");
+ }
+ populationDO.setLabel(null);
+ if(this.baseMapper.updateById(populationDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail();
+ }
+ }
+
+ /**
+ * 查询实有人口电子档信息
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @Override
+ public R electronicArchivesPopulation(Long populationId){
+ ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
+ if (ObjectUtils.isEmpty(comMngPopulationDO)) {
+ return R.fail("用户信息不存在");
+ }
+ //查询当前用户电子档信息
+ if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
+ UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
+ if(electronicFileVO != null){
+ return R.ok(electronicFileVO);
+ }
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO) {
+ UserElectronicFileVO electronicFileVO = populationDAO.getSysUserById(userElectronicFileVO.getUserId());
+ if(electronicFileVO==null){
+ return R.fail("id有误！");
+ }
+ populationDAO.updateSysUserElectronicFile(userElectronicFileVO);
+ return R.ok();
+ }
+
+ /**
+ * 实有人口统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getPopulationTotalByAdmin(Long communityId){
+ return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId));
+ }
+
+
+ public static void main(String[] args) {
+// List<ComMngPopulationHouseUserDO> distinctClass = populationHouseUserDOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPopulId() + ";" + o.getHouseId() + ";" + o.getId() + ";" + o.getRelation()))), ArrayList::new));
+ }
}
--
Gitblit v1.7.1