Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java

@@ -5,14 +5,19 @@
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.OSSException;
import com.aliyun.oss.model.GetObjectRequest;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.mzl.flower.config.OssProperties;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
import com.mzl.flower.dto.request.sms.SmsTaskDTO;
import com.mzl.flower.dto.request.sms.SmsTaskQueryDTO;
import com.mzl.flower.dto.request.sms.SmsUserDTO;
import com.mzl.flower.dto.response.sms.SmsSelectVO;
import com.mzl.flower.dto.response.sms.SmsTaskVO;
import com.mzl.flower.entity.SmsTaskDO;
import com.mzl.flower.entity.SmsTaskDetailDO;
@@ -20,8 +25,10 @@
import com.mzl.flower.mapper.SmsTaskDetailMapper;
import com.mzl.flower.mapper.SmsTaskMapper;
import com.mzl.flower.mapper.SmsTemplateMapper;
import com.mzl.flower.mapper.system.UserMapper;
import com.mzl.flower.service.sms.SmsTaskDetailService;
import com.mzl.flower.service.sms.SmsTaskService;
import com.mzl.flower.service.system.UserService;
import com.mzl.flower.utils.SmsUtil;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.*;
@@ -29,12 +36,13 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -57,6 +65,8 @@
    private final OssProperties ossProperties;
    private final SmsTaskMapper smsTaskMapper;

    private final UserMapper userMapper;

    private final SmsTemplateMapper smsTemplateMapper;

    private final SmsTaskDetailMapper smsTaskDetailMapper;
@@ -76,7 +86,7 @@
    }

    @Override
    public void saveSmsTask(SmsTaskDTO smsTaskDTO) {
    public void saveSmsTask(SmsTaskDTO smsTaskDTO) throws IOException {
        //校验
        if (StringUtils.isEmpty(smsTaskDTO.getName())) {
            throw new ValidationException("短信名称不能为空");
@@ -90,7 +100,7 @@
            throw new ValidationException("接收号码类型不能为空");
        }

        if ((Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) || Constants.SMS_RECEIVE_TYPE.SELECT.name().equals(smsTaskDTO.getType())) && StringUtils.isEmpty(smsTaskDTO.getPhones())) {
        if (Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) && StringUtils.isEmpty(smsTaskDTO.getPhones())) {
            throw new ValidationException("手机号不能为空");
        }

@@ -98,7 +108,7 @@
            throw new ValidationException("导入文件不能为空");
        }

        if (Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) || Constants.SMS_RECEIVE_TYPE.SELECT.name().equals(smsTaskDTO.getType())) {
        if (Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) ) {

            //解析手机号，包含不同平台的换行符
            String text = smsTaskDTO.getPhones();
@@ -119,15 +129,52 @@
        if (Constants.SMS_RECEIVE_TYPE.IMPORT.name().equals(smsTaskDTO.getType())) {
            dealImportExcel(smsTaskDTO);
        }
        List<SmsUserDTO> smsUserDTOS = smsTaskDTO.getSmsUserDTOS();
        SmsTaskDO smsTaskDO = new SmsTaskDO();
        BeanUtils.copyProperties(smsTaskDTO, smsTaskDO);
        if(!CollectionUtils.isEmpty(smsUserDTOS)){
            List<String> userIds = smsUserDTOS.stream()
                    .map(SmsUserDTO::getUserId)
                    .collect(Collectors.toList());

            List<String> userPhones = smsUserDTOS.stream()
                    .map(SmsUserDTO::getUserPhone)
                    .collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(userPhones)){
                String phones = userPhones.stream()
                        .map(Object::toString) // 确保每个元素都转换为字符串
                        .collect(Collectors.joining("\n")); // 使用换行符连接字符串
                smsTaskDTO.setPhones(phones); // 假设有一个setPhones方法用于设置phones字段
            }
            if (!CollectionUtils.isEmpty(userIds)) {
                String userIdInfos = userIds.stream().map(Object::toString) // 确保每个元素都转换为字符串
                        .collect(Collectors.joining(";")); // 使用换行符连接字符串
                smsTaskDO.setUserIds(userIdInfos);
                smsTaskDTO.setNum((long) userIds.size());
            }
        }
        smsTaskDO.setStatus(Constants.SMS_TASK_STATUS.wait_publish.name());
        smsTaskDO.setPhones(smsTaskDTO.getPhones());
        smsTaskDO.create(SecurityUtils.getUserId());
        smsTaskMapper.insert(smsTaskDO);
    }

    private void dealImportExcel(SmsTaskDTO smsTaskDTO) {
    private void dealImportExcel(SmsTaskDTO smsTaskDTO) throws IOException {
        String fileUrlMessage = "";
        // 创建ObjectMapper实例
        ObjectMapper objectMapper = new ObjectMapper();
        JsonNode rootNode = objectMapper.readTree(smsTaskDTO.getFileUrl());
        if (rootNode.isArray()) {
            JsonNode firstElement = rootNode.get(0);
            if (firstElement.has("url")) {
                 fileUrlMessage = firstElement.get("url").asText();
            } else {
                throw new ValidationException("URL字段不存在");
            }
        } else {
            throw new ValidationException("JSON数组为空或不是数组");
        }

        String endPoint = ossProperties.getEndpoint();
        String accessKeyId = ossProperties.getKeyid();
        String accessKeySecret = ossProperties.getKeysecret();
@@ -137,10 +184,13 @@
        try {
            // 下载Excel文件到本地临时文件
            File tempFile = File.createTempFile("temp", ".xlsx");
            ossClient.getObject(new GetObjectRequest(bucketName, smsTaskDTO.getFileUrl()), tempFile);
            String fileUrl = fileUrlMessage;
            String objectKey = fileUrl.replaceFirst("^https?://[^/]+/", ""); // 去掉协议部分
            ossClient.getObject(new GetObjectRequest(bucketName, objectKey), tempFile);

            // 解析Excel文件
            try (FileInputStream inputStream = new FileInputStream(tempFile); Workbook workbook = new XSSFWorkbook(inputStream)) {
            try (FileInputStream inputStream = new FileInputStream(tempFile);
                 Workbook workbook = new XSSFWorkbook(inputStream)) {

                Sheet sheet = workbook.getSheetAt(0); // 获取第一个工作表
                int rowCount = sheet.getPhysicalNumberOfRows();
@@ -156,8 +206,14 @@
                    Row row = sheet.getRow(i);
                    if (row != null) {
                        Cell cell = row.getCell(0); // 假设手机号在第一列
                        if (cell != null && cell.getCellType() == CellType.STRING) {
                            String phoneNumber = cell.getStringCellValue();
                        if (cell != null ) {
                            String phoneNumber = "";
                            if (cell.getCellType() == CellType.STRING) {
                                phoneNumber = cell.getStringCellValue();
                            } else if (cell.getCellType() == CellType.NUMERIC) {
                                // 将数字类型的手机号转换为字符串
                                phoneNumber = String.valueOf((long) cell.getNumericCellValue());
                            }
                            if (!PHONE_NUMBER_PATTERN.matcher(phoneNumber).matches()) {
                                message.append("第" + (i + 1) + "行手机号" + phoneNumber + "格式不正确");
                                isValid = false;
@@ -166,7 +222,7 @@
                                phones.append(phoneNumber).append("\n");
                            }
                        } else {
                            message.append("行上的单元格为空或无效 " + (i + 1));
                            message.append("第" + (i + 1)+ "行上的单元格为空或无效 ");
                            isValid = false;
                            break; // 退出循环
                        }
@@ -181,7 +237,7 @@
                    throw new ValidationException(message.toString());
                } else {
                    smsTaskDTO.setPhones(phones.toString());
                    smsTaskDTO.setNum((long) rowCount);
                    smsTaskDTO.setNum((long) rowCount - 1);
                }
            } catch (IOException e) {
                e.printStackTrace();
@@ -199,7 +255,7 @@
    }

    @Override
    public void updateSmsTask(SmsTaskDTO smsTaskDTO) {
    public void updateSmsTask(SmsTaskDTO smsTaskDTO) throws IOException {
        SmsTaskDO smsTaskDO = smsTaskMapper.selectById(smsTaskDTO.getId());
        if (!smsTaskDO.getStatus().equals(Constants.SMS_TASK_STATUS.wait_publish.name())) {
            throw new ValidationException("非待发布的任务不可编辑");
@@ -217,7 +273,7 @@
            throw new ValidationException("接收号码类型不能为空");
        }

        if ((Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) || Constants.SMS_RECEIVE_TYPE.SELECT.name().equals(smsTaskDTO.getType())) && StringUtils.isEmpty(smsTaskDTO.getPhones())) {
        if (Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) && StringUtils.isEmpty(smsTaskDTO.getPhones())) {
            throw new ValidationException("手机号不能为空");
        }

@@ -225,11 +281,51 @@
            throw new ValidationException("导入文件不能为空");
        }

        if(!smsTaskDTO.getFileUrl().equals(smsTaskDO.getFileUrl())){
            dealImportExcel(smsTaskDTO);
        if (Constants.SMS_RECEIVE_TYPE.INPUT.name().equals(smsTaskDTO.getType()) ) {

            //解析手机号，包含不同平台的换行符
            String text = smsTaskDTO.getPhones();

            // 使用正则表达式匹配所有类型的换行符
            String[] lines = text.split("\\r?\\n|\\r");

            // 将数组转换为 List
            List<String> lineList = Arrays.asList(lines);
            lineList.forEach(l -> {
                boolean validPhoneNumber = isValidPhoneNumber(l);
                if (!validPhoneNumber) {
                    throw new ValidationException(l + "不是合法的手机号");
                }
            });
            smsTaskDTO.setNum((long) lineList.size());
        }

        BeanUtils.copyProperties(smsTaskDTO, smsTaskDO);
        if(Constants.SMS_RECEIVE_TYPE.IMPORT.name().equals(smsTaskDTO.getType()) && !smsTaskDTO.getFileUrl().equals(smsTaskDO.getFileUrl())){
            dealImportExcel(smsTaskDTO);
        }
        List<SmsUserDTO> smsUserDTOS = smsTaskDTO.getSmsUserDTOS();
        if(!CollectionUtils.isEmpty(smsUserDTOS)){
            List<String> userIds = smsUserDTOS.stream()
                    .map(SmsUserDTO::getUserId)
                    .collect(Collectors.toList());

            List<String> userPhones = smsUserDTOS.stream()
                    .map(SmsUserDTO::getUserPhone)
                    .collect(Collectors.toList());
            if(!CollectionUtils.isEmpty(userPhones)){
                String phones = userPhones.stream()
                        .map(Object::toString) // 确保每个元素都转换为字符串
                        .collect(Collectors.joining("\n")); // 使用换行符连接字符串
                smsTaskDTO.setPhones(phones); // 假设有一个setPhones方法用于设置phones字段
            }
            if (!CollectionUtils.isEmpty(userIds)) {
                String userIdInfos = userIds.stream().map(Object::toString) // 确保每个元素都转换为字符串
                        .collect(Collectors.joining(";")); // 使用换行符连接字符串
                smsTaskDO.setUserIds(userIdInfos);
                smsTaskDTO.setNum((long) userIds.size());
            }
        }
        BeanUtils.copyProperties(smsTaskDTO, smsTaskDO,"userIds");
        smsTaskDO.update(SecurityUtils.getUserId());
        smsTaskDO.setPhones(smsTaskDTO.getPhones());
        smsTaskMapper.updateById(smsTaskDO);
@@ -282,12 +378,40 @@
        });
    }

    @Override 
    public List<SmsSelectVO> getSelectList(Long id) {
        List<SmsSelectVO> smsSelectVOList = null;
        SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
        String ids = smsTaskDO.getUserIds();
        if (StringUtils.isEmpty(ids)) {
            return smsSelectVOList;
        } else {
            String[] idArray = ids.split(";");
            List<String> idList = Arrays.asList(idArray);
            return userMapper.getSelectList(idList);
        }
    }

    @Override
    public SmsTaskVO getDetailById(Long id) {
        SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
        SmsTaskVO smsTaskVO=new SmsTaskVO();
        BeanUtils.copyProperties(smsTaskDO,smsTaskVO);
        if(!ObjectUtils.isEmpty(smsTaskDO)){
            List<SmsSelectVO> selectList = getSelectList(id);
            smsTaskVO.setSmsUserDTOS(selectList);
            return smsTaskVO;
        }
        return null;
    }

    private List<SmsTaskDetailDO> createSmsTaskDetails(SmsTaskDO smsTaskDO, List<String> phoneNumbers) {
        return phoneNumbers.stream().map(phone -> {
            SmsTaskDetailDO detail = new SmsTaskDetailDO();
            detail.setSmsTaskId(smsTaskDO.getId());
            detail.setSmsTemplateId(smsTaskDO.getSmsTemplateId());
            detail.setPhone(phone);
            detail.create();
            return detail;
        }).collect(Collectors.toList());
    }
@@ -297,8 +421,14 @@
        String templateCode = smsTemplateDO.getCode();
        for (SmsTaskDetailDO detail : smsTaskDetailDOList) {
            try {
                SmsUtil.sendSms(detail.getPhone(), templateCode, null);
                detail.setResult(Constants.SMS_SEND_RESULT.success.name());
                SendSmsResponse sendSmsResponse = SmsUtil.sendSms(detail.getPhone(), templateCode, null);
                if("OK".equals(sendSmsResponse.getCode())){
                    detail.setResult(Constants.SMS_SEND_RESULT.success.name());
                }else{
                    detail.setFailReason(sendSmsResponse.getMessage());
                    detail.setResult(Constants.SMS_SEND_RESULT.failure.name());
                }
                detail.setResponseResult(sendSmsResponse.toString());
            } catch (Exception e) {
                detail.setResult(Constants.SMS_SEND_RESULT.failure.name());
                System.err.println("Failed to send SMS to " + detail.getPhone() + ": " + e.getMessage());