Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java

@@ -1,37 +1,11 @@
package com.panzhihua.service_user.service.impl;

import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.ComMngUserTagDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.InputUserTagsDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dos.SysUserInputDO;
import com.panzhihua.service_user.service.SysUserInputService;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import javax.annotation.Resource;

import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -39,11 +13,32 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.user.ComMngUserTagDTO;
import com.panzhihua.common.model.dtos.user.EexcelUserDTO;
import com.panzhihua.common.model.dtos.user.InputUserTagsDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
import com.panzhihua.service_user.model.dos.SysUserInputDO;
import com.panzhihua.service_user.service.SysUserInputService;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -52,17 +47,22 @@
 * @create: 2021-02-05 17:42
 **/
@Service
public class SysUserInputServiceImpl extends ServiceImpl<SysUserInputDAO, SysUserInputDO> implements SysUserInputService {
public class SysUserInputServiceImpl extends ServiceImpl<SysUserInputDAO, SysUserInputDO>
    implements SysUserInputService {
    @Resource
    private SysUserInputDAO sysUserInputDAO;
    @Resource
    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private ComMngUserTagDAO comMngUserTagDAO;

    /**
     * 批量导入居民用户
     * @param list 居民用户集合
     * @param areaName 小区名字
     * 
     * @param list
     *            居民用户集合
     * @param areaName
     *            小区名字
     * @return 导入结果
     */
    @Override
@@ -85,15 +85,15 @@
            List<ComMngStructHouseVO> comMngStructHouseVOS1=comMngStructHouseVOS;
            list.forEach(eexcelUserDTO -> {
                //判断身份证和门牌号是否重复
                int count = sysUserInputDAO.selectCount(new QueryWrapper<SysUserInputDO>().lambda()
                        .eq(SysUserInputDO::getIdCard,eexcelUserDTO.getIdCard())
                        .and(wrapper->wrapper.eq(SysUserInputDO::getDoorNumber,eexcelUserDTO.getDoorNumber()))
                );
                int count = sysUserInputDAO.selectCount(
                    new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard, eexcelUserDTO.getIdCard())
                        .and(wrapper -> wrapper.eq(SysUserInputDO::getDoorNumber, eexcelUserDTO.getDoorNumber())));
                if(count==0){
                    SysUserInputDO sysUserInputDO=new SysUserInputDO();
                    String doorNumber = eexcelUserDTO.getDoorNumber();
                    //暂时注释门牌号匹配设置房屋编号功能
//                    List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
                    // List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO ->
                    // comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
//                    if (ObjectUtils.isEmpty(collect)) {
//                        throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
//                    }else{
@@ -120,7 +120,8 @@
                    sysUserInputDO.setPhone(eexcelUserDTO.getPhone());
                    String politicalOutlook = eexcelUserDTO.getPoliticalOutlook();
                    if(!ObjectUtils.isEmpty(politicalOutlook)){
                        sysUserInputDO.setPoliticalOutlook(politicalOutlook.equals("党员")?1:politicalOutlook.equals("团员")?2:3);
                        sysUserInputDO.setPoliticalOutlook(
                            politicalOutlook.equals("党员") ? 1 : politicalOutlook.equals("团员") ? 2 : 3);
                    }else{
                        sysUserInputDO.setPoliticalOutlook(3);
                    }
@@ -140,7 +141,8 @@
    /**
     * 社区人员详情包括导入人员
     *
     * @param userId 人员id
     * @param userId
     *            人员id
     * @return CommunityUserInfoVO
     */
    @Override
@@ -167,7 +169,7 @@
            Integer oldPeople = sysUserInputDO.getOldPeople();
            Integer disability = sysUserInputDO.getDisability();

            StringBuilder stringBuilder=new StringBuilder("");
            StringBuilder stringBuilder = new StringBuilder();
            if (keyPersonnel.intValue()==1) {
                stringBuilder.append("重点人员,");
            }
@@ -228,7 +230,8 @@
        SysUserInputDO userInputDO=new SysUserInputDO();
        userInputDO.setId(inputUserTagsDTO.getId());
        userInputDO.setTags(inputUserTagsDTO.getTags());
        List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getId,userInputDO.getId()));
        List<SysUserInputDO> all = sysUserInputDAO
            .selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getId, userInputDO.getId()));
        all.forEach(d->{
            if(!StringUtils.isEmpty(d.getTags())){
                d.setTags(d.getTags()+","+inputUserTagsDTO.getTags());
@@ -246,7 +249,6 @@
        List<EexcelUserDTO> eexcelUserDTOS=sysUserInputDAO.selectExport(exportUserDTO);
        return R.ok(eexcelUserDTOS);
    }


    @Override
    public R inputUserDetail(Long id) {
@@ -269,7 +271,7 @@
            Integer oldPeople = sysUserInputDO.getOldPeople();
            Integer disability = sysUserInputDO.getDisability();

            StringBuilder stringBuilder=new StringBuilder("");
            StringBuilder stringBuilder = new StringBuilder();
            if (keyPersonnel.intValue()==1) {
                stringBuilder.append("重点人员,");
            }
@@ -295,7 +297,8 @@
            String doorNumber = sysUserInputDO.getDoorNumber();
            List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = sysUserInputDAO.selectListFamily(doorNumber,id);
            inputUserInfoVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
            List<ComMngStructHouseVO> comMngStructHouseVOS = sysUserInputDAO.selectUserHouseList(inputUserInfoVO.getIdCard());
            List<ComMngStructHouseVO> comMngStructHouseVOS =
                sysUserInputDAO.selectUserHouseList(inputUserInfoVO.getIdCard());
            inputUserInfoVO.setComMngStructHouseVOS(comMngStructHouseVOS);
        }
        return R.ok(inputUserInfoVO);
@@ -349,7 +352,8 @@
            if(comMngUserTagDO.getSysFlag()==1){
                return R.fail("系统预置标签不可修改");
            }
            ComMngUserTagDO exist = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName,comMngTagVO.getTagName()));
            ComMngUserTagDO exist = comMngUserTagDAO.selectOne(
                new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
            if(null!=exist && !exist.getId().equals(comMngTagVO.getId())){
                return R.fail("标签重复");
            }
@@ -392,7 +396,8 @@
        if(null==sysUserInputDO){
            return R.fail("用户不存在");
        }
        List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard,sysUserInputDO.getIdCard()));
        List<SysUserInputDO> sysUserInputDOS = sysUserInputDAO.selectList(
            new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard, sysUserInputDO.getIdCard()));
        sysUserInputDOS.forEach(sysUserInput ->{
            sysUserInput.setTags(null);
            sysUserInput.setKeyPersonnel(0);