From 4fc44644c4a7bf9f0770a95ddbdad466c2743cb4 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 10 五月 2021 09:07:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 98 insertions(+), 13 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 8e2bea8..27f2053 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,6 @@
package com.panzhihua.service_community.service.impl;
+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;
@@ -9,12 +10,16 @@
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.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
+import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.InputUserInfoVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
@@ -28,6 +33,7 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import javax.crypto.BadPaddingException;
@@ -121,15 +127,28 @@
public R detailPopulation(Long populationId) {
ComMngPopulationDO comMngPopulationDO = populationDAO.selectById(populationId);
if (ObjectUtils.isEmpty(comMngPopulationDO)) {
- return R.fail();
+ return R.fail("用户信息不存在");
}
ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);
- //查询房屋成员信息
+ //查询户主关系信息
List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO);
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);
+ }
+ }
}
return R.ok(comMngPopulationVO);
}
@@ -193,31 +212,38 @@
@Override
public R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) {
- if (list.size() == 0) {
- return R.fail("数据为空！");
- }
+ 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) {
- return R.fail("导入实有人口已存在(" + vo.getCardNo() + ")");
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorMsg("导入实有人口已存在(" + vo.getCardNo() + ")");
+ importErrorVO.setErrorPosition("第" + index + "行，第2列");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
+// return R.fail(501,"导入实有人口已存在(" + vo.getCardNo() + ")");
}
- index++;
- }
- ComActDO comActDO = comActDAO.selectById(communityId);
- ArrayList<ComMngPopulationDO> populationDOList = Lists.newArrayList();
- list.forEach(vo -> {
+
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) {
- throw new ServiceException("街道巷:" + vo.getRoad() + "不存在！");
+ 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());
@@ -226,8 +252,19 @@
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);*/
+
this.saveBatch(populationDOList);
+ if(!populationImportErrorVOList.isEmpty()){
+ return R.fail(JSON.toJSONString(populationImportErrorVOList));
+ }
return R.ok("共计导入实有人口数量：" + populationDOList.size());
}
@@ -410,4 +447,52 @@
this.updateById(populationDO);
return R.ok();
}
+
+ @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();
+ }
}
--
Gitblit v1.7.1