From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 1110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,058 insertions(+), 52 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 d4d4531..a2ea07c 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,29 +1,50 @@
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.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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.PopulCultureLevelEnum;
-import com.panzhihua.common.enums.PopulHouseUseEnum;
-import com.panzhihua.common.enums.PopulIsOksEnum;
+import com.panzhihua.common.constants.Constants;
+import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
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.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;
+import com.panzhihua.common.model.vos.community.screen.event.*;
+import com.panzhihua.common.model.vos.community.screen.event.EventTransferRecordVO;
+import com.panzhihua.common.model.vos.community.screen.index.*;
+import com.panzhihua.common.model.vos.grid.*;
+import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
+import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationVillageVO;
+import com.panzhihua.common.model.vos.grid.admin.ComMngSubordinateVO;
+import com.panzhihua.common.model.vos.grid.admin.excel.ComMngPopulationExportExcelVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.ComMngHouseVo;
-import com.panzhihua.common.model.vos.user.InputUserInfoVO;
-import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
@@ -32,23 +53,26 @@
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.ComMngVillageService;
+import com.panzhihua.service_community.service.EventResourceService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
/**
* 实有人口Service实现类
*/
+@Slf4j
@Service
public class ComMngPopulationServiceImpl extends ServiceImpl<ComMngPopulationDAO, ComMngPopulationDO> implements ComMngPopulationService {
@Resource
@@ -66,9 +90,18 @@
@Resource
private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
@Resource
+ private ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
private ComMngPopulationHouseUserService comMngPopulationHouseUserService;
+ @Resource
+ private EventResourceService eventResourceService;
+ @Resource
+ private BigScreenDAO bigScreenDAO;
+ @Resource
+ private ComMngUserTagDAO comMngUserTagDAO;
@Value("${domain.aesKey:}")
private String aesKey;
+
/**
@@ -151,6 +184,23 @@
// if (!comMngFamilyInfoVOS.isEmpty()) {
// comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
// }
+ //查询户主关系信息
+ List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByPopuId(comMngPopulationDO.getId());
+ if (!comMngFamilyInfoVOS.isEmpty()) {
+ for (ComHouseMemberVo comHouseMemberVo : comMngFamilyInfoVOS){
+ comHouseMemberVo.setAge(AgeUtils.getAgeFromBirthTimes(comHouseMemberVo.getBirthDay()));
+ }
+ comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
+ }
+ //设置户主关系
+ List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS = comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
+ if (!comMngPopulationHouseUserDOS.isEmpty()) {
+ comMngPopulationVO.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
+ }
+ //设置年龄
+ if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
+ comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
+ }
//查询当前用户电子档信息
if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
@@ -194,10 +244,10 @@
Long pageNum = comMngPopulationVO.getPageNum();
Long pageSize = comMngPopulationVO.getPageSize();
if (null == pageNum || 0 == pageNum) {
- pageNum = 1l;
+ pageNum = 1L;
}
if (null == pageSize || 0 == pageSize) {
- pageSize = 10l;
+ pageSize = 10L;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
@@ -238,19 +288,33 @@
}
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
- String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)), "yyyy-MM-dd");
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageStartTime)) {
comMngPopulationVO.setAgeStartTime(ageStartTime);
}
}
if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())) {
- String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()) + 1)), "yyyy-MM-dd");
+ String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
if (StringUtils.isNotEmpty(ageEndTime)) {
comMngPopulationVO.setAgeEndTime(ageEndTime);
}
}
-
+ if (comMngPopulationVO.getAgeStartTime() !=null && !"".equals(comMngPopulationVO.getAgeStartTime()) && comMngPopulationVO.getAgeEndTime() !=null && !"".equals(comMngPopulationVO.getAgeEndTime())){
+ if (comMngPopulationVO.getAgeStartTime().equals(comMngPopulationVO.getAgeEndTime())) {
+ Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeStartTimeEnd(ageStartTime);
+ }
+ } else {
+ Date endAge = DateUtils.stringToDate(comMngPopulationVO.getAgeEndTime(), new SimpleDateFormat("yyyy-MM-dd"));
+ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(endAge, -1), "yyyy-MM-dd");
+ if (StringUtils.isNotEmpty(ageStartTime)) {
+ comMngPopulationVO.setAgeEndTimeEnd(ageStartTime);
+ }
+ }
+ }
IPage<ComMngPopulationVO> iPage = populationDAO.pagePopulation(page, comMngPopulationVO);
if (!iPage.getRecords().isEmpty()) {
iPage.getRecords().forEach(populDO -> {
@@ -299,6 +363,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception {
+ List<ComMngPopulationMistakeExcelVO> mistakes = new ArrayList<>();
List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
//查询该社区
ComActDO comActDO = comActDAO.selectById(communityId);
@@ -316,27 +381,42 @@
areaPath.append(areaAddressVO.getProvince()).append(">").append(areaAddressVO.getCity()).append(">").append(areaAddressVO.getDistrict()).append(">");
//处理实有人口信息
for (ComMngPopulationServeExcelVO vo : list) {
- String address = "";
+ if (vo.getDoorNo().contains("号")) {
+ vo.setDoorNo(vo.getDoorNo().replace("号",""));
+ }
+ if(vo.getFloor().contains("栋")){
+ vo.setFloor(vo.getFloor().replace("栋",""));
+ }
+ if(vo.getUnitNo().contains("单元")){
+ vo.setUnitNo(vo.getUnitNo().replace("单元",""));
+ }
+ if(vo.getHouseNo().contains("号")){
+ vo.setHouseNo(vo.getHouseNo().replace("号",""));
+ }
//查询小区街路巷是否存在
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("街路巷或小区号不存在");
+ importErrorVO.setErrorMsg("街路巷或小区号不存在，请先在“小区管理”中添加该小区");
importErrorVO.setErrorPosition("街路巷：" + vo.getRoad() + "，小区号:" + vo.getDoorNo());
populationImportErrorVOList.add(importErrorVO);
+// index++;
+ ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO();
+ BeanUtils.copyProperties(vo,mistake);
+ setMistake(mistake, vo);
+ mistake.setMistake("街路巷或小区号不存在，请先在“小区管理”中添加该小区:街路巷："+ vo.getRoad() +"，小区号:" + vo.getDoorNo());
+ mistakes.add(mistake);
continue;
}
- if (!comMngVillageDO.getHouseNum().contains("号")) {
- comMngVillageDO.setHouseNum(comMngVillageDO.getHouseNum() + "号");
- }
+ StringBuilder address = new StringBuilder();
+ address.append(areaAddressVO.getProvince()).append(areaAddressVO.getCity()).append(areaAddressVO.getDistrict())
+ .append(streetName).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋")
+ .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号");
- //小区详细地址
- address = areaAddressVO.getProvince() + areaAddressVO.getCity()
- + areaAddressVO.getDistrict() + streetName + comMngVillageDO.getAlley() + comMngVillageDO.getHouseNum()
- + vo.getFloor() + vo.getUnitNo() + vo.getHouseNo();
- vo.setAddress(address);
+ vo.setAddress(address.toString());
+ //todo 后期优化改为批量
//先判断房屋是否存在
ComMngPopulationHouseDO populationHouseDO = comMngPopulationHouseDAO.selectOne(new QueryWrapper<ComMngPopulationHouseDO>().lambda()
.eq(ComMngPopulationHouseDO::getCommunityId, communityId).eq(ComMngPopulationHouseDO::getVillageId, comMngVillageDO.getVillageId())
@@ -344,7 +424,8 @@
.eq(ComMngPopulationHouseDO::getHouseNo, vo.getHouseNo()));
if (populationHouseDO == null) {
//房屋信息不存在建立房屋信息
- populationHouseDO = savePopulationHouse(vo, comMngVillageDO, communityId, address, areaPath, comActDO.getName());
+ populationHouseDO = savePopulationHouse(vo, comMngVillageDO, communityId, areaPath, comActDO.getName());
+ vo.setHouseId(populationHouseDO.getId());
}
if (StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())) {
@@ -357,12 +438,14 @@
.eq(ComMngPopulationDO::getCardNo, cardNoAES));
if (populationDO == null) {
//不存在实有人口,则新增
- populationDO = savePopulationDO(vo, comActDO, comMngVillageDO, cardNoAES);
+ populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
+// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO);
} else {
//如果存在人口信息，且是自用房，则更新人口默认的房屋信息
- if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
- populationDO = updatePopulationHouseUse(vo, populationDO, cardNoAES);
- }
+// if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
+// populationDO = updatePopulationDO(vo, populationDO);
+// }
+ populationDO = updatePopulationDO(vo, comActDO, populationDO);
}
//处理实有人口房屋居住信息
@@ -377,6 +460,7 @@
populationHouseUserDO.setPopulId(populationDO.getId());
populationHouseUserDO.setRelation(vo.getRelation());
populationHouseUserDO.setRelationId(vo.getIsRent());
+ populationHouseUserDO.setResidence(vo.getResidence());
comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
}
}
@@ -389,44 +473,84 @@
this.saveBatch(populationDOList);*/
if (!populationImportErrorVOList.isEmpty()) {
- return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ return R.fail(mistakes,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));
+ private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngPopulationDO populationDO) throws Exception {
+ UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",populationDO.getId());
+ ComMngPopulationDO update = new ComMngPopulationDO();
+// update.setRoad(vo.getRoad());
+// update.setDoorNo(vo.getDoorNo());
+// update.setFloor(vo.getFloor());
+// update.setUnitNo(vo.getUnitNo());
+// update.setHouseNo(vo.getHouseNo());
+// update.setHouseId(vo.getHouseId());
+// if (StringUtils.isNotEmpty(populationDO.getPhone())) {
+// update.setPhone(populationDO.getPhone());
+// }
+ String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey);
+ BeanUtils.copyProperties(vo, update);
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ //查询当前社区标签列表
+ List<String> list = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId()));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
}
- this.baseMapper.updateById(populationDO);
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!list.contains(s))
+ iterator.remove();
+ }
+ update.setLabel(Joiner.on(",").join(userTag));
+ update.setCardNo(cardNoAES);
+ this.baseMapper.update(update,updateWrapper);
return populationDO;
}
- private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO, String cardNoAES) {
+ private ComMngPopulationDO savePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngVillageDO comMngVillageDO) {
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());
+ //查询当前社区标签列表
+ List<String> list = new ArrayList<>();
+ List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId()));
+ if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
+ list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
+ }
+ //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
+ Iterator<String> iterator = userTag.iterator();
+ while (iterator.hasNext()) {
+ String s = iterator.next();
+ if (!list.contains(s))
+ iterator.remove();
+ }
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());
+ //新增的时候默认绑定房屋id
+// if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
+// (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
+// populationDO.setHouseId(vo.getHouseId());
+// }else{
+// populationDO.setHouseId(null);
+// }
+
this.baseMapper.insert(populationDO);
return populationDO;
}
- private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId, String address, StringBuilder areaPath, String actName) {
+ private ComMngPopulationHouseDO savePopulationHouse(ComMngPopulationServeExcelVO vo, ComMngVillageDO comMngVillageDO, Long communityId,StringBuilder areaPath, String actName) {
//查询该房屋未建立，执行建立房屋信息
ComMngPopulationHouseDO populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setId(Snowflake.getId());
@@ -434,17 +558,17 @@
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.setCode(vo.getHouseNo());
+ populationHouseDO.setAddress(vo.getAddress());
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);
+ housePath.append(populationHouseDO.getAlley()).append(">").append(actName).append(">").append(comMngVillageDO.getName()).append(">").append(vo.getAddress());
populationHouseDO.setPath(areaPath.toString() + housePath.toString());
try {
populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
@@ -465,6 +589,19 @@
}
comMngPopulationHouseDAO.insert(populationHouseDO);
return populationHouseDO;
+ }
+
+ private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
+ //查询该房屋未建立，执行建立房屋信息
+ ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
+ populationHouseUserDO.setPopulId(comMngPopulationDO.getId());
+ populationHouseUserDO.setHouseId(comMngPopulationHouseDO.getId());
+ populationHouseUserDO.setRelationId(comMngPopulationHouseDO.getStatus());
+ populationHouseUserDO.setRelation(vo.getRelation());
+ populationHouseUserDO.setCreateAt(new Date());
+ comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
+ return populationHouseUserDO;
}
/**
@@ -621,6 +758,20 @@
}
@Override
+ public R getPopulationListByVillageId(Long villageId) {
+ List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
+ List<ComMngPopulationVO> resultList = new ArrayList<>();
+ if (list.size() > 0) {
+ list.forEach(populationDO -> {
+ 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) {
@@ -664,10 +815,15 @@
if (!vo.getHouseEditDTOList().isEmpty()) {
for (ComMngPopulationHouseEditDTO houseEditDto : vo.getHouseEditDTOList()) {
ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
+ populationHouseUserDO.setId(Snowflake.getId());
populationHouseUserDO.setPopulId(populationDO.getId());
populationHouseUserDO.setHouseId(houseEditDto.getId());
+ populationHouseUserDO.setRelation(houseEditDto.getRelation());
if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
houseId = houseEditDto.getId();//居住地
+ populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.yes);
+ }else {
+ populationHouseUserDO.setResidence(ComMngPopulationHouseEditDTO.isResidence.no);
}
populationHouseUserDOList.add(populationHouseUserDO);
@@ -696,7 +852,20 @@
}
}
}
- populationDO.setUpdateAt(new Date());
+
+// ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
+// .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
+// if (comMngPopulationHouseUserDO != null) {
+// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+// comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
+// }else {
+// comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
+// comMngPopulationHouseUserDO.setId(Snowflake.getId());
+// comMngPopulationHouseUserDO.setPopulId(vo.getId());
+// comMngPopulationHouseUserDO.setRelation(vo.getRelation());
+// comMngPopulationHouseUserDO.setCreateAt(new Date());
+// comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
+// }
if (populationDAO.updateById(populationDO) > 0) {
return R.ok();
} else {
@@ -730,6 +899,62 @@
} else {
return R.fail();
}
+ }
+
+ @Override
+ public R specialInputUserTags(PageInputUserDTO comMngUserTagDTO) {
+ IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(new Page<>(comMngUserTagDTO.getPageNum()
+ , comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
+ return R.ok(iPage);
+ }
+
+ @Override
+ public R saveSpecialInputUserTags(ComMngTagVO comMngTagVO) {
+ if (null != comMngTagVO.getId() && comMngTagVO.getId() != 0) {
+ //修改
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(comMngTagVO.getId());
+ if (null == comMngUserTagDO) {
+ return R.fail("该标签不存在");
+ }
+ ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ if (null != checkCreditCode && comMngUserTagDO.getId() != checkCreditCode.getId()) {
+ return R.fail("该标签已存在，标签名称重复");
+ }
+
+ BeanUtils.copyProperties(comMngTagVO, comMngUserTagDO);
+ int update = comMngUserTagDAO.updateById(comMngUserTagDO);
+ if (update > 0) {
+ return R.ok();
+ }
+ } else {
+ //新增
+ Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
+ if (count > 0) {
+ return R.fail("该标签已存在，标签名称重复");
+ }
+ ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
+ BeanUtils.copyProperties(comMngTagVO, comMngUserTagDO);
+ int insert = comMngUserTagDAO.insert(comMngUserTagDO);
+ if (insert > 0) {
+ return R.ok();
+ }
+ }
+
+ return R.fail("添加失败");
+ }
+
+ @Override
+ public R deleteSpecialInputUserTags(Long id) {
+ //查询特殊群体人员
+ ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(id);
+ if (comMngUserTagDO == null) {
+ return R.fail("该标签不存在");
+ }
+ int delete = comMngUserTagDAO.deleteById(id);
+ if (delete > 0) {
+ return R.ok();
+ }
+ return R.fail("删除失败");
}
/**
@@ -812,6 +1037,365 @@
return null;
}
+ /**
+ * 首页大屏统计接口
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getScreenIndex(Long communityId) {
+ //创建统计返回参数
+ IndexStatisticsVO statisticsVO = new IndexStatisticsVO();
+
+ //查询基础数据模块
+ IndexBasicsStatisticsVO basicsStatisticsVO = comMngPopulationDAO.getScreenIndexByBasics(communityId);
+ statisticsVO.setBasicsStatistics(basicsStatisticsVO);
+
+ //查询实有人口统计模块
+ IndexPopulationStatisticsVO populationStatisticsVO = new IndexPopulationStatisticsVO();
+ //查询实有人口性别统计
+ List<IndexPopulationSexStatisticsVO> sexPopulationList = comMngPopulationDAO.getScreenIndexByPopulationSex(communityId);
+ populationStatisticsVO.setSexPopulationList(sexPopulationList);
+ //查询实有人口年龄统计
+ List<IndexPopulationAgeStatisticsVO> agePopulationList = statisticsAge(communityId);
+ 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);
+
+ //查询党建数据
+ BigScreenStatisticPartyBuild statisticPartyBuild = bigScreenDAO.partybuild(communityId);
+ statisticsVO.setStatisticPartyBuild(statisticPartyBuild);
+
+ //查询特殊人群统计
+ List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
+
+ //查询特殊人群标签列表
+ List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+ IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
+ otherSpecialVO.setTitle("其他");
+ 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 {
+ if (StringUtils.isNotEmpty(userTag.getTagName())) {
+ if (userTag.getTagName().equals("特扶家庭")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(22);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ } else if (userTag.getTagName().equals("低保户")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(94);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ } else if (userTag.getTagName().equals("低收入人群")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(2);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ } else if (userTag.getTagName().equals("退役军人")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(264);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }else if(userTag.getTagName().equals("高龄老人")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }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(Long communityId) {
+ Map<String, Long> ageMap = populationDAO.indexCountByAge(communityId);
+ 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 (ageMap.isEmpty()) {
+ ageStatisticsVO1.setSum(0);
+ ageStatisticsVO2.setSum(0);
+ ageStatisticsVO3.setSum(0);
+ ageStatisticsVO4.setSum(0);
+ ageStatisticsVO5.setSum(0);
+ ageStatisticsVO6.setSum(0);
+ } else {
+ ageStatisticsVO1.setSum(ageMap.get("age16").intValue());
+ ageStatisticsVO2.setSum(ageMap.get("age27").intValue());
+ ageStatisticsVO3.setSum(ageMap.get("age35").intValue());
+ ageStatisticsVO4.setSum(ageMap.get("age45").intValue());
+ ageStatisticsVO5.setSum(ageMap.get("age55").intValue());
+ ageStatisticsVO6.setSum(ageMap.get("age55over").intValue());
+ }
+
+ agePopulationList.add(ageStatisticsVO1);
+ agePopulationList.add(ageStatisticsVO2);
+ agePopulationList.add(ageStatisticsVO3);
+ agePopulationList.add(ageStatisticsVO4);
+ agePopulationList.add(ageStatisticsVO5);
+ agePopulationList.add(ageStatisticsVO6);
+ return agePopulationList;
+ }
+
+ /**
+ * 事件大屏统计接口
+ *
+ * @param screenEventDTO 请求参数
+ * @return 统计结果
+ */
+ @Override
+ public R getScreenEvent(BigScreenEventDTO screenEventDTO) {
+
+ Long communityId = screenEventDTO.getCommunityId();
+ //创建统计返回参数
+ EventStatisticsVO statisticsVO = new EventStatisticsVO();
+
+ //查询页面左边数据
+ EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
+ //查询左上数据
+ EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
+ //查询时间频发月份
+ List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
+ leftTopStatisticsVO.setOftenMonth(monthList);
+ leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
+ //查询左下数据
+ EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
+ leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
+ statisticsVO.setLeftStatisticsVO(leftStatisticsVO);
+
+ //查询事件播报模块数据
+ EventNewStatisticsVO newStatisticsVO = this.baseMapper.getEventScreenRightTop(communityId);
+ if (newStatisticsVO != null) {
+ //查询事件资源文件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1)
+ .eq(EventResourceDO::getRefId, newStatisticsVO.getId())
+ );
+ 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);
+
+ //查询事件流转记录
+ List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(newStatisticsVO.getId());
+ newStatisticsVO.setTransferRecordList(transferRecordList);
+ }
+ statisticsVO.setNewStatisticsVO(newStatisticsVO);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ statisticsVO.setGridStatisticsList(gridStatisticsList);
+
+ //查询社区事件列表
+ List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
+ statisticsVO.setGridIncidentList(gridIncidentList);
+
+ //查询小区列表
+ List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
+ if(!villageStatisticsList.isEmpty()){
+ villageStatisticsList.forEach(village -> {
+ CivilVillageStatisticsVO villageStatisticsVO = this.baseMapper.getCivilScreenVillageStatistics(village.getVillageId());
+ if(villageStatisticsVO != null){
+ village.setPeopleNum(villageStatisticsVO.getPeopleNum());
+ village.setHouseNum(villageStatisticsVO.getHouseNum());
+ village.setRegisterNum(villageStatisticsVO.getRegisterNum());
+ village.setFlowNum(villageStatisticsVO.getFlowNum());
+// BeanUtils.copyProperties(villageStatisticsVO,village);
+ }
+ });
+ }
+ statisticsVO.setVillageStatisticsList(villageStatisticsList);
+
+ //查询统计人口数据
+ ComMngPopulationTotalVO populationTotalVO = populationDAO.getPopulationTotalByAdmin(communityId);
+ if(communityId.equals(2L)){
+ populationTotalVO.setSpecialTotal(36);
+ }
+ statisticsVO.setPopulationTotalVO(populationTotalVO);
+
+ return R.ok(statisticsVO);
+ }
+
+ /**
+ * 民生大屏统计接口
+ *
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getScreenCivil(Long communityId) {
+ //创建统计返回参数
+ CivilStatisticsVO civilStatisticsVO = new CivilStatisticsVO();
+
+ //查询特殊人群统计
+ List<IndexSpecialStatisticsVO> specialStatisticsVOList = new ArrayList<>();
+
+ //查询特殊人群标签列表
+ List<ComMngUserTagVO> userTagList = comMngPopulationDAO.getUserTagListByCommunityId(communityId);
+ IndexSpecialStatisticsVO otherSpecialVO = new IndexSpecialStatisticsVO();
+ otherSpecialVO.setTitle("其他");
+ 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 {
+ if (StringUtils.isNotEmpty(userTag.getTagName())) {
+ if (userTag.getTagName().equals("特扶家庭")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(22);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ } else if (userTag.getTagName().equals("低保户")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(94);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ } else if (userTag.getTagName().equals("低收入人群")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(2);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ } else if (userTag.getTagName().equals("退役军人")) {
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(264);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }else if(userTag.getTagName().equals("高龄老人")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }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);
+ }
+
@Override
public R screenStatistic(Long communityId) {
ComActPopulationScreenVO comActPopulationScreenVO = new ComActPopulationScreenVO();
@@ -819,7 +1403,69 @@
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());
+
+ //查询特殊人群统计
+ 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{
+ if(StringUtils.isNotEmpty(userTag.getTagName())){
+ if(userTag.getTagName().equals("特扶家庭")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(22);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }else if(userTag.getTagName().equals("低保户")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(94);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }else if(userTag.getTagName().equals("低收入人群")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(2);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }else if(userTag.getTagName().equals("退役军人")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(264);
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }else if(userTag.getTagName().equals("高龄老人")){
+ IndexSpecialStatisticsVO specialStatisticsVO = new IndexSpecialStatisticsVO();
+ specialStatisticsVO.setTitle(userTag.getTagName());
+ specialStatisticsVO.setSum(comMngPopulationDAO.getStatisticsCount(communityId));
+ specialStatisticsVOList.add(specialStatisticsVO);
+ }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();
+ }
+ }
+ comActPopulationScreenVO.setSpecialNum(specialNum.longValue());
//统计已使用社区通人数
Long count = populationDAO.countUsedCommunityPopulation(communityId);
comActPopulationScreenVO.setUsedCommunityNum(count == null ? 0 : count);
@@ -836,6 +1482,14 @@
setAgeGroup(comActPopulationScreenVO, communityId);
//统计学历
setCultureGroup(comActPopulationScreenVO, communityId);
+
+ //查询网格数据
+ List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+ comActPopulationScreenVO.setGridStatisticsList(gridStatisticsList);
+
+ //查询小区列表
+ List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
+ comActPopulationScreenVO.setVillageStatisticsList(villageStatisticsList);
return R.ok(comActPopulationScreenVO);
}
@@ -923,4 +1577,356 @@
comActPopulationScreenVO.setAgeGroup(ageList);
}
-}
+ /**
+ * 获取社区网格
+ *
+ * @param communityId 社区id
+ * @return 网格数据
+ */
+ @Override
+ public R getScreenGirds(Long communityId) {
+ return R.ok(this.baseMapper.getEventScreenGridData(communityId));
+ }
+
+ /**
+ * 事件大屏查询事件详情
+ *
+ * @param eventDetailDTO 请求参数
+ * @return 事件详情
+ */
+ @Override
+ public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
+ EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
+ if (eventDetailDTO.getType().equals(7)) {//随手拍详情
+ statisticsVO = this.baseMapper.getEventScreenSSPDateil(eventDetailDTO.getEventId());
+ if (statisticsVO != null && StringUtils.isNotEmpty(statisticsVO.getPhotoPathList())) {
+ statisticsVO.setDangerLevel("0");
+ statisticsVO.setMajor(false);
+ statisticsVO.setUrgent(false);
+ if (statisticsVO.getEventDealStatus().equals(2)) {
+ statisticsVO.setEventDealStatus(4);
+ }
+ List<EventResourceVO> picList = new ArrayList<>();
+ String[] pics = statisticsVO.getPhotoPathList().split(",");
+ if (pics.length > 0) {
+ for (int i = 0; i < pics.length; i++) {
+ EventResourceVO resourceVO = new EventResourceVO();
+ resourceVO.setType(1);
+ resourceVO.setUrl(pics[i]);
+ picList.add(resourceVO);
+ }
+ }
+ statisticsVO.setPics(picList);
+ }
+ } else {//事件详情
+ statisticsVO = this.baseMapper.getEventScreenEventDetail(eventDetailDTO.getEventId());
+ if (statisticsVO != null) {
+ //查询事件资源文件
+ List<EventResourceDO> eventResourceDOList =
+ eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
+ .eq(EventResourceDO::getClassification, 1)
+ .eq(EventResourceDO::getRefId, statisticsVO.getId())
+ );
+ 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;
+ }
+ });
+ statisticsVO.setAudios(audioList);
+ statisticsVO.setPics(picList);
+ statisticsVO.setVideos(videoList);
+
+ //查询事件流转记录
+ List<EventTransferRecordVO> transferRecordList = this.baseMapper.getEventScreenEventTransList(eventDetailDTO.getEventId());
+ if(!transferRecordList.isEmpty()){
+ transferRecordList.forEach(transfer -> {
+ if(transfer.getFromType().equals(EventTransferRecordVO.fromType.wgy)){
+ //查询上级网格信息
+ EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetail(transfer.getEventId());
+ transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
+ + transferRecordDetailVO.getCommunityName() + "-" + transferRecordDetailVO.getGridName());
+ }else if(transfer.getFromType().equals(EventTransferRecordVO.fromType.sq)){
+ //查询上级社区信息
+ EventTransferRecordDetailVO transferRecordDetailVO = this.baseMapper.getEventScreenEventTransDetailByCommunityId(transfer.getFromId());
+ transfer.setSuperiorRelationship(transferRecordDetailVO.getStreetName() + "-"
+ + transferRecordDetailVO.getCommunityName());
+ }
+ });
+ }
+ statisticsVO.setTransferRecordList(transferRecordList);
+ }
+ }
+ return R.ok(statisticsVO);
+ }
+
+ /**
+ * 获取人口数据信息
+ *
+ * @param populationListDTO 请求参数
+ * @return 人口数据
+ */
+ @Override
+ public R pagePopulationListApp(PagePopulationListDTO populationListDTO){
+ IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
+ if(!pagePopulationList.getRecords().isEmpty()){
+ pagePopulationList.getRecords().forEach(population -> {
+ population.setAge(IdcardUtil.getAgeByIdCard(population.getCardNo()));
+ });
+ }
+ return R.ok(pagePopulationList);
+ }
+
+ /**
+ * 根据人口id获取人口详情
+ *
+ * @param populationId 人口id
+ * @return 人口详情
+ */
+ @Override
+ public R getPopulationDetailApp(Long populationId){
+ PopulationDetailVO detail = this.baseMapper.getPopulationDetailApp(populationId);
+ if(detail != null){
+ detail.setAge(IdcardUtil.getAgeByIdCard(detail.getCardNo()));
+ if(StringUtils.isNotEmpty(detail.getCultureLevel())){
+ detail.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(Integer.parseInt(detail.getCultureLevel())));
+ }
+ if(StringUtils.isNotEmpty(detail.getMarriage())){
+ detail.setMarriage(PopulMarriageEnum.getCnDescByName(Integer.parseInt(detail.getMarriage())));
+ }
+ }
+ return R.ok(detail);
+ }
+
+ /**
+ * 修复人口加密问题
+ *
+ * @return 修复结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R getPopulationRepairByApp(){
+ List<ComMngPopulationDO> populationDOList = this.baseMapper.selectList(new QueryWrapper<ComMngPopulationDO>());
+ if(!populationDOList.isEmpty()){
+ populationDOList.forEach(population -> {
+ try {
+ population.setCardNo(AESUtil.encrypt128(population.getCardNoStr(),aesKey));
+ }catch (Exception e){
+
+ }
+ this.baseMapper.updateById(population);
+ });
+ }
+ return R.ok();
+ }
+
+ /**
+ * 综治后台-居民列表
+ * @param populationListDTO 请求参数
+ * @return 居民列表
+ */
+ @Override
+ public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO){
+ if(StringUtils.isNotEmpty(populationListDTO.getKeyWord())){
+ try {
+ populationListDTO.setCardNo(AESUtil.encrypt128(populationListDTO.getKeyWord(),aesKey));
+ }catch (Exception e){
+ log.error("转换身份证号码失败");
+ }
+ }
+
+ IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
+ if(!populationListIPage.getRecords().isEmpty()){
+ populationListIPage.getRecords().forEach(population -> {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
+ population.setAge(age);
+ }catch (Exception e){
+ log.error("当前人口身份证获取年龄失败，实有人口id：" + population.getId());
+ }
+ //查询此用户在当前房屋是否是户主
+ Integer relation = this.baseMapper.getPopulationRelationByHouseId(population.getHouseId(),population.getId());
+ if(relation == null || relation != 1){
+ population.setIsRelation(2);
+ }else{
+ population.setIsRelation(1);
+ }
+ });
+ }
+ return R.ok(populationListIPage);
+ }
+
+ /**
+ * 综治后台-删除居民
+ * @param ids 居民id集合
+ * @return 删除结果
+ */
+ @Override
+ public R delGridPopulationAdmin(List<Long> ids){
+ Integer count = this.baseMapper.getPopulationVisitingCount(ids);
+ if(count > 0){
+ return R.ok("您选择的数据中存在被引用的，无法删除");
+ }
+ this.baseMapper.deleteBatchIds(ids);
+ return R.ok();
+ }
+
+ @Override
+ public R binding() {
+ QueryWrapper<ComMngPopulationDO> query = new QueryWrapper<>();
+ query.isNull("house_id");
+ List<ComMngPopulationDO> list = baseMapper.selectList(query);
+ list.forEach(e->{
+ QueryWrapper<ComMngPopulationHouseDO> houseQuery = new QueryWrapper<>();
+ houseQuery.lambda().eq(ComMngPopulationHouseDO::getCommunityId,e.getActId())
+ .eq(ComMngPopulationHouseDO::getAlley,e.getRoad())
+ .eq(ComMngPopulationHouseDO::getFloor,e.getFloor())
+ .eq(ComMngPopulationHouseDO::getUnitNo,e.getUnitNo())
+ .eq(ComMngPopulationHouseDO::getHouseNo,e.getHouseNo());
+ List<ComMngPopulationHouseDO> houseList = comMngPopulationHouseDAO.selectList(houseQuery);
+ if(!CollectionUtils.isEmpty(houseList)){
+ UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper();
+ updateWrapper.eq("id",e.getId());
+ ComMngPopulationDO populationDO = new ComMngPopulationDO();
+ populationDO.setHouseId(houseList.get(0).getId());
+ baseMapper.update(populationDO,updateWrapper);
+ }
+ });
+ return R.ok();
+ }
+
+ /**
+ * 查询平台人口列表
+ * @param populationDTO 请求参数
+ * @return 人口列表
+ */
+ @Override
+ public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO){
+
+ IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(new Page(populationDTO.getPageNum(),populationDTO.getPageSize()),populationDTO);
+ if(!populationVOIPage.getRecords().isEmpty()){
+ populationVOIPage.getRecords().forEach(population -> {
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getIdCard());
+ population.setAge(age);
+ }catch (Exception e){
+ log.error("人员身份证转换年龄失败，人员id：" + population.getId());
+ }
+ });
+ }
+ return R.ok(populationVOIPage);
+ }
+
+ /**
+ * 综治后台-居民标签栏统计
+ * @return 居民统计
+ */
+ @Override
+ public R getGridPopulationStatistics(Long communityId){
+ return R.ok(this.baseMapper.getGridPopulationStatistics(communityId));
+ }
+
+ /**
+ * 综治后台-居民导出查询居民数据
+ * @param populationExportDTO 请求参数
+ * @return 导出结果
+ */
+ @Override
+ public R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO){
+ //结果集
+ List<ComMngPopulationExportExcelVO> resultPopulationList = new ArrayList<>();
+ //查询人口信息
+ List<ComMngPopulationListVO> populationListVOList = this.baseMapper.getGridPopulationAdminLists(populationExportDTO);
+ if(!populationListVOList.isEmpty()){
+ populationListVOList.forEach(population -> {
+ ComMngPopulationExportExcelVO populationExportExcelVO = new ComMngPopulationExportExcelVO();
+ BeanUtils.copyProperties(population,populationExportExcelVO);
+ if(population.getSex() != null){
+ populationExportExcelVO.setSex(PopulSexEnum.getCnDescByName(population.getSex()));
+ }
+ if(population.getPoliticalOutlook() != null){
+ populationExportExcelVO.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(population.getPoliticalOutlook()));
+ }
+ if(population.getIsHouse() != null){
+ if(!population.getIsHouse().equals(0L)){
+ populationExportExcelVO.setIsHouse("是");
+ }else{
+ populationExportExcelVO.setIsHouse("否");
+ }
+ }
+ if(population.getEventStatus() != null){
+ populationExportExcelVO.setEventStatus(EventStatusEnum.getCnDescByName(population.getEventStatus()));
+ }
+ try {
+ Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
+ populationExportExcelVO.setAge(age);
+ }catch (Exception e){
+ log.error("当前人口身份证获取年龄失败，实有人口id：" + population.getId());
+ }
+ resultPopulationList.add(populationExportExcelVO);
+ });
+ }
+ return R.ok(resultPopulationList);
+ }
+
+ /**
+ * 综治后台-居民管理小区列表
+ * @param name 小区名字
+ * @return 小区列表
+ */
+ @Override
+ public R relationVillage(String name){
+ List<ComMngPopulationVillageVO> populationVillageList = new ArrayList<>();
+ QueryWrapper<ComMngVillageDO> villageQuery = new QueryWrapper<>();
+ if(StringUtils.isNotEmpty(name)){
+ villageQuery.lambda().like(ComMngVillageDO::getName,name);
+ }
+
+ List<ComMngVillageDO> villageList = comActVillageDAO.selectList(villageQuery);
+ if(!villageList.isEmpty()){
+ villageList.forEach(village -> {
+ ComMngPopulationVillageVO populationVillageVO = new ComMngPopulationVillageVO();
+ BeanUtils.copyProperties(village,populationVillageVO);
+ populationVillageList.add(populationVillageVO);
+ });
+ }
+ return R.ok(populationVillageList);
+ }
+
+ @Override
+ public R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO){
+ return R.ok(this.baseMapper.getVillagePopulationAdmin(new Page(villagePopulationDTO.getPageNum(),villagePopulationDTO.getPageSize()),villagePopulationDTO));
+ }
+
+ private void setMistake(ComMngPopulationMistakeExcelVO mvo, ComMngPopulationServeExcelVO vo){
+ mvo.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(vo.getPoliticalOutlook()));
+ mvo.setIsRent(PopulHouseUseEnum.getCnDescByName(vo.getIsRent()));
+ mvo.setRelation(PopulRelationEnum.getCnDescByName(vo.getRelation()));
+ mvo.setHouseStatus(PopulHouseStatusEnum.getCnDescByName(vo.getHouseStatus()));
+ mvo.setHousePurpose(PopulHousePurposeEnum.getCnDescByName(vo.getHousePurpose()));
+ mvo.setControlStatus(PopulHouseControlStatusEnum.getCnDescByName(vo.getControlStatus()));
+ mvo.setCultureLevel(PopulCultureLevelEnum.getCnDescByName(vo.getCultureLevel()));
+ mvo.setMarriage(PopulMarriageEnum.getCnDescByName(vo.getMarriage()));
+ mvo.setOutOrLocal(PopulOutOrLocalEnum.getCnDescByName(vo.getOutOrLocal()));
+ mvo.setResidence(PopulRelationEnum.getCnDescByName(vo.getResidence()));
+ mvo.setPersonType(PopulPersonTypeEnum.getCnDescByName(vo.getPersonType()));
+ mvo.setDeath(PopulOutOrLocalEnum.getCnDescByName(vo.getDeath()));
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.7.1