From a02bed07c8281ae0fda850921eb7443393c5fb0c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期日, 29 十二月 2024 13:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 79 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
index e7c3523..130df05 100644
--- a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
@@ -35,6 +35,7 @@
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;
@@ -97,7 +98,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 +106,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 +128,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());
@@ -253,7 +255,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("手机号不能为空");
}
@@ -261,11 +263,50 @@
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);
+ }
+ }
+ BeanUtils.copyProperties(smsTaskDTO, smsTaskDO,"userIds");
smsTaskDO.update(SecurityUtils.getUserId());
smsTaskDO.setPhones(smsTaskDTO.getPhones());
smsTaskMapper.updateById(smsTaskDO);
@@ -318,7 +359,7 @@
});
}
- @Override
+ @Override
public List<SmsSelectVO> getSelectList(Long id) {
List<SmsSelectVO> smsSelectVOList = null;
SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
@@ -332,6 +373,19 @@
}
}
+ @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();
--
Gitblit v1.9.3