Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java

@@ -1,5 +1,18 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;

import javax.annotation.Resource;

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.ObjectUtils;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,29 +25,12 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.service_community.dao.ComEldersAuthElderlyMapper;
import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
import com.panzhihua.service_community.service.EldersAuthService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
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.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.text.SimpleDateFormat;
import java.util.*;
import lombok.extern.slf4j.Slf4j;

/**
 * 高龄老人库 serviceImpl
@@ -43,10 +39,11 @@
 * @version 1.0
 * @since 1.0
 * @date 2021-06-09
 * */
 */
@Slf4j
@Service
public class ComEldersAuthElderlyServiceImpl extends ServiceImpl<ComEldersAuthElderlyMapper, ComEldersAuthElderlyDO> implements ComEldersAuthElderlyService {
public class ComEldersAuthElderlyServiceImpl extends ServiceImpl<ComEldersAuthElderlyMapper, ComEldersAuthElderlyDO>
    implements ComEldersAuthElderlyService {

    @Resource
    private ComEldersAuthElderlyMapper comEldersAuthElderlyMapper;
@@ -60,19 +57,21 @@
    @Override
    public R pageQueryEldersAuthElderly(PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO) {
        PageComEldersAuthElderlyDTO pageComEldersAuthElderlyDTO = new PageComEldersAuthElderlyDTO();
        BeanUtils.copyProperties(pageEldersAuthElderlyDTO,pageComEldersAuthElderlyDTO);
        IPage<ComEldersAuthElderlyVO> page = comEldersAuthElderlyMapper.findByPage(new Page(pageEldersAuthElderlyDTO.getPageNum(),pageEldersAuthElderlyDTO.getPageSize()),pageComEldersAuthElderlyDTO);
        BeanUtils.copyProperties(pageEldersAuthElderlyDTO, pageComEldersAuthElderlyDTO);
        IPage<ComEldersAuthElderlyVO> page = comEldersAuthElderlyMapper.findByPage(
            new Page(pageEldersAuthElderlyDTO.getPageNum(), pageEldersAuthElderlyDTO.getPageSize()),
            pageComEldersAuthElderlyDTO);
        return R.ok(page);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public R batchSave(List<EldersAuthElderlyExcelVO> list,Long communityId,Long createBy) {
    public R batchSave(List<EldersAuthElderlyExcelVO> list, Long communityId, Long createBy) {
        List<ComEldersAuthElderlyDO> listNewDO = new ArrayList<>();
        List<ComEldersAuthElderlyDO> listUpdateDO = new ArrayList<>();
        list.forEach(e->{
        list.forEach(e -> {
            String idCardProto = e.getIdCard();
            if(idCardProto!=null && idCardProto.contains("x")){
            if (idCardProto != null && idCardProto.contains("x")) {
                idCardProto = idCardProto.replaceAll("x", "X");
            }
            String idCardEncrypted = idCardProto;
@@ -81,47 +80,48 @@
            } catch (Exception exp) {
                exp.printStackTrace();
            }
            List<ComEldersAuthElderlyDO> comEldersAuthElderlyDOList =
                    comEldersAuthElderlyMapper.selectList(new LambdaQueryWrapper<ComEldersAuthElderlyDO>().eq(ComEldersAuthElderlyDO::getIdCard, idCardEncrypted)
            List<ComEldersAuthElderlyDO> comEldersAuthElderlyDOList = comEldersAuthElderlyMapper.selectList(
                new LambdaQueryWrapper<ComEldersAuthElderlyDO>().eq(ComEldersAuthElderlyDO::getIdCard, idCardEncrypted)
                    .orderByDesc(ComEldersAuthElderlyDO::getCreateAt));

            if(comEldersAuthElderlyDOList!=null && comEldersAuthElderlyDOList.size()>0){
            if (comEldersAuthElderlyDOList != null && comEldersAuthElderlyDOList.size() > 0) {
                ComEldersAuthElderlyDO lastestOne = comEldersAuthElderlyDOList.get(0);
                lastestOne.setName(e.getName());
                lastestOne.setCommunityId(communityId);
                lastestOne.setUpdateBy(createBy);
                lastestOne.setIdCard(null);
                lastestOne.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
                lastestOne.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
                lastestOne.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
                lastestOne.setIsExist(Objects.equals("是", e.getIsExist()) ? 1 : 2);
                lastestOne.setIsBigAge(Objects.equals("是", e.getIsExist()) ? 1 : 2);
                lastestOne.setUpdateAt(new Date());
                listUpdateDO.add(lastestOne);
            }else{
            } else {
                ComEldersAuthElderlyDO comEldersAuthElderlyDO = new ComEldersAuthElderlyDO();
                comEldersAuthElderlyDO.setName(e.getName());
                comEldersAuthElderlyDO.setIdCard(e.getIdCard());
                comEldersAuthElderlyDO.setCommunityId(communityId);
                comEldersAuthElderlyDO.setCreateBy(createBy);
                comEldersAuthElderlyDO.setDomicile(eldersAuthService.queryDomicile(e.getIdCard()));
                comEldersAuthElderlyDO.setIsExist(Objects.equals("是",e.getIsExist())?1:2);
                comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是",e.getIsExist())?1:2);
                comEldersAuthElderlyDO.setIsExist(Objects.equals("是", e.getIsExist()) ? 1 : 2);
                comEldersAuthElderlyDO.setIsBigAge(Objects.equals("是", e.getIsExist()) ? 1 : 2);
                comEldersAuthElderlyDO.setBirthday(e.getBirthday());
                comEldersAuthElderlyDO.setLevel(e.getLevel());
                listNewDO.add(comEldersAuthElderlyDO);
            }

        });
        boolean noImport = (listNewDO==null || listNewDO.size()==0) &&  (listUpdateDO==null || listUpdateDO.size()==0);
        if(noImport){
        boolean noImport =
            (listNewDO == null || listNewDO.size() == 0) && (listUpdateDO == null || listUpdateDO.size() == 0);
        if (noImport) {
            throw new ServiceException("未发现高龄老人数据");
        }
        if(listNewDO!=null && listNewDO.size()>0) {
        if (listNewDO != null && listNewDO.size() > 0) {
            boolean batchAdd = this.saveBatch(listNewDO);
            if (!batchAdd) {
                throw new ServiceException("批量插入失败");
            }
        }
        if(listUpdateDO!=null && listUpdateDO.size()>0) {
        if (listUpdateDO != null && listUpdateDO.size() > 0) {
            boolean batchUpdate = this.updateBatchById(listUpdateDO);
            if (!batchUpdate) {
                throw new ServiceException("批量更新失败");
@@ -131,26 +131,25 @@
        return R.ok("共计导入高龄老人数量：" + list.size());
    }


    @Override
    public R getEldersAuthElderlyById(Long id) {
        ComEldersAuthElderlyDO comEldersAuthElderlyDO = this.baseMapper.selectById(id);
        if(comEldersAuthElderlyDO==null){
        if (comEldersAuthElderlyDO == null) {
            return R.fail("记录不存在");
        }
        ComEldersAuthElderlyVO comEldersAuthElderlyVO = new ComEldersAuthElderlyVO();
        BeanUtils.copyProperties(comEldersAuthElderlyDO,comEldersAuthElderlyVO);
        BeanUtils.copyProperties(comEldersAuthElderlyDO, comEldersAuthElderlyVO);
        return R.ok(comEldersAuthElderlyVO);
    }

    @Override
    public R updateEldersAuthElderly(EldersAuthElderlyDTO eldersAuthElderlyDTO) {
        ComEldersAuthElderlyDO  comEldersAuthElderlyDO = this.baseMapper.selectById(eldersAuthElderlyDTO.getId());
        if(!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getName())){
        ComEldersAuthElderlyDO comEldersAuthElderlyDO = this.baseMapper.selectById(eldersAuthElderlyDTO.getId());
        if (!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getName())) {
            comEldersAuthElderlyDO.setName(eldersAuthElderlyDTO.getName());
        }
        if(eldersAuthElderlyDTO.getIsExist()!=null&&
                eldersAuthElderlyDTO.getIsExist().intValue()!=1 && eldersAuthElderlyDTO.getIsExist()!=2){
        if (eldersAuthElderlyDTO.getIsExist() != null && eldersAuthElderlyDTO.getIsExist().intValue() != 1
            && eldersAuthElderlyDTO.getIsExist() != 2) {
            return R.fail("参数错误，是否健在只能为1或2");
        }
        comEldersAuthElderlyDO.setIsExist(eldersAuthElderlyDTO.getIsExist());
@@ -161,8 +160,8 @@

    @Override
    public R deleteEldersAuthElderly(Long id) {
        if(this.baseMapper.deleteById(id) > 0){
            //删除用户关联的老人信息
        if (this.baseMapper.deleteById(id) > 0) {
            // 删除用户关联的老人信息
            this.baseMapper.deleteEldersAuthUserById(id);
            return R.ok();
        }