From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 130df05..1c05dcd 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
@@ -8,6 +8,8 @@
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;
@@ -84,7 +86,7 @@
}
@Override
- public void saveSmsTask(SmsTaskDTO smsTaskDTO) {
+ public void saveSmsTask(SmsTaskDTO smsTaskDTO) throws IOException {
//校验
if (StringUtils.isEmpty(smsTaskDTO.getName())) {
throw new ValidationException("短信名称不能为空");
@@ -148,6 +150,7 @@
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());
@@ -156,7 +159,22 @@
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();
@@ -166,7 +184,7 @@
try {
// 下载Excel文件到本地临时文件
File tempFile = File.createTempFile("temp", ".xlsx");
- String fileUrl = smsTaskDTO.getFileUrl();
+ String fileUrl = fileUrlMessage;
String objectKey = fileUrl.replaceFirst("^https?://[^/]+/", ""); // 去掉协议部分
ossClient.getObject(new GetObjectRequest(bucketName, objectKey), tempFile);
@@ -237,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("非待发布的任务不可编辑");
@@ -304,6 +322,7 @@
String userIdInfos = userIds.stream().map(Object::toString) // 确保每个元素都转换为字符串
.collect(Collectors.joining(";")); // 使用换行符连接字符串
smsTaskDO.setUserIds(userIdInfos);
+ smsTaskDTO.setNum((long) userIds.size());
}
}
BeanUtils.copyProperties(smsTaskDTO, smsTaskDO,"userIds");
@@ -355,7 +374,7 @@
// 异步保存任务明细信息并发送短信
CompletableFuture.runAsync(() -> {
smsTaskDetailService.saveBatch(smsTaskDetailDOList);
- sendSmsToAll(smsTaskDetailDOList, smsTaskDO.getSmsTemplateId());
+ sendSmsToAll(smsTaskDetailDOList, smsTaskDO.getSmsTemplateId(),smsTaskDTO.getId());
});
}
@@ -397,7 +416,7 @@
}).collect(Collectors.toList());
}
- private void sendSmsToAll(List<SmsTaskDetailDO> smsTaskDetailDOList, Long smsTemplateId) {
+ private void sendSmsToAll(List<SmsTaskDetailDO> smsTaskDetailDOList, Long smsTemplateId,Long id) {
SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectById(smsTemplateId);
String templateCode = smsTemplateDO.getCode();
for (SmsTaskDetailDO detail : smsTaskDetailDOList) {
@@ -416,6 +435,9 @@
} finally {
//无论如何都更新结果
smsTaskDetailMapper.updateById(detail);
+ SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
+ smsTaskDO.setStatus(Constants.SMS_TASK_STATUS.complete.name());
+ smsTaskMapper.updateById(smsTaskDO);
}
}
}
--
Gitblit v1.9.3