From 6af3a9c58565a5616105d8c76b1cf91bae36d38a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 16 六月 2021 21:25:41 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 478 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 321 insertions(+), 157 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 669fd64..0c11e71 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
@@ -9,6 +9,8 @@
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.PopulCultureLevelEnum;
+import com.panzhihua.common.enums.PopulHouseUseEnum;
import com.panzhihua.common.enums.PopulIsOksEnum;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
@@ -17,6 +19,8 @@
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.screen.ComActPopulationCultureVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
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;
@@ -24,6 +28,8 @@
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.screen.ComActPopulationScreenVO;
+import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.utlis.*;
import com.panzhihua.service_community.dao.*;
@@ -38,7 +44,13 @@
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.math.BigDecimal;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.stream.Collectors;
@@ -67,6 +79,8 @@
private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
@Resource
private EventResourceService eventResourceService;
+ @Resource
+ private BigScreenDAO bigScreenDAO;
@Value("${domain.aesKey:}")
private String aesKey;
@@ -139,18 +153,18 @@
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);
+// }
//查询当前用户电子档信息
if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
@@ -305,27 +319,26 @@
//查询该社区的省市区地址
AreaAddressVO areaAddressVO = populationDAO.getAreaAddress(comActDO.getProvinceCode(),comActDO.getCityCode(),comActDO.getAreaCode());
//查询社区上街道信息
- String street = "";
+ String streetName = "";
if(comActDO.getStreetId() != null){
ComStreetDO streetDO = comStreetDAO.selectById(comActDO.getStreetId());
if(streetDO != null){
- street = streetDO.getName();
+ streetName = streetDO.getName();
}
}
- int index = 2;
+ StringBuilder areaPath = new StringBuilder();
+ areaPath.append(areaAddressVO.getProvince()).append(">").append(areaAddressVO.getCity()).append(">").append(areaAddressVO.getDistrict()).append(">");
//处理实有人口信息
- 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列");
+ importErrorVO.setErrorMsg("街路巷或小区号不存在");
+ importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:"+vo.getDoorNo());
populationImportErrorVOList.add(importErrorVO);
- index++;
+// index++;
continue;
}
@@ -334,7 +347,7 @@
}
address = areaAddressVO.getProvince() + areaAddressVO.getCity()
- + areaAddressVO.getDistrict() + street + comMngVillageDO.getAlley() + comMngVillageDO.getHouseNum()
+ + areaAddressVO.getDistrict() + streetName + comMngVillageDO.getAlley() + comMngVillageDO.getHouseNum()
+ vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
vo.setAddress(address);
@@ -344,137 +357,40 @@
.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);
- }
+ //房屋信息不存在建立房屋信息
+ populationHouseDO = savePopulationHouse(vo,comMngVillageDO,communityId,address,areaPath,comActDO.getName());
}
if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
//空户处理完房屋信息，直接返回
continue;
}
-
+ String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
//判断实有人口是否已存在
ComMngPopulationDO populationDO = this.baseMapper.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
- .eq(ComMngPopulationDO::getCardNo,AESUtil.encrypt128(vo.getCardNo(), aesKey)).eq(ComMngPopulationDO::getName,vo.getName()));
+ .eq(ComMngPopulationDO::getCardNo,cardNoAES));
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++;
- }
+ //不存在实有人口,则新增
+ populationDO = savePopulationDO(vo,comActDO,comMngVillageDO,cardNoAES);
}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(vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())){
+ populationDO = updatePopulationHouseUse(vo,populationDO,cardNoAES);
}
}
- //处理实有房屋居住信息
+ //处理实有人口房屋居住信息
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.setId(Snowflake.getId());
populationHouseUserDO.setHouseId(populationHouseDO.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
- populationHouseUserDO.setRelation(populationDO.getRelation());
+ populationHouseUserDO.setRelation(vo.getRelation());
+ populationHouseUserDO.setRelationId(vo.getIsRent());
comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
}
}
@@ -490,6 +406,79 @@
return R.fail(JSON.toJSONString(populationImportErrorVOList));
}
return R.ok();
+ }
+
+ private ComMngPopulationDO updatePopulationHouseUse(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO,String cardNoAES) throws Exception {
+ populationDO.setRoad(vo.getRoad());
+ populationDO.setDoorNo(vo.getDoorNo());
+ populationDO.setFloor(vo.getFloor());
+ populationDO.setUnitNo(vo.getUnitNo());
+ populationDO.setHouseNo(vo.getHouseNo());
+ populationDO.setCardNo(cardNoAES);
+ populationDO.setCardNoStr(vo.getCardNo());
+ if(StringUtils.isNotEmpty(populationDO.getPhone())){
+ populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+ }
+ this.baseMapper.updateById(populationDO);
+ return populationDO;
+ }
+
+ private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO,String cardNoAES) {
+ 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());
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setLabel(Joiner.on(",").join(userTag));
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDO.setCardNo(cardNoAES);
+ populationDO.setCardNoStr(vo.getCardNo());
+ populationDO.setUpdateAt(new Date());
+ this.baseMapper.insert(populationDO);
+ return populationDO;
+ }
+
+ private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId, String address, StringBuilder areaPath,String actName) {
+ //查询该房屋未建立，执行建立房屋信息
+ ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
+ populationHouseDO.setId(Snowflake.getId());
+ populationHouseDO.setStreetId(comMngVillageDO.getStreetId());
+ populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
+ populationHouseDO.setAlley(vo.getRoad());
+ populationHouseDO.setHouseNum(vo.getDoorNo());
+ populationHouseDO.setCode(vo.getDoorNo());
+ populationHouseDO.setStatus(vo.getIsRent());
+ populationHouseDO.setCommunityId(communityId);
+ populationHouseDO.setFloor(vo.getFloor());
+ populationHouseDO.setUnitNo(vo.getUnitNo());
+ populationHouseDO.setHouseNo(vo.getHouseNo());
+ populationHouseDO.setAddress(address);
+ 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(address);
+ populationHouseDO.setPath(areaPath.toString()+ housePath.toString());
+ try {
+ populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ }catch (Exception e){
+ }
+
+ if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
+ populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
+ }
+ if(vo.getHouseStatus() != null){
+ populationHouseDO.setStatus(vo.getHouseStatus());
+ }
+ if(vo.getHousePurpose() != null){
+ populationHouseDO.setPurpose(vo.getHousePurpose());
+ }
+ if(vo.getControlStatus() != null){
+ populationHouseDO.setControlStatus(vo.getControlStatus());
+ }
+ comMngPopulationHouseDAO.insert(populationHouseDO);
+ return populationHouseDO;
}
/**
@@ -792,6 +781,11 @@
return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId));
}
+ /**
+ * 首页大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
@Override
public R getScreenIndex(Long communityId){
//创建统计返回参数
@@ -845,6 +839,9 @@
eventGridStatisticsVO.setGridStatisticsList(gridStatisticsList);
statisticsVO.setEventGridStatisticsVO(eventGridStatisticsVO);
+ //查询党建数据
+ BigScreenStatisticPartyBuild statisticPartyBuild = bigScreenDAO.partybuild(communityId);
+ statisticsVO.setStatisticPartyBuild(statisticPartyBuild);
//查询特殊人群统计
List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
@@ -924,6 +921,11 @@
return agePopulationList;
}
+ /**
+ * 事件大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
@Override
public R getScreenEvent(Long communityId){
//创建统计返回参数
@@ -944,37 +946,39 @@
//查询事件播报模块数据
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);
+ if(newStatisticsVO != null){
+ //查询事件资源文件
+ 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);
//查询网格数据
@@ -988,6 +992,12 @@
return R.ok(statisticsVO);
}
+ /**
+ * 民生大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
public R getScreenCivil(Long communityId){
//创建统计返回参数
CivilStatisticsVO civilStatisticsVO = new CivilStatisticsVO();
@@ -1051,6 +1061,160 @@
}
+
+
+ @Override
+ public R editTagPopulationByCardNo(ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO) {
+ ComMngPopulationDO comMngPopulationDO = getPopulationByCardNo(comMngPopulationTagCardNoDTO.getCardNo());
+ if (comMngPopulationDO == null) {
+ return R.fail("未查询到人口记录");
+ }
+ ComMngPopulationDO comMngPopulation = new ComMngPopulationDO();
+ if(comMngPopulationDO.getLabel()!=null) {
+ if(!comMngPopulationDO.getLabel().contains(comMngPopulationTagCardNoDTO.getLabel())) {
+ comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel().concat(",").concat(comMngPopulationDO.getLabel()));
+ }
+ }else{
+ comMngPopulation.setLabel(comMngPopulationTagCardNoDTO.getLabel());
+ }
+ comMngPopulation.setCardNo(null);
+ comMngPopulation.setId(comMngPopulationDO.getId());
+ int nub = populationDAO.updateById(comMngPopulation);
+ if (nub < 1) {
+ return R.fail();
+ }
+ return R.ok();
+ }
+
+ @Override
+ public ComMngPopulationDO getPopulationByCardNo(String cardNo) {
+ try {
+ String aesCardNo = AESUtil.encrypt128(cardNo, aesKey);
+ return baseMapper.selectOne(
+ new QueryWrapper<ComMngPopulationDO>()
+ .eq("card_no",aesCardNo)
+ );
+ } catch (Exception e) {
+ log.error("根据身份证查询业务-加密证件信息出错");
+ }
+ return null;
+ }
+
+ @Override
+ public R screenStatistic(Long communityId) {
+ ComActPopulationScreenVO comActPopulationScreenVO = new ComActPopulationScreenVO();
+ ComMngPopulationTotalVO vo = populationDAO.getPopulationTotalByAdmin(communityId);
+ comActPopulationScreenVO.setTotalNum(vo.getPopulationTotal() == null ? 0 : vo.getPopulationTotal());
+ comActPopulationScreenVO.setLocalNum(vo.getLocalTotal() == null ? 0 : vo.getLocalTotal().longValue());
+ comActPopulationScreenVO.setOutNum(vo.getOutTotal() == null ? 0 : vo.getOutTotal().longValue());
+ comActPopulationScreenVO.setSpecialNum(vo.getSpecialTotal() == null ? 0 : vo.getSpecialTotal().longValue());
+ //统计已使用社区通人数
+ Long count = populationDAO.countUsedCommunityPopulation(communityId);
+ comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
+
+ //统计性别
+ 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);
+ comActPopulationScreenVO.setManPoint(manPoint);
+ comActPopulationScreenVO.setWomanPoint(100 - manPoint);
+
+ //统计年龄结构
+ setAgeGroup(comActPopulationScreenVO,communityId);
+ //统计学历
+ setCultureGroup(comActPopulationScreenVO,communityId);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ comActPopulationScreenVO.setGridStatisticsList(gridStatisticsList);
+
+ return R.ok(comActPopulationScreenVO);
+ }
+
+
+ private void setCultureGroup(ComActPopulationScreenVO comActPopulationScreenVO, Long communityId) {
+ Map<String,Long> cultureMap = populationDAO.countByCulture(communityId);
+ List<ComActPopulationCultureVO> cultureGroup = new ArrayList<>();
+ ComActPopulationCultureVO xx = new ComActPopulationCultureVO();
+ xx.setLevel(PopulCultureLevelEnum.XX.getName());
+ xx.setNum(cultureMap.get("xx"));
+ cultureGroup.add(xx);
+
+ ComActPopulationCultureVO cz = new ComActPopulationCultureVO();
+ cz.setLevel(PopulCultureLevelEnum.CZ.getName());
+ cz.setNum(cultureMap.get("cz"));
+ cultureGroup.add(cz);
+
+ ComActPopulationCultureVO gz = new ComActPopulationCultureVO();
+ gz.setLevel(PopulCultureLevelEnum.GZ.getName());
+ gz.setNum(cultureMap.get("gz"));
+ cultureGroup.add(gz);
+
+ ComActPopulationCultureVO zz = new ComActPopulationCultureVO();
+ zz.setLevel(PopulCultureLevelEnum.ZZ.getName());
+ zz.setNum(cultureMap.get("zz"));
+ cultureGroup.add(zz);
+
+ ComActPopulationCultureVO dz = new ComActPopulationCultureVO();
+ dz.setLevel(PopulCultureLevelEnum.DZ.getName());
+ dz.setNum(cultureMap.get("dz"));
+ cultureGroup.add(dz);
+
+ ComActPopulationCultureVO bk = new ComActPopulationCultureVO();
+ bk.setLevel(PopulCultureLevelEnum.BK.getName());
+ bk.setNum(cultureMap.get("bk"));
+ cultureGroup.add(bk);
+
+ ComActPopulationCultureVO ss = new ComActPopulationCultureVO();
+ ss.setLevel(PopulCultureLevelEnum.SS.getName());
+ ss.setNum(cultureMap.get("ss"));
+ cultureGroup.add(ss);
+
+ ComActPopulationCultureVO bs = new ComActPopulationCultureVO();
+ bs.setLevel(PopulCultureLevelEnum.BS.getName());
+ bs.setNum(cultureMap.get("bs"));
+ cultureGroup.add(bs);
+
+ ComActPopulationCultureVO qt = new ComActPopulationCultureVO();
+ qt.setLevel(PopulCultureLevelEnum.QT.getName());
+ qt.setNum(cultureMap.get("qt"));
+ cultureGroup.add(qt);
+
+ comActPopulationScreenVO.setCultureGroup(cultureGroup);
+ }
+
+ private void setAgeGroup(ComActPopulationScreenVO comActPopulationScreenVO,Long communityId) {
+ Map<String,Long> ageMap = populationDAO.countByAge(communityId);
+ List<ComMngPopulationAgeVO> ageList = new ArrayList<>();
+ ComMngPopulationAgeVO ageVO16 = new ComMngPopulationAgeVO();
+ ageVO16.setGroup("0-16岁");
+ ageVO16.setNum(ageMap.get("age16"));
+ ageList.add(ageVO16);
+ ComMngPopulationAgeVO ageVO25 = new ComMngPopulationAgeVO();
+ ageVO25.setGroup("16-25岁");
+ ageVO25.setNum(ageMap.get("age25"));
+ ageList.add(ageVO25);
+
+ ComMngPopulationAgeVO ageVO35 = new ComMngPopulationAgeVO();
+ ageVO35.setGroup("25-35岁");
+ ageVO35.setNum(ageMap.get("age35"));
+ ageList.add(ageVO35);
+ ComMngPopulationAgeVO ageVO45 = new ComMngPopulationAgeVO();
+ ageVO45.setGroup("35-45岁");
+ ageVO45.setNum(ageMap.get("age45"));
+ ageList.add(ageVO45);
+ ComMngPopulationAgeVO ageVO55 = new ComMngPopulationAgeVO();
+ ageVO55.setGroup("45-55岁");
+ ageVO55.setNum(ageMap.get("age55"));
+ ageList.add(ageVO55);
+ ComMngPopulationAgeVO ageVO55over = new ComMngPopulationAgeVO();
+ ageVO55over.setGroup("55岁以上");
+ ageVO55over.setNum(ageMap.get("age55over"));
+ ageList.add(ageVO55over);
+ comActPopulationScreenVO.setAgeGroup(ageList);
+ }
+
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