修复日程提醒功能
This commit is contained in:
@@ -210,13 +210,13 @@ func (c *BackendReminderController) GetReminderDetail() {
|
||||
}
|
||||
|
||||
data := map[string]interface{}{
|
||||
"id": schedule.ID,
|
||||
"title": schedule.Title,
|
||||
"content": schedule.Content,
|
||||
"schedule_time": schedule.ScheduleTime.Format("2006-01-02 15:04:05"),
|
||||
"remind_channels": channels,
|
||||
"id": schedule.ID,
|
||||
"title": schedule.Title,
|
||||
"content": schedule.Content,
|
||||
"schedule_time": schedule.ScheduleTime.Format("2006-01-02 15:04:05"),
|
||||
"remind_channels": channels,
|
||||
"receiver_targets": targets,
|
||||
"is_finished": isFinished,
|
||||
"is_finished": isFinished,
|
||||
}
|
||||
if first.ID > 0 {
|
||||
data["advance_minutes"] = first.AdvanceMinutes
|
||||
@@ -295,16 +295,16 @@ func (c *BackendReminderController) CreateReminder() {
|
||||
firstSendTime := schedTime.Add(-time.Duration(p.AdvanceMinutes) * time.Minute)
|
||||
|
||||
reminder := models.BackendScheduleReminder{
|
||||
Tid: claims.TenantId,
|
||||
ScheduleID: uint64(schedID),
|
||||
RemindChannel: ch,
|
||||
AdvanceMinutes: p.AdvanceMinutes,
|
||||
NextRemindTime: firstSendTime,
|
||||
ReceiverUserID: uint64(claims.UserID),
|
||||
ReceiverTarget: target,
|
||||
RemindStatus: 0,
|
||||
CreateTime: time.Now(),
|
||||
UpdateTime: time.Now(),
|
||||
Tid: claims.TenantId,
|
||||
ScheduleID: uint64(schedID),
|
||||
RemindChannel: ch,
|
||||
AdvanceMinutes: p.AdvanceMinutes,
|
||||
NextRemindTime: firstSendTime,
|
||||
ReceiverUserID: uint64(claims.UserID),
|
||||
ReceiverTarget: target,
|
||||
RemindStatus: 0,
|
||||
CreateTime: time.Now(),
|
||||
UpdateTime: time.Now(),
|
||||
}
|
||||
|
||||
if ch == "EMAIL" || ch == "BARK" {
|
||||
@@ -433,16 +433,16 @@ func (c *BackendReminderController) UpdateReminder() {
|
||||
firstSendTime := schedTime.Add(-time.Duration(p.AdvanceMinutes) * time.Minute)
|
||||
|
||||
reminder := models.BackendScheduleReminder{
|
||||
Tid: claims.TenantId,
|
||||
ScheduleID: id,
|
||||
RemindChannel: ch,
|
||||
AdvanceMinutes: p.AdvanceMinutes,
|
||||
NextRemindTime: firstSendTime,
|
||||
ReceiverUserID: schedule.UserID,
|
||||
ReceiverTarget: target,
|
||||
RemindStatus: 0,
|
||||
CreateTime: time.Now(),
|
||||
UpdateTime: time.Now(),
|
||||
Tid: claims.TenantId,
|
||||
ScheduleID: id,
|
||||
RemindChannel: ch,
|
||||
AdvanceMinutes: p.AdvanceMinutes,
|
||||
NextRemindTime: firstSendTime,
|
||||
ReceiverUserID: schedule.UserID,
|
||||
ReceiverTarget: target,
|
||||
RemindStatus: 0,
|
||||
CreateTime: time.Now(),
|
||||
UpdateTime: time.Now(),
|
||||
}
|
||||
|
||||
if ch == "EMAIL" || ch == "BARK" {
|
||||
@@ -703,13 +703,20 @@ func (c *BackendReminderController) TestReminder() {
|
||||
}
|
||||
|
||||
dummyToken := "test-token-for-verification"
|
||||
reminder := &models.PlatformScheduleReminder{
|
||||
reminder := &models.BackendScheduleReminder{
|
||||
Tid: claims.TenantId,
|
||||
RemindChannel: ch,
|
||||
ReceiverUserID: uint64(claims.UserID),
|
||||
AckToken: &dummyToken,
|
||||
}
|
||||
|
||||
success, sendErr := sender.Send(context.Background(), reminder, "[测试]"+p.Title, p.Content)
|
||||
success, sendErr := sender.Send(context.Background(), services.ReminderData{
|
||||
RemindChannel: reminder.RemindChannel,
|
||||
ReceiverUserID: reminder.ReceiverUserID,
|
||||
ReceiverTarget: reminder.ReceiverTarget,
|
||||
AckToken: reminder.AckToken,
|
||||
Tid: reminder.Tid,
|
||||
}, "[测试]"+p.Title, p.Content)
|
||||
msg := "发送成功"
|
||||
if !success {
|
||||
msg = "发送失败"
|
||||
|
||||
Reference in New Issue
Block a user