From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 259 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 197 insertions(+), 62 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..e86f969 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,6 +1,6 @@
package com.panzhihua.service_community.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -10,28 +10,36 @@
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.helper.AESUtil;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.service_community.dao.ComActActivityDAO;
+import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
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.service_community.service.ComMngPopulationService;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 实有人口Service实现类
@@ -44,6 +52,8 @@
private ComActDAO comActDAO;
@Resource
private ComActVillageDAO comActVillageDAO;
+ @Value("${domain.aesKey:}")
+ private String aesKey;
/**
@@ -117,8 +127,8 @@
ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
- //查询家庭成员信息
- List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = populationDAO.listFamilyByUserId(comMngPopulationDO.getId());
+ //查询房屋成员信息
+ List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO);
if (!comMngFamilyInfoVOS.isEmpty()) {
comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
}
@@ -184,79 +194,113 @@
@Override
public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) {
+ List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
+ List<ComMngPopulationDO> comMngPopulationDOS = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getActId, communityId));
+ //查询该社区所有(实有房屋)小区
+// List<ComMngVillageDO> villageDOList = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
+ int index = 2;
+ for (ComMngPopulationServeExcelVO vo : list) {
+ //判断DB和exel数据重复判断
+ boolean result = comMngPopulationDOS.stream().anyMatch(population -> population.getCardNo().equals(vo.getCardNo()));
+ if (result) {
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
+ importErrorVO.setErrorPosition("第" + index + "行,第2列");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+// return R.fail(501,"导入实有人口已存在(" + vo.getCardNo() + ")");
+ }
+
+ ComMngPopulationDO comMngPopulationDO = new ComMngPopulationDO();
+ //查询街路巷是否存在
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+// ComMngVillageDO comMngVillageDO = villageDOList.stream().filter(village -> village.getAlley().equals(vo.getRoad()) && village.getHouseNum().equals(Integer.valueOf(vo.getDoorNo()))).findFirst().orElse(null);
+ BeanUtils.copyProperties(vo, comMngPopulationDO);
+ if (comMngVillageDO == null) {
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("查无:" + vo.getRoad() + "小区/房租地址，请先新建地址");
+ importErrorVO.setErrorPosition("第" + index + "行,第7,8列");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+ }
+ List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
+ comMngPopulationDO.setVillageId(comMngVillageDO.getVillageId());
+ comMngPopulationDO.setActId(comActDO.getCommunityId());
+ comMngPopulationDO.setStreetId(comActDO.getStreetId());
+ comMngPopulationDO.setLabel(Joiner.on(",").join(userTag));
+ comMngPopulationDO.setVillageName(comMngVillageDO.getGroupAt());
+ populationDOList.add(comMngPopulationDO);
+ index++;
+ }
+ //如果有错误，返回错误
+ if(!populationImportErrorVOList.isEmpty()){
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
+
+ this.saveBatch(populationDOList);
+ return R.ok("共计导入实有人口数量：" + populationDOList.size());
+ }
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @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 +333,95 @@
}
return R.ok();
}
+
+ /**
+ * 批量删除实有人口
+ * @param Ids
+ * @return
+ */
+ @Override
+ public R deletePopulations(List<Long> Ids) {
+ 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(EditComMngPopulationVO vo, Long communityId) {
+ ComActDO comActDO = comActDAO.selectById(communityId);
+ ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
+ if(populationDO==null){
+ return R.fail();
+ }
+ BeanUtils.copyProperties(vo,populationDO);
+ try {
+ //TODO 修改拦截器时候需要维护加密操作
+ populationDO.setCardNo(AESUtil.encrypt128(populationDO.getCardNo(), aesKey));
+ populationDO.setPhone(AESUtil.encrypt128(populationDO.getPhone(), aesKey));
+
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ }
+
+ ComMngVillageDO comMngVillageDO = comActVillageDAO.selectOne(new QueryWrapper<ComMngVillageDO>().eq("alley",vo.getRoad()).eq("house_num",vo.getDoorNo()).eq("community_id",communityId));
+ if (comMngVillageDO == null) {
+ throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
+ }
+ populationDO.setVillageId(comMngVillageDO.getVillageId());
+ populationDO.setActId(comActDO.getCommunityId());
+ populationDO.setStreetId(comActDO.getStreetId());
+ populationDO.setVillageName(comMngVillageDO.getGroupAt());
+ this.updateById(populationDO);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1