From c3a41230c2f671cdb248df3fa5b64a936e12a3e6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 17 六月 2021 14:07:44 +0800
Subject: [PATCH] bugfixed: 党员人数纠错

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 1078 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 1,001 insertions(+), 77 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 411e239..4630487 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,5 +1,7 @@
 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;
@@ -7,31 +9,50 @@
 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.ComMngPopulationDTO;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
+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.vos.R;
+import com.panzhihua.common.model.vos.area.AreaAddressVO;
 import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
-import com.panzhihua.service_community.dao.ComActDAO;
-import com.panzhihua.service_community.dao.ComActVillageDAO;
-import com.panzhihua.service_community.dao.ComMngPopulationDAO;
-import com.panzhihua.service_community.model.dos.ComActActivityDO;
-import com.panzhihua.service_community.model.dos.ComActDO;
-import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
-import com.panzhihua.service_community.model.dos.ComMngVillageDO;
+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;
+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.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.*;
+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.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 实有人口Service实现类
@@ -44,6 +65,24 @@
     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;
+    @Resource
+    private BigScreenDAO bigScreenDAO;
+    @Value("${domain.aesKey:}")
+    private String aesKey;
 
 
     /**
@@ -112,15 +151,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<ComMngFamilyInfoVO> comMngFamilyInfoVOS = populationDAO.listFamilyByUserId(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())){
+            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);
     }
@@ -144,7 +215,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);
     }
 
@@ -183,80 +311,232 @@
     }
 
     @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<>();
+        //查询该社区
+        ComActDO comActDO = comActDAO.selectById(communityId);
+        //查询该社区的省市区地址
+        AreaAddressVO areaAddressVO = populationDAO.getAreaAddress(comActDO.getProvinceCode(),comActDO.getCityCode(),comActDO.getAreaCode());
+        //查询社区上街道信息
+        String streetName = "";
+        if(comActDO.getStreetId() != null){
+            ComStreetDO streetDO = comStreetDAO.selectById(comActDO.getStreetId());
+            if(streetDO != null){
+                streetName = streetDO.getName();
+            }
+        }
+        StringBuilder areaPath = new StringBuilder();
+        areaPath.append(areaAddressVO.getProvince()).append(">").append(areaAddressVO.getCity()).append(">").append(areaAddressVO.getDistrict()).append(">");
+        //处理实有人口信息
+        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("街路巷或小区号不存在");
+                importErrorVO.setErrorPosition("街路巷:" + vo.getRoad() + ",小区号:"+vo.getDoorNo());
+                populationImportErrorVOList.add(importErrorVO);
+//                index++;
+                continue;
+            }
+
+            if(!comMngVillageDO.getHouseNum().contains("号")){
+                comMngVillageDO.setHouseNum(comMngVillageDO.getHouseNum() + "号");
+            }
+
+            address = areaAddressVO.getProvince() + areaAddressVO.getCity()
+                    + areaAddressVO.getDistrict() + streetName + 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){
+                //房屋信息不存在建立房屋信息
+                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,cardNoAES));
+            if(populationDO == null){
+                //不存在实有人口,则新增
+                populationDO = savePopulationDO(vo,comActDO,comMngVillageDO,cardNoAES);
+            }else {
+                //如果存在人口信息,且是自用房,则更新人口默认的房屋信息
+                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(vo.getRelation());
+                    populationHouseUserDO.setRelationId(vo.getIsRent());
+                    comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
+                }
+            }
+        }
+        //如果有错误,返回错误
+        //暂时注释,等客户完成任务需要恢复
+        /*if(!populationImportErrorVOList.isEmpty()){
+            return R.fail(JSON.toJSONString(populationImportErrorVOList));
+        }
+        this.saveBatch(populationDOList);*/
+
+        if(!populationImportErrorVOList.isEmpty()){
+            return R.fail(JSON.toJSONString(populationImportErrorVOList));
+        }
+        return R.ok();
+    }
+
+    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;
+    }
+
+    /**
+     * 确认导入实有人口(有则更新,无则新建)
+     * @param list  用户信息
+     * @param communityId   社区id
+     * @return  导入结果
+     */
+    @Override
+    public R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId) {
         if (list.size() == 0) {
             return R.fail("数据为空!");
         }
         List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
         //查询该社区所有(实有房屋)小区
-        List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
-        int index = 2;
-        for (ComMngPopulationServeExcelVO vo : list) {
-            if (vo.getName() == null) {
-                return R.fail("家庭成员(姓名)第" + index + "行为空!");
-            }
-            if (vo.getSex() == null) {
-                return R.fail("性别第" + index + "行为空!");
-            }
-            if (vo.getAge() == null) {
-                return R.fail("年龄" + index + "行为空!");
-            }
-
-            if (vo.getIsRent() == null) {
-                return R.fail("是否租住,第" + index + "行为空!");
-            }
-            if (vo.getRoad() == null) {
-                return R.fail("街路巷,第" + index + "行为空!");
-            }
-            if (vo.getDoorNo() == null) {
-                return R.fail("门牌号,第" + index + "行为空!");
-            }
-
-            if (vo.getFloor() == null) {
-                return R.fail("楼排号,第" + index + "行为空!");
-            }
-            if (vo.getUnitNo() == null) {
-                return R.fail("单元号,第" + index + "行为空!");
-            }
-            if (vo.getHouseNo() == null) {
-                return R.fail("户室,第" + index + "行为空!");
-            }
-            if (vo.getNation() == null) {
-                return R.fail("民族,第" + index + "行为空!");
-            }
-            if (vo.getPoliticalOutlook() == null) {
-                return R.fail("政治面貌,第" + index + "行为空!");
-            }
-            if (vo.getCardNo() == null) {
-                return R.fail("身份证号码,第" + index + "行为空!");
-            }
-            if (vo.getPhone() == null) {
-                return R.fail("联系方式,第" + index + "行为空!");
-            }
-            //判断DB和exel数据重复判断
-            boolean result = comMngPopulationDOS.stream().anyMatch(population -> population.getCardNo().equals(vo.getCardNo()));
-            if (result) {
-                return R.fail("导入实有人口已存在(" + vo.getCardNo() + ")");
-            }
-            index++;
-        }
+//        List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
         ComActDO comActDO = comActDAO.selectById(communityId);
         ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
         list.forEach(vo -> {
             ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
-            ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
+            //查询街路巷是否存在
+            ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+//            ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
             BeanUtils.copyProperties(vo, comMngPopulationDO);
             if (comMngVillageDO == null) {
                 throw new ServiceException("街道巷:" + vo.getRoad() + "不存在!");
             }
-            comMngPopulationDO.setActId(comMngVillageDO.getVillageId());
+            comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
             comMngPopulationDO.setActId(comActDO.getCommunityId());
             comMngPopulationDO.setStreetId(comActDO.getStreetId());
-            comMngPopulationDO.setLabel(Joiner.on(",").join(vo.getUserTagStr()));
+            List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+            comMngPopulationDO.setLabel(Joiner.on(",").join(userTag));
             comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
             populationDOList.add(comMngPopulationDO);
         });
-        //this.saveBatch(populationDOList);
+
+        if(!populationDOList.isEmpty()){
+            //循环遍历待导入人员信息,如果数据库存在则更新,如果不存在则新建
+            populationDOList.forEach(population -> {
+                try {
+                    //加密身份证号码
+                    String cardNo = AESUtil.encrypt128(population.getCardNo(), aesKey);
+                    population.setCardNo(cardNo);
+                    //查询这个用户是否存在
+                    ComMngPopulationDO comMngPopulationDO = this.populationDAO.selectOne(new QueryWrapper<ComMngPopulationDO>().lambda()
+                            .eq(ComMngPopulationDO::getCardNo, population.getCardNo()));
+                    if(comMngPopulationDO != null){
+                        population.setId(comMngPopulationDO.getId());
+                        BeanUtils.copyProperties(population,comMngPopulationDO);
+                        this.populationDAO.updateById(population);
+                    }else{
+                        this.populationDAO.insert(population);
+                    }
+                }catch (Exception e){
+                    log.error("导入实有人口失败");
+                }
+            });
+        }
         return R.ok("共计导入实有人口数量:" + populationDOList.size());
     }
 
@@ -289,4 +569,648 @@
         }
         return R.ok();
     }
+
+    /**
+     * 批量删除实有人口
+     * @param Ids
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public R deletePopulations(List<Long> Ids) {
+        if(!Ids.isEmpty()){
+            Ids.forEach(id -> {
+                //清除用户房屋居住信息
+                comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(id);
+            });
+        }
+        int delete = populationDAO.deleteBatchIds(Ids);
+        if (delete > 0) {
+            return R.ok();
+        }
+        return R.fail();
+    }
+
+    /**
+     * 根据社区id查询所有实有人口
+     * @param communityId   社区id
+     * @return  查询结果
+     */
+    @Override
+    public R getPopulationListByCommunityId(Long communityId) {
+        List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("act_id",communityId));
+        List<ComMngPopulationVO> resultList = new ArrayList<>();
+        if(list.size() > 0){
+            list.forEach(populationDO -> {
+                ComMngPopulationVO populationVO=new ComMngPopulationVO();
+                BeanUtils.copyProperties(populationDO,populationVO);
+                resultList.add(populationVO);
+            });
+        }
+        return R.ok(resultList);
+    }
+
+    /**
+     * 根据id集合查询实有人口
+     * @param Ids   实有人口id集合
+     * @return  查询结果
+     */
+    @Override
+    public R getPopulationLists(List<Long> Ids) {
+        List<ComMngPopulationDO> list = populationDAO.selectBatchIds(Ids);
+        List<ComMngPopulationVO> resultList = new ArrayList<>();
+        if(list.size() > 0){
+            list.forEach(populationDO -> {
+                ComMngPopulationVO populationVO = new ComMngPopulationVO();
+                BeanUtils.copyProperties(populationDO,populationVO);
+                resultList.add(populationVO);
+            });
+        }
+        return R.ok(resultList);
+    }
+
+    @Override
+    public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception{
+        ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
+        if(populationDO == null){
+            return R.fail();
+        }
+        BeanUtils.copyProperties(vo,populationDO);
+        if(StringUtils.isEmpty(vo.getLabel())){
+            populationDO.setLabel(null);
+        }
+        if(StringUtils.isEmpty(vo.getRemark())){
+            populationDO.setRemark(null);
+        }
+        populationDO.setCardNo(null);
+        populationDO.setPhone(AESUtil.encrypt128(vo.getPhone(), aesKey));
+
+        ComActDO comActDO = comActDAO.selectById(communityId);
+        if(comActDO != null){
+            populationDO.setActId(comActDO.getCommunityId());
+            populationDO.setStreetId(comActDO.getStreetId());
+        }
+
+        //查询当前用户所有房屋id
+        List<Long> houseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByUserId(vo.getId());
+        //清除用户房屋居住信息
+        comMngPopulationHouseUserDAO.deletePopulationHouseByUserId(vo.getId());
+        if(!houseIds.isEmpty()){
+            houseIds.forEach(houseId -> {
+                //查询当前房屋下是否有人口信息,如果没有则将房屋设置为空户
+                List<Long> oldHouseIds = comMngPopulationHouseUserDAO.getPopulationHouseIdByhHosueId(houseId);
+                if(oldHouseIds.isEmpty()){
+                    //修改房屋信息为空户
+                    comMngPopulationHouseDAO.updateHouseByIsEmpty(houseId,1);
+                }
+            });
+        }
+
+
+        //更新用户的房屋信息
+        Long houseId = null;
+        List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
+        if(!vo.getHouseEditDTOList().isEmpty()){
+            for (ComMngPopulationHouseEditDTO houseEditDto:vo.getHouseEditDTOList()) {
+                ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
+                populationHouseUserDO.setPopulId(populationDO.getId());
+                populationHouseUserDO.setHouseId(houseEditDto.getId());
+                if(houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)){
+                    houseId = houseEditDto.getId();//居住地
+                }
+                populationHouseUserDOList.add(populationHouseUserDO);
+
+                //修改房屋信息不为空户
+                comMngPopulationHouseDAO.updateHouseByIsEmpty(houseEditDto.getId(),2);
+            }
+        }
+        comMngPopulationHouseUserService.saveBatch(populationHouseUserDOList);
+
+        if(houseId != null){//居住地更新
+            ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(houseId);
+            if(houseDO != null){
+                populationDO.setRoad(houseDO.getAlley());
+                populationDO.setDoorNo(houseDO.getHouseNum());
+                populationDO.setFloor(houseDO.getFloor());
+                populationDO.setUnitNo(houseDO.getUnitNo());
+                populationDO.setHouseNo(houseDO.getHouseNo());
+                ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().lambda()
+                        .eq(ComMngVillageDO::getAlley,houseDO.getAlley()).eq(ComMngVillageDO::getHouseNum,houseDO.getHouseNum())
+                        .eq(ComMngVillageDO::getCommunityId,communityId));
+                if (comMngVillageDO != null) {
+                    populationDO.setVillageId(comMngVillageDO.getVillageId());
+                    if(!StringUtils.isEmpty(comMngVillageDO.getGroupAt())){
+                        populationDO.setVillageName(comMngVillageDO.getGroupAt());
+                    }
+                }
+            }
+        }
+        populationDO.setUpdateAt(new Date());
+        if(populationDAO.updateById(populationDO) > 0){
+            return R.ok();
+        }else{
+            return R.fail("修改失败");
+        }
+    }
+
+    @Override
+    public R specialInputUser(PageInputUserDTO pageInputUserDTO){
+        IPage<InputUserInfoVO> iPage = populationDAO.specialInputUser(new Page<>(pageInputUserDTO.getPageNum()
+                ,pageInputUserDTO.getPageSize()), pageInputUserDTO);
+        return R.ok(iPage);
+    }
+
+    /**
+     * 删除特殊群体人员
+     * @param id    特殊群体id
+     * @return  删除结果
+     */
+    @Override
+    public R deleteSpecialInputUser(Long id){
+        //查询特殊群体人员
+        ComMngPopulationDO populationDO = this.baseMapper.selectById(id);
+        if(populationDO == null){
+            return R.fail("未查询到该记录");
+        }
+        populationDO.setLabel(null);
+        if(this.baseMapper.updateById(populationDO) > 0){
+            return R.ok();
+        }else{
+            return R.fail();
+        }
+    }
+
+    /**
+     * 查询实有人口电子档信息
+     * @param populationId  实有人口id
+     * @return  实有人口电子档信息
+     */
+    @Override
+    public R electronicArchivesPopulation(Long populationId){
+        ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
+        if (ObjectUtils.isEmpty(comMngPopulationDO)) {
+            return R.fail("用户信息不存在");
+        }
+        //查询当前用户电子档信息
+        if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
+            UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
+            if(electronicFileVO != null){
+                return R.ok(electronicFileVO);
+            }
+        }
+        return R.ok();
+    }
+
+    @Override
+    public R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO) {
+        UserElectronicFileVO electronicFileVO = populationDAO.getSysUserById(userElectronicFileVO.getUserId());
+        if(electronicFileVO==null){
+            return R.fail("id有误!");
+        }
+         populationDAO.updateSysUserElectronicFile(userElectronicFileVO);
+        return R.ok();
+    }
+
+    /**
+     * 实有人口统计
+     * @param communityId   社区id
+     * @return  统计结果
+     */
+    @Override
+    public R getPopulationTotalByAdmin(Long communityId){
+        return R.ok(this.baseMapper.getPopulationTotalByAdmin(communityId));
+    }
+
+    /**
+     * 首页大屏统计接口
+     * @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{
+                        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 communityId   社区id
+     * @return  统计结果
+     */
+    @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);
+        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);
+
+        //查询网格数据
+        List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
+        statisticsVO.setGridStatisticsList(gridStatisticsList);
+
+        //查询社区事件列表
+        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
+        statisticsVO.setGridIncidentList(gridIncidentList);
+
+        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{
+                        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 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);
+
+        //查询小区列表
+        List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
+        comActPopulationScreenVO.setVillageStatisticsList(villageStatisticsList);
+
+        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 R getScreenGirds(Long communityId){
+        return R.ok(this.baseMapper.getEventScreenGridData(communityId));
+    }
+
+    public static void main(String[] args) {
+//        List<ComMngPopulationHouseUserDO> distinctClass = populationHouseUserDOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getPopulId() + ";" + o.getHouseId() + ";" + o.getId() + ";" + o.getRelation()))), ArrayList::new));
+    }
 }

--
Gitblit v1.7.1