Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

Pu Zhibing

2025-03-16 6aa6dc075078cca11be048a267911bd7f74dadcd

 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/PartyMemberServiceImpl.java

@@ -1,14 +1,27 @@
package com.panzhihua.sangeshenbian.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.idev.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.sangeshenbian.SystemUserVo;
import com.panzhihua.sangeshenbian.enums.AuditStatusEnum;
import com.panzhihua.sangeshenbian.model.entity.BcRegion;
import com.panzhihua.sangeshenbian.model.entity.ComAct;
import com.panzhihua.sangeshenbian.model.entity.ComStreet;
import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.dao.PartyMemberMapper;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberExcel;
import com.panzhihua.sangeshenbian.warpper.PartyMemberImportFailedVO;
import com.panzhihua.sangeshenbian.model.excel.PartyMemberTemplate;
import com.panzhihua.sangeshenbian.service.IBcRegionService;
import com.panzhihua.sangeshenbian.service.IComActService;
import com.panzhihua.sangeshenbian.service.IComStreetService;
import com.panzhihua.sangeshenbian.service.IPartyMemberService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.sangeshenbian.warpper.PartyMemberDTO;
@@ -16,10 +29,13 @@
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -36,6 +52,9 @@
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
public class PartyMemberServiceImpl extends ServiceImpl<PartyMemberMapper, PartyMember> implements IPartyMemberService {
    private final HttpServletResponse response;
    private final IBcRegionService bcRegionService;
    private final IComStreetService comStreetService;
    private final IComActService comActService;
    /**
     * 党员分页查询列表
     *
@@ -60,6 +79,8 @@
        if (Objects.isNull(dto.getId())) {
            //添加
            partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
            partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
            partyMember.setSource(1);
            save(partyMember);
        } else {
            partyMember.setUpdateBy(Long.parseLong(loginUserInfo.getId().toString()));
@@ -85,7 +106,7 @@
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("党员导入模板", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), PartyMemberTemplate.class)
        EasyExcel.write(response.getOutputStream(), PartyMemberTemplate.class)
                .sheet("党员导入模板")
                .doWrite(Collections.emptyList());
    }
@@ -103,18 +124,158 @@
        response.setCharacterEncoding("utf-8");
        String fileName = URLEncoder.encode("党员数据", "UTF-8").replaceAll("\\+", "%20");
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), PartyMemberExcel.class)
        EasyExcel.write(response.getOutputStream(), PartyMemberExcel.class)
                .sheet("党员数据")
                .doWrite(partyMemberExcels);
    }

    /**
     *
     * @param file
     * @param loginUserInfo
     */
    @Override
    public void importExcel(SystemUserVo loginUserInfo) {
    @Transactional(rollbackFor = Exception.class)
    public List<PartyMemberImportFailedVO> importExcel(MultipartFile file, SystemUserVo loginUserInfo) throws IOException {
        // 使用 FastExcel 同步读取 Excel 数据为对象列表
        List<PartyMemberTemplate> list = EasyExcel.read(file.getInputStream()).head(PartyMemberTemplate.class).headRowNumber(2).sheet().doReadSync();
        if (CollUtil.isEmpty(list)) {
            throw new ServiceException("导入数据为空");
        }
        
        // 存储验证失败的记录
        List<PartyMemberImportFailedVO> failedList = new ArrayList<>();
        // 存储验证成功的记录
        List<PartyMember> validPartyMembers = new ArrayList<>();
        
        // 手机号正则表达式
        String phoneRegex = "^1[3-9]\\d{9}$";
        // 身份证号正则表达式
        String idCardRegex = "(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)";
        
        // 批量验证数据
        for (PartyMemberTemplate template : list) {
            PartyMemberImportFailedVO failedVO = new PartyMemberImportFailedVO();
            boolean isValid = true;
            StringBuilder errorMsg = new StringBuilder();
            
            // 复制数据到失败记录对象
            BeanUtil.copyProperties(template, failedVO);
            
            // 1. 验证手机号
            if (StrUtil.isBlank(template.getPhone()) || !template.getPhone().matches(phoneRegex)) {
                isValid = false;
                errorMsg.append("手机号格式不正确; ");
            }
            
            // 2. 验证身份证号
            if (StrUtil.isBlank(template.getIdNumber()) || !template.getIdNumber().matches(idCardRegex)) {
                isValid = false;
                errorMsg.append("身份证号格式不正确; ");
            }
            
            // 3. 验证账号是否已存在
            if (StrUtil.isNotBlank(template.getPhone())) {
                LambdaQueryWrapper<PartyMember> queryWrapper = new LambdaQueryWrapper<>();
                queryWrapper.eq(PartyMember::getPhone, template.getPhone());
                long count = count(queryWrapper);
                if (count > 0) {
                    isValid = false;
                    errorMsg.append("账号已存在");
                }
            }
            
            // 4. 验证所在社区
            String districtName = null;
            String streetName = null;
            String communityName = null;
            String districtCode = "";
            String streetId = "";
            Long communityId = null;

            if (StrUtil.isNotBlank(template.getCommunity())) {
                String[] addressParts = template.getCommunity().split("-");
                if (addressParts.length != 3) {
                    isValid = false;
                    errorMsg.append("社区格式不正确，应为'区县-街道-社区'; ");
                } else {
                    districtName = addressParts[0];
                    streetName = addressParts[1];
                    communityName = addressParts[2];
                    
                    // 验证区县、街道、社区信息
                    
                    // 验证区县是否存在
                    BcRegion district = bcRegionService.getDistrictByName(districtName);
                    
                    if (Objects.isNull(district)) {
                        isValid = false;
                        errorMsg.append("区县不存在; ");
                    } else {
                        // 验证街道是否存在且属于该区县
                        ComStreet comStreet =  comStreetService.getStreetByNameAndDistrict(streetName, district.getRegionCode());
                        districtCode = district.getRegionCode();
                        if (Objects.isNull(comStreet)) {
                            isValid = false;
                            errorMsg.append("街道不存在或不属于所选区县; ");
                        } else {
                            // 验证社区是否存在且属于该街道
                            // 实际代码应该是调用相应的Service查询社区信息
                            ComAct comAct = comActService.getCommunityByNameAndStreet(communityName, comStreet.getStreetId());
                            streetId = comStreet.getStreetId();
                            communityId = comAct.getCommunityId();
                            if (Objects.isNull(comAct)) {
                                isValid = false;
                                errorMsg.append("社区不存在或不属于所选街道; ");
                            }
                        }
                    }
                }
            } else {
                isValid = false;
                errorMsg.append("社区信息不能为空; ");
            }
            
            // 如果验证失败，添加到失败列表，否则添加到成功列表
            if (!isValid) {
                failedVO.setFailReason(errorMsg.toString());
                failedList.add(failedVO);
            } else {
                PartyMember partyMember = new PartyMember();
                BeanUtil.copyProperties(template, partyMember);
                
                // 设置创建人和更新人
                partyMember.setCreateBy(Long.parseLong(loginUserInfo.getId().toString()));
                partyMember.setUpdateBy(Long.parseLong(loginUserInfo.getId().toString()));
                //导入党员默认审核通过
                partyMember.setAuditStatus(AuditStatusEnum.APPROVED.getCode());
                partyMember.setSource(1);//管理后台录入
                //默认头像 TODO 默认头像
                partyMember.setAvatar("");
                // 根据身份证号设置性别
                if (StrUtil.isNotBlank(template.getIdNumber())) {
                    partyMember.setGender(getGender(template.getIdNumber()));
                }

                // 然后设置到partyMember对象中
                 partyMember.setDistricts(districtName);
                 partyMember.setDistrictsCode(districtCode);
                 partyMember.setStreet(streetName);
                 partyMember.setStreetId(streetId);
                 partyMember.setCommunity(communityName);
                 partyMember.setCommunityId(communityId);

                validPartyMembers.add(partyMember);
            }
        }
        
        // 处理验证成功的数据
        if (!validPartyMembers.isEmpty()) {
            // 批量保存
            saveBatch(validPartyMembers);
        }
        
        // 返回验证失败的数据
        return failedList;
    }

    /**