cloudroam
2024-12-29 2390d668f77641f9b62e1e210d855df87ee7d390
add:阿里云短信模板获取签名和模板信息5
已修改1个文件
41 ■■■■ 文件已修改
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
@@ -97,7 +97,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("手机号不能为空");
        }
@@ -105,7 +105,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();
@@ -127,26 +127,27 @@
            dealImportExcel(smsTaskDTO);
        }
        List<SmsUserDTO> smsUserDTOS = smsTaskDTO.getSmsUserDTOS();
        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字段
        }
        SmsTaskDO smsTaskDO = new SmsTaskDO();
        BeanUtils.copyProperties(smsTaskDTO, smsTaskDO);
        if (CollectionUtils.isEmpty(userIds)) {
            String userIdInfos = userIds.stream().map(Object::toString) // 确保每个元素都转换为字符串
                    .collect(Collectors.joining(";")); // 使用换行符连接字符串
            smsTaskDO.setUserIds(userIdInfos);
        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);
            }
        }
        smsTaskDO.setStatus(Constants.SMS_TASK_STATUS.wait_publish.name());
        smsTaskDO.setPhones(smsTaskDTO.getPhones());