From 0b5e08cea6c15f4fef67d9944f969be5b42258f7 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 16:59:26 +0800
Subject: [PATCH] Merge branch 'test_elder_cedoo' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 448 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 357 insertions(+), 91 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 25c247a..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
@@ -7,34 +7,28 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.ComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+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.dtos.community.PageComActDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.InputUserInfoVO;
-import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
-import com.panzhihua.common.utlis.AgeUtils;
-import com.panzhihua.service_community.dao.ComActDAO;
-import com.panzhihua.service_community.dao.ComActVillageDAO;
-import com.panzhihua.service_community.dao.ComMngPopulationDAO;
-import com.panzhihua.service_community.model.dos.ComActDO;
-import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
-import com.panzhihua.service_community.model.dos.ComMngVillageDO;
+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 org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
@@ -43,8 +37,7 @@
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -58,6 +51,16 @@
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;
@@ -130,11 +133,15 @@
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
return R.fail("用户信息不存在");
}
+ 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);
+ List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO.getHouseId(),comMngPopulationDO.getId());
if (!comMngFamilyInfoVOS.isEmpty()) {
comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
@@ -150,6 +157,21 @@
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);
}
@@ -173,17 +195,64 @@
}
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);
- iPage.getRecords().forEach(vo->{
- //获取用户生日
- String date = vo.getCardNo().substring(6, 14);
- String year = date.substring(0,4);
- String month = date.substring(4,6);
- String day = date.substring(6,8);
- String birthday = year + "-" + month + "-" + day;
- //设置用户年龄
- vo.setBirthday(birthday);
- });
+ if(!iPage.getRecords().isEmpty()){
+ iPage.getRecords().forEach(populDO -> {
+ if(StringUtils.isNotEmpty(populDO.getBirthday())){
+ populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -222,48 +291,187 @@
}
@Override
- public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) {
+ @Transactional(rollbackFor = Exception.class)
+ public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception{
List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
- 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();
- int index = 2;
- for (ComMngPopulationServeExcelVO vo : list) {
- //判断DB和exel数据重复判断
- boolean result = comMngPopulationDOS.stream().anyMatch(population -> population.getCardNo().equals(vo.getCardNo()));
- if (result) {
- ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
- importErrorVO.setErrorPosition("第" + index + "行，第2列");
- populationImportErrorVOList.add(importErrorVO);
- index++;
- continue;
-// return R.fail(501,"导入实有人口已存在(" + vo.getCardNo() + ")");
+ //查询该社区的省市区地址
+ 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();
}
-
- ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
+ }
+ 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));
-// 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) {
ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
- importErrorVO.setErrorMsg("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
+ importErrorVO.setErrorMsg("查无:" + vo.getRoad() + vo.getDoorNo() + "小区/房租地址，请先新建地址");
importErrorVO.setErrorPosition("第" + index + "行，第7、8列");
populationImportErrorVOList.add(importErrorVO);
index++;
continue;
}
- List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
- comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
- comMngPopulationDO.setActId(comActDO.getCommunityId());
- comMngPopulationDO.setStreetId(comActDO.getStreetId());
- comMngPopulationDO.setLabel(Joiner.on(",").join(userTag));
- comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
- populationDOList.add(comMngPopulationDO);
- index++;
+
+ 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);
+ }
+ }
}
//如果有错误，返回错误
//暂时注释，等客户完成任务需要恢复
@@ -272,11 +480,10 @@
}
this.saveBatch(populationDOList);*/
- this.saveBatch(populationDOList);
if(!populationImportErrorVOList.isEmpty()){
return R.fail(JSON.toJSONString(populationImportErrorVOList));
}
- return R.ok("共计导入实有人口数量：" + populationDOList.size());
+ return R.ok();
}
/**
@@ -374,7 +581,14 @@
* @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();
@@ -421,45 +635,82 @@
}
@Override
- public R editPopulation(EditComMngPopulationVO vo, Long communityId) {
- ComActDO comActDO = comActDAO.selectById(communityId);
+ public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception{
ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
- if(populationDO==null){
+ if(populationDO == null){
return R.fail();
}
- String cardNo = populationDO.getCardNo();
BeanUtils.copyProperties(vo,populationDO);
- try {
- //TODO 修改拦截器时候需要维护加密操作
- if(!cardNo.equals(vo.getCardNo())){//判断是否修改身份证号码
- //判断要修改的身份证号码是否已存在
- ComMngPopulationDO cardNoDO = populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>()
- .lambda().eq(ComMngPopulationDO::getCardNo,vo.getCardNo()));
- if(cardNoDO != null){
- return R.fail("您输入的身份证已存在，请重新输入");
- }
- populationDO.setCardNo(AESUtil.encrypt128(vo.getCardNo(), aesKey));
- }else{
- populationDO.setCardNo(AESUtil.encrypt128(cardNo, aesKey));
- }
- populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
- } catch (Exception e) {
- e.printStackTrace();
- return R.fail();
+ 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());
}
- ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
- if (comMngVillageDO == null) {
- return R.fail("街道巷:" + vo.getRoad() + vo.getDoorNo() + "不存在！");
-// throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
+ //查询当前用户所有房屋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);
+ }
+ });
}
- populationDO.setVillageId(comMngVillageDO.getVillageId());
- populationDO.setActId(comActDO.getCommunityId());
- populationDO.setStreetId(comActDO.getStreetId());
- if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
- populationDO.setVillageName(comMngVillageDO.getGroupAt());
+
+
+ //更新用户的房屋信息
+ 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);
+ }
}
-// this.updateById(populationDO);
+ 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{
@@ -524,4 +775,19 @@
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