lyf
/
fxkh-txl-service
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lyf:da3b41b0b4e7fa28c4e2f6a60a452dd2ba96daf7
Branches Tags
lyf:refactor
lyf:master
..
compare: lyf:0b18a1147e288b3835f549b23afbcb012f17e2fb
Branches Tags
lyf:refactor
lyf:master

No commits in common. "da3b41b0b4e7fa28c4e2f6a60a452dd2ba96daf7" and "0b18a1147e288b3835f549b23afbcb012f17e2fb" have entirely different histories.
da3b41b0b4 ... 0b18a1147e

5 changed files with 72 additions and 98 deletions
Show Stats Expand all files Collapse all files

3
src/main/java/com/whdc/mapper/SmsSpecialistMapper.java
View File

@ -13,7 +13,4 @@ import org.apache.ibatis.annotations.Update;
public interface SmsSpecialistMapper extends BaseMapper<SmsSpecialist> {
@Update("update specialist set flag_birthday_sent_today = 0")
void resetFlagBirthdaySentToday();
@Update("update specialist set flag_holiday_sent_today = 0")
void resetFlagHolidaySentToday();
}

11
src/main/java/com/whdc/model/dto/SmsLogPageDto.java
View File

@ -1,12 +1,9 @@
package com.whdc.model.dto;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 短信日志分页查询DTO
*
@ -22,14 +19,6 @@ public class SmsLogPageDto {
@ApiModelProperty(value = "每页条数", example = "10")
private Integer pageSize = 10;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date stm;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date etm;
@ApiModelProperty(value = "姓名")
private String name;

55
src/main/java/com/whdc/service/impl/SmsBirthdayServiceImpl.java
View File

@ -18,11 +18,7 @@ import org.springframework.stereotype.Service;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@ -184,7 +180,6 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
public void resetFlagBirthdaySentToday() {
specialistMapper.resetFlagBirthdaySentToday();
}
/**
* 定时检查并发送生日短信
* 每分钟执行一次
@ -195,7 +190,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
// 获取生日短信配置
SmsBirthday smsBirthday = this.getById(1L);
if (smsBirthday == null || smsBirthday.getStatus() != 1) {
log.info("生日短信功能未启用");
log.debug("生日短信功能未启用");
return;
}
@ -208,7 +203,7 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
// 如果已经发送过，不再重复发送
if (sending.get()) {
log.info("其他线程正在执行生日短信发送任务");
log.debug("其他线程正在执行生日短信发送任务");
return;
}
@ -229,26 +224,29 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
if (now.isEqual(scheduledTime) || now.isAfter(scheduledTime)) {
// 原子性检查和设置发送状态
if (sending.compareAndSet(false, true)) {
try {
log.info("到达生日短信发送时间: {}, 开始执行发送任务", executionTime);
// 查询今天过生日的专家
List<SmsSpecialist> birthdaySpecialists = listBirthdayToday();
if (birthdaySpecialists.isEmpty()) {
log.info("今天没有专家过生日，无需发送生日短信");
} else {
log.info("今天有{}位专家过生日，开始发送生日短信", birthdaySpecialists.size());
log.info("到达生日短信发送时间: {}, 开始执行发送任务", executionTime);
// 查询今天过生日的专家
List<SmsSpecialist> birthdaySpecialists = listBirthdayToday();
if (birthdaySpecialists.isEmpty()) {
log.info("今天没有专家过生日，无需发送生日短信");
} else {
log.info("今天有{}位专家过生日，开始发送生日短信", birthdaySpecialists.size());
try {
// 发送生日短信
sendBirthdaySms(birthdaySpecialists);
log.info("生日短信发送任务完成");
} finally {
sending.set(false);
}
} finally {
sending.set(false);
log.info("生日短信发送任务完成");
}
} else {
log.info("其他线程正在执行生日短信发送任务");
log.debug("其他线程正在执行生日短信发送任务");
}
} else {
log.info("当前时间{}未到执行时间{}", now.format(DateTimeFormatter.ofPattern("HH:mm:ss")), executionTime);
log.debug("当前时间{}未到执行时间{}", now.format(DateTimeFormatter.ofPattern("HH:mm:ss")), executionTime);
}
} catch (Exception e) {
@ -259,4 +257,19 @@ public class SmsBirthdayServiceImpl extends ServiceImpl<SmsBirthdayMapper, SmsBi
log.error("定时检查生日短信任务执行异常: {}", e.getMessage(), e);
}
}
/**
* 重置每日发送状态
* 每天凌晨00:00:01执行
*/
//todo delete this
// @Scheduled(cron = "1 0 0 * * ?")
// public void resetDailySendStatus() {
// try {
// sending.set(false);
// log.info("生日短信每日发送状态已重置");
// } catch (Exception e) {
// log.error("重置生日短信每日发送状态异常: {}", e.getMessage(), e);
// }
// }
}

95
src/main/java/com/whdc/service/impl/SmsHolidayServiceImpl.java
View File

@ -21,11 +21,10 @@ import org.springframework.util.StringUtils;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@ -61,8 +60,8 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
@Autowired
private SmsHelper smsHelper;
// 记录任务发送状态 - 使用原子变量保证线程安全
private final AtomicBoolean sending = new AtomicBoolean(false);
// 记录每个任务今日是否已发送短信 - 使用并发Map保证线程安全
private final Map<Long, AtomicBoolean> taskSmsSentToday = new ConcurrentHashMap<>();
@Override
public List<SmsHoliday> listActiveTasks() {
@ -98,6 +97,12 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
// 筛选今天需要执行的任务
for (SmsHoliday task : activeTasks) {
// 检查是否已经发送过
AtomicBoolean sentFlag = taskSmsSentToday.computeIfAbsent(task.getId(), k -> new AtomicBoolean(false));
if (sentFlag.get()) {
continue; // 今日已发送，跳过
}
// 检查执行时间
String executionTime = task.getExecutionTmStr();
if (executionTime == null || executionTime.trim().isEmpty()) {
@ -136,8 +141,8 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
return;
}
// 获取所有有效专家（节日短信专用）
List<SmsSpecialist> specialists = getValidSpecialistsForHoliday();
// 获取所有有效专家
List<SmsSpecialist> specialists = getValidSpecialists();
if (specialists.isEmpty()) {
log.info("没有有效专家，跳过主题日短信发送");
return;
@ -153,14 +158,8 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
int totalSpecialists = specialists.size();
log.info("开始向{}位专家发送主题日短信[{}]", totalSpecialists, smsTask.getSubjectName());
// 去重
Set<String> distinct = new HashSet<>();
for (int i = 0; i < specialists.size(); i++) {
SmsSpecialist specialist = specialists.get(i);
if (distinct.contains(specialist.getPhone())) {
continue;
}
// 替换模板中的占位符
String content = template.replace("{姓名}", specialist.getName())
.replace("{主题}", smsTask.getSubjectName());
@ -178,12 +177,6 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
// 使用SmsHelper发送个性化短信
List<String> phoneList = Collections.singletonList(specialist.getPhone());
String sendResult = smsHelper.send(phoneList, content);
// 更新专家的flagHolidaySentToday
specialist.setFlagHolidaySentToday(1);
specialistMapper.updateById(specialist);
distinct.add(specialist.getPhone());
log.info("向专家{}发送主题日短信[{}]结果: {}", specialist.getName(), smsTask.getSubjectName(), sendResult);
// 根据发送结果设置备注
@ -193,9 +186,6 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
smsLog.setRemark("主题日短信-" + smsTask.getSubjectName() + "-发送失败: " + sendResult);
}
// 应唐科要求，每次发送短讯要抄送给唐威，陈锋
carbonCopy(content);
// 保存短信日志记录
smsLogMapper.insert(smsLog);
@ -230,6 +220,11 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
}
log.info("主题日短信任务[{}]发送完成", smsTask.getSubjectName());
// 标记任务今日已发送
AtomicBoolean sentFlag = taskSmsSentToday.computeIfAbsent(smsTask.getId(), k -> new AtomicBoolean(false));
sentFlag.set(true);
log.info("主题日短信任务[{}]发送完成", smsTask.getSubjectName());
}
@Override
@ -251,32 +246,12 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
}
/**
* 抄送
* 获取所有有效专家
*/
private void carbonCopy(String content) {
List<String> phoneList = new ArrayList<>();
phoneList.add("18154318312"); //唐威
phoneList.add("13247155309"); //陈锋
phoneList.add("15671545233"); //李
smsHelper.send(phoneList, content);
}
/**
* 每天0点重置所有专家的flagHolidaySentToday为0
*/
@Scheduled(cron = "0 0 0 * * ?")
public void resetFlagHolidaySentToday() {
specialistMapper.resetFlagHolidaySentToday();
}
/**
* 获取所有有效专家（节日短信专用）
*/
private List<SmsSpecialist> getValidSpecialistsForHoliday() {
private List<SmsSpecialist> getValidSpecialists() {
try {
LambdaQueryWrapper<SmsSpecialist> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SmsSpecialist::getStatus, 1); // 1:有效
queryWrapper.eq(SmsSpecialist::getFlagHolidaySentToday, 0); // 未发送节日短信
queryWrapper.isNotNull(SmsSpecialist::getPhone); // 手机号不为空
List<SmsSpecialist> specialists = specialistMapper.selectList(queryWrapper);
@ -294,32 +269,38 @@ public class SmsHolidayServiceImpl extends ServiceImpl<SmsHolidayMapper, SmsHoli
@Scheduled(cron = "0 * * * * ?")
public void checkAndSendThemeSms() {
try {
// 如果其他线程正在执行，跳过
if (sending.get()) {
log.debug("其他线程正在执行主题日短信发送任务");
return;
}
// 查询今日需要执行的主题日任务
List<SmsHoliday> todayTasks = listTodayTasks();
if (todayTasks.isEmpty()) {
log.info("今日没有需要执行的主题日短信任务");
log.debug("今日没有需要执行的主题日短信任务");
return;
}
log.info("检测到{}个主题日短信任务需要执行", todayTasks.size());
// 批量发送主题日短信
try {
sendBatchThemeSms(todayTasks);
} finally {
sending.set(false);
}
sendBatchThemeSms(todayTasks);
} catch (Exception e) {
log.error("定时检查主题日短信任务执行异常: {}", e.getMessage(), e);
sending.set(false);
}
}
/**
* 重置每日发送状态
* 每天凌晨00:00:01执行
*/
@Scheduled(cron = "1 0 0 * * ?")
public void resetDailySendStatus() {
try {
// 重置所有任务的发送状态
for (AtomicBoolean sentFlag : taskSmsSentToday.values()) {
sentFlag.set(false);
}
log.info("主题日短信每日发送状态已重置");
} catch (Exception e) {
log.error("重置主题日短信每日发送状态异常: {}", e.getMessage(), e);
}
}
}

6
src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java
View File

@ -29,12 +29,6 @@ public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLog> impleme
if (StringUtils.hasText(dto.getPhone())) {
queryWrapper.like(SmsLog::getPhone, dto.getPhone());
}
if (dto.getStm() != null) {
queryWrapper.ge(SmsLog::getSendTm, dto.getStm());
}
if (dto.getEtm() != null) {
queryWrapper.le(SmsLog::getSendTm, dto.getEtm());
}
// 默认按发送时间降序排列
queryWrapper.orderByDesc(SmsLog::getSendTm);