src/main/java/com/mzl/flower/dto/request/sms/SmsTaskDTO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/dto/response/sms/SmsTaskDetailVO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/entity/SmsTaskDO.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/mapper/SmsTaskDetailMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskDetailServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/service/sms/SmsTaskService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/sms/SmsTaskDetailMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/system/UserMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/mzl/flower/dto/request/sms/SmsTaskDTO.java
@@ -29,4 +29,7 @@ private List<SmsUserDTO> smsUserDTOS; @ApiModelProperty("导入文件路径详情") private String fileUrlMessage; } src/main/java/com/mzl/flower/dto/response/sms/SmsTaskDetailVO.java
@@ -17,7 +17,7 @@ @ApiModelProperty("模板名称") private String smsTemplateName; @ApiModelProperty("号码数量") @ApiModelProperty("发送号码数量") private Long totalNum; @ApiModelProperty("成功数量") @@ -29,4 +29,7 @@ @ApiModelProperty("发送中数量") private Long sendingNum; @ApiModelProperty("号码数量") private Long phoneNum; } src/main/java/com/mzl/flower/entity/SmsTaskDO.java
@@ -58,6 +58,10 @@ * 用户ID列表 */ private String userIds; /** * 导入文件路径详情 */ private String fileUrlMessage; } src/main/java/com/mzl/flower/mapper/SmsTaskDetailMapper.java
@@ -26,4 +26,7 @@ SmsTaskDetailVO getCountBySmsTaskId(@Param("id") Long id); @Select("select count(1) from t_sms_task_detail where sms_task_id =#{id} and deleted = '0'") Integer getBySmsTaskId(@Param("id")Long id); } src/main/java/com/mzl/flower/service/impl/sms/SmsTaskDetailServiceImpl.java
@@ -43,6 +43,11 @@ @Override public SmsTaskDetailVO getCountBySmsTaskId(Long id) { return smsTaskDetailMapper.getCountBySmsTaskId(id); Integer smsTaskId = smsTaskDetailMapper.getBySmsTaskId(id); SmsTaskDetailVO countBySmsTaskId = smsTaskDetailMapper.getCountBySmsTaskId(id); if (smsTaskId == 0) { countBySmsTaskId.setSendingNum(0L); } return countBySmsTaskId; } } 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"); src/main/java/com/mzl/flower/service/sms/SmsTaskService.java
@@ -8,6 +8,7 @@ import com.mzl.flower.dto.response.sms.SmsTaskVO; import com.mzl.flower.entity.SmsTaskDO; import java.io.IOException; import java.util.List; /** @@ -20,9 +21,9 @@ */ public interface SmsTaskService extends IService<SmsTaskDO> { void saveSmsTask(SmsTaskDTO smsTaskDTO); void saveSmsTask(SmsTaskDTO smsTaskDTO) throws IOException; void updateSmsTask(SmsTaskDTO smsTaskDTO); void updateSmsTask(SmsTaskDTO smsTaskDTO) throws IOException; void deleteSmsTask(Long id); src/main/java/com/mzl/flower/web/v2/sms/SmsTaskController.java
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; import java.io.IOException; /** @@ -35,14 +36,14 @@ @PostMapping("/new") @ApiOperation(value = "保存短信任务", httpMethod = "POST") public ResponseEntity<ReturnDataDTO> create(@RequestBody SmsTaskDTO smsTaskDTO) { public ResponseEntity<ReturnDataDTO> create(@RequestBody SmsTaskDTO smsTaskDTO) throws IOException { smsTaskService.saveSmsTask(smsTaskDTO); return returnData(R.SUCCESS.getCode(), null); } @PostMapping(value = "/edit") @ApiOperation(value = "更新短信任务", httpMethod = "POST") public ResponseEntity<ReturnDataDTO> update(@RequestBody SmsTaskDTO smsTaskDTO) { public ResponseEntity<ReturnDataDTO> update(@RequestBody SmsTaskDTO smsTaskDTO) throws IOException { smsTaskService.updateSmsTask(smsTaskDTO); return returnData(R.SUCCESS.getCode(), null); } src/main/resources/mapper/sms/SmsTaskDetailMapper.xml
@@ -23,7 +23,8 @@ COUNT(CASE WHEN std.result = 'success' THEN 1 END) AS successNum, COUNT(CASE WHEN std.result = 'failure' THEN 1 END) AS failureNum, COUNT(CASE WHEN std.result is null THEN 1 END) AS sendingNum, COUNT(std.id) AS totalNum COUNT(std.id) AS totalNum, t.num as phoneNum FROM t_sms_task t LEFT JOIN t_sms_template st ON t.sms_template_id = st.id src/main/resources/mapper/system/UserMapper.xml
@@ -123,10 +123,10 @@ AND id = #{condition.id} </if> <if test="condition.loginName != null and condition.loginName != ''"> AND name = #{condition.loginName} AND name like concat('%', #{condition.loginName},'%') </if> <if test="condition.tel != null and condition.tel != ''"> AND contact_tel = #{condition.tel} AND contact_tel like concat('%', #{condition.tel},'%') </if> </where> </select>