代码调整 sql更新

project_data/sql/0.0.8/quartz/quartz.sql

@@ -0,0 +1,7 @@
+
+
+delete from sys_job where invoke_target in ('ReminderTask.findNeedRemind()','ReminderTask.findAndSendMsg()');
+-- 定时任务新增:短信提醒查找(计划任务,每天凌晨一点执行)
+INSERT INTO sys_job (job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time) VALUES ('短信提醒查找(计划任务)', 'DEFAULT', 'ReminderTask.findNeedRemind()', '0 0 1 * * ?', '1', '1', '1', '超级管理员', '2024-04-18 09:52:21', '', '2024-04-18 09:55:35');
+-- 定时任务新增:短信提醒发送(计划任务,每分钟执行一次)
+INSERT INTO sys_job (job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time) VALUES ('短信提醒发送(计划任务)', 'DEFAULT', 'ReminderTask.findAndSendMsg()', '0 */1 * * * ?', '1', '1', '1', '超级管理员', '2024-04-18 09:53:38', '', '2024-04-18 09:55:33');

project_data/sql/0.0.8/soc/soc.sql

@@ -16,7 +16,7 @@ create table if not exists core_reminder_configuration
 create table if not exists core_reminder_configuration_role(
     config_id        bigint not null,
     target_role_id   bigint not null,
-    target_role_name bigint not null,
+    target_role_name varchar(125) not null,
     primary key (config_id, target_role_id)
 )
     comment '短信提醒配置角色关联表';
@@ -56,8 +56,9 @@ create table if not exists core_reminder_schedule(
     org_guid       varchar(125)  null comment '机构guid',
     task_id        varchar(125)  null comment '任务id',
     task_name      varchar(225)  null comment '任务名称',
+    recipient      varchar(50)  null comment '目标接收者（手机号码或用户ID）',
+    recipient_id   varchar(50)   not null comment '目标接收者id',
     recipient_name varchar(125)  not null comment '目标接收者名称',
-    recipient      varchar(50)   not null comment '目标接收者（手机号码或用户ID）',
     scheduled_time datetime      null comment '计划发送时间',
     status         varchar(20)   not null comment '任务状态（未发送、已发送、发送失败等）',
     sent_time      datetime      null comment '实际发送时间（若已发送）',

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/reminder/domain/CoreReminderSchedule.java

@@ -62,14 +62,14 @@ public class CoreReminderSchedule implements Serializable {
     @TableField("task_name")
     private String taskName;
 
-    @ApiModelProperty(value = "目标接收者id")
-    @TableField("recipient_id")
-    private Long recipientId;
-
     @ApiModelProperty(value = "目标接收者（手机号码或用户ID）")
     @TableField("recipient")
     private String recipient;
 
+    @ApiModelProperty(value = "目标接收者id")
+    @TableField("recipient_id")
+    private Long recipientId;
+
     @ApiModelProperty(value = "目标接收者名称")
     @TableField("recipient_name")
     private String recipientName;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reminder/service/impl/CoreReminderScheduleServiceImpl.java

@@ -189,6 +189,8 @@ public class CoreReminderScheduleServiceImpl extends ServiceImpl<CoreReminderSch
                 .in(CoreReminderSchedule::getScheduleId, collect)
                 .set(CoreReminderSchedule::getStatus, 2)
                 .update();
+        //日志记录信息发送情况
+        reminderLogService.updateLog(sentReminderSms);
 
 
     }

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/task/ReminderTask.java

@@ -16,6 +16,9 @@ public class ReminderTask {
     @Autowired
     RemoteReminderService remoteReminderService;
 
+    /**
+     * 每日凌晨执行查找当天需要发送的短信
+     */
     public void findNeedRemind() {
 
         log.info("短信提醒任务查找开始.......");
@@ -25,4 +28,17 @@ public class ReminderTask {
         log.info("短信提醒任务查找结束,返回数据:{{}", JSON.toJSONString(result));
 
     }
+
+    /**
+     * 每分钟查找需要需要发送的短信,并发送出去
+     */
+    public void findAndSendMsg() {
+
+        log.info("短信提醒任务查找开始.......");
+
+        AjaxResult result = remoteReminderService.findNeedSendMsg();
+
+        log.info("短信提醒任务查找结束,返回数据:{{}", JSON.toJSONString(result));
+
+    }
 }