From 602f2f840be38c1cf38e78d2d5b50fd44effaa08 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 16:53:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 796 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 707 insertions(+), 89 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 ede23e4..669fd64 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,46 +1,45 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
+import com.panzhihua.common.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.InputUserInfoVO;
-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.community.screen.civil.CivilPopulationStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
+import com.panzhihua.common.model.vos.community.screen.event.*;
+import com.panzhihua.common.model.vos.community.screen.index.*;
+import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.EventResourceVO;
+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 com.panzhihua.service_community.service.EventResourceService;
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 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.ArrayList;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -54,6 +53,20 @@
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 ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Resource
+ private EventResourceService eventResourceService;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -124,15 +137,47 @@
public R detailPopulation(Long populationId) {
ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
- return R.fail();
+ 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);
+ }
+
+ //查询当前用户电子档信息
+ 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);
}
@@ -156,7 +201,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);
+ if(!iPage.getRecords().isEmpty()){
+ iPage.getRecords().forEach(populDO -> {
+ if(StringUtils.isNotEmpty(populDO.getBirthday())){
+ populDO.setAge(AgeUtils.getAgeFromBirthTimes(populDO.getBirthday()));
+ }
+ });
+ }
return R.ok(iPage);
}
@@ -195,59 +297,199 @@
}
@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.setErrorPosition("第" + index + "行,第7,8列");
+ 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));
- if(!userTag.isEmpty()){
- //特殊群体插入
+
+ if(!comMngVillageDO.getHouseNum().contains("号")){
+ comMngVillageDO.setHouseNum(comMngVillageDO.getHouseNum() + "号");
}
- comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
- populationDOList.add(comMngPopulationDO);
- index++;
+
+ 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));
}
-
- this.saveBatch(populationDOList);
- return R.ok("共计导入实有人口数量：" + populationDOList.size());
+ return R.ok();
}
/**
@@ -345,7 +587,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();
@@ -392,42 +641,87 @@
}
@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();
}
BeanUtils.copyProperties(vo,populationDO);
- try {
- //TODO 修改拦截器时候需要维护加密操作
- populationDO.setCardNo(AESUtil.encrypt128(populationDO.getCardNo(), aesKey));
- populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+ 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));
- } catch (NoSuchPaddingException e) {
- e.printStackTrace();
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- } catch (InvalidKeyException e) {
- e.printStackTrace();
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- } catch (BadPaddingException e) {
- e.printStackTrace();
- } catch (IllegalBlockSizeException e) {
- e.printStackTrace();
+ 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) {
- 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());
- populationDO.setVillageName(comMngVillageDO.getGroupAt());
- this.updateById(populationDO);
- return R.ok();
+
+
+ //更新用户的房屋信息
+ 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
@@ -436,4 +730,328 @@
,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));
+ }
+
+ @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);
+ populationStatisticsVO.setSexPopulationList(sexPopulationList);
+ //查询实有人口年龄统计
+ List<ComMngPopulationDO> populationDOList = comMngPopulationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda()
+ .eq(ComMngPopulationDO::getActId,communityId));
+ List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(populationDOList);
+ populationStatisticsVO.setAgePopulationList(agePopulationList);
+ statisticsVO.setPopulationStatisticsVO(populationStatisticsVO);
+
+ //查询实有人口实时治理信息
+ List<IndexEventListStatisticsVO> eventListStatisticsList = comMngPopulationDAO.getScreenIndexByEventList(communityId);
+ statisticsVO.setEventListStatisticsList(eventListStatisticsList);
+
+ //查询社区治理动态信息
+ IndexDynamicStatisticsVO dynamicStatisticsVO = comMngPopulationDAO.getScreenIndexByDynamic(communityId);
+ 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());
+ gridStatisticsVO.setGridEventStatisticsList(gridEventList);
+ gridStatisticsList.add(gridStatisticsVO);
+ }
+ });
+ }
+ eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
+ statisticsVO.setEventGridStatisticsVO(eventGridStatisticsVO);
+
+
+ //查询特殊人群统计
+ List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
+
+ //查询特殊人群标签列表
+ List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+ IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
+ otherSpecialVO.setTitle("其他");
+ otherSpecialVO.setSum(0);
+ if(!userTagList.isEmpty()){
+ userTagList.forEach(userTag -> {
+ if(userTag != null){
+ if(userTag.getSysFlag().equals(0)){
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
+ }else{
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ specialStatisticsVO.setSum(count);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }
+ }
+ });
+ }
+ specialStatisticsVOList.add(otherSpecialVO);
+ statisticsVO.setSpecialStatisticsVOList(specialStatisticsVOList);
+ return R.ok(statisticsVO);
+ }
+
+ private List<IndexPopulationAgeStatisticsVO> statisticsAge(List<ComMngPopulationDO> populationDOList){
+ List<IndexPopulationAgeStatisticsVO> agePopulationList = new ArrayList<>();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO1 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO2 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO3 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO4 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO5 = new IndexPopulationAgeStatisticsVO();
+ IndexPopulationAgeStatisticsVO ageStatisticsVO6 = new IndexPopulationAgeStatisticsVO();
+ ageStatisticsVO1.setType(1);
+ ageStatisticsVO2.setType(2);
+ ageStatisticsVO3.setType(3);
+ ageStatisticsVO4.setType(4);
+ ageStatisticsVO5.setType(5);
+ ageStatisticsVO6.setType(6);
+
+ if(populationDOList.isEmpty()){
+ ageStatisticsVO1.setSum(0);
+ ageStatisticsVO2.setSum(0);
+ ageStatisticsVO3.setSum(0);
+ ageStatisticsVO4.setSum(0);
+ ageStatisticsVO5.setSum(0);
+ ageStatisticsVO6.setSum(0);
+ }else{
+ populationDOList.forEach(population -> {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getCardNoStr());
+ if(age >= 0 && age < 16){
+ ageStatisticsVO1.setSum(ageStatisticsVO1.getSum() + 1);
+ }else if(age >= 16 && age < 27){
+ ageStatisticsVO2.setSum(ageStatisticsVO2.getSum() + 1);
+ }else if(age >= 27 && age < 35){
+ ageStatisticsVO3.setSum(ageStatisticsVO3.getSum() + 1);
+ }else if(age >= 35 && age < 45){
+ ageStatisticsVO4.setSum(ageStatisticsVO4.getSum() + 1);
+ }else if(age >= 45 && age < 55){
+ ageStatisticsVO5.setSum(ageStatisticsVO5.getSum() + 1);
+ }else if(age >= 55){
+ ageStatisticsVO6.setSum(ageStatisticsVO6.getSum() + 1);
+ }
+ });
+ }
+ agePopulationList.add(ageStatisticsVO1);
+ agePopulationList.add(ageStatisticsVO2);
+ agePopulationList.add(ageStatisticsVO3);
+ agePopulationList.add(ageStatisticsVO4);
+ agePopulationList.add(ageStatisticsVO5);
+ agePopulationList.add(ageStatisticsVO6);
+ return agePopulationList;
+ }
+
+ @Override
+ public R getScreenEvent(Long communityId){
+ //创建统计返回参数
+ EventStatisticsVO statisticsVO = new EventStatisticsVO();
+
+ //查询页面左边数据
+ EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
+ //查询左上数据
+ EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
+ //查询时间频发月份
+ List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
+ leftTopStatisticsVO.setOftenMonth(monthList);
+ leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
+ //查询左下数据
+ EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
+ leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
+ statisticsVO.setLeftStatisticsVO(leftStatisticsVO);
+
+ //查询事件播报模块数据
+ EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
+ //查询事件资源文件
+ List<EventResourceDO> eventResourceDOList =
+ 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<>();
+ eventResourceDOList.forEach(eventResourceDO -> {
+ switch (eventResourceDO.getType()) {
+ case 1:
+ EventResourceVO picEventResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, picEventResourceVO);
+ picList.add(picEventResourceVO);
+ break;
+ case 2:
+ EventResourceVO audioResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, audioResourceVO);
+ audioList.add(audioResourceVO);
+ break;
+ case 3:
+ EventResourceVO videoResourceVO = new EventResourceVO();
+ BeanUtils.copyProperties(eventResourceDO, videoResourceVO);
+ videoList.add(videoResourceVO);
+ break;
+ }
+ });
+ newStatisticsVO.setAudios(audioList);
+ newStatisticsVO.setPics(picList);
+ newStatisticsVO.setVideos(videoList);
+ statisticsVO.setNewStatisticsVO(newStatisticsVO);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ statisticsVO.setGridStatisticsList(gridStatisticsList);
+
+ //查询社区事件列表
+ List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
+ statisticsVO.setGridIncidentList(gridIncidentList);
+
+ return R.ok(statisticsVO);
+ }
+
+ 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("其他");
+ otherSpecialVO.setSum(0);
+ if(!userTagList.isEmpty()){
+ userTagList.forEach(userTag -> {
+ if(userTag != null){
+ if(userTag.getSysFlag().equals(0)){
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ otherSpecialVO.setSum(otherSpecialVO.getSum() + count);
+ }else{
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ Integer count = comMngPopulationDAO.getSpecialStatisticsByLabel(userTag.getTagName());
+ specialStatisticsVO.setSum(count);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }
+ }
+ });
+ }
+ //计算特殊人群总数
+ specialStatisticsVOList.add(otherSpecialVO);
+ Integer specialNum = 0;
+ if(!specialStatisticsVOList.isEmpty()){
+ for (IndexSpecialStatisticsVO special:specialStatisticsVOList) {
+ specialNum += special.getSum();
+ }
+ }
+ civilStatisticsVO.setSpecialNum(specialNum);
+ civilStatisticsVO.setSpecialStatisticsList(specialStatisticsVOList);
+
+ //计算环比上月增长率
+ BigDecimal rate = BigDecimal.ZERO;
+ 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));
+ }
+ }
+ civilStatisticsVO.setRate(rate);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ civilStatisticsVO.setGridStatisticsList(gridStatisticsList);
+
+ //查询小区列表
+ List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
+ civilStatisticsVO.setVillageStatisticsList(villageStatisticsList);
+
+ return R.ok(civilStatisticsVO);
+ }
+
+
+ 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