|
@@ -69,6 +69,10 @@ func (c taskCron) Run() {
|
|
|
now := gtime.Now()
|
|
now := gtime.Now()
|
|
|
// 生成提醒数据
|
|
// 生成提醒数据
|
|
|
for _, task := range tasks {
|
|
for _, task := range tasks {
|
|
|
|
|
+ TaskTitle := task.TaskTitle + "(须接受督办)"
|
|
|
|
|
+ if task.IsOverdue == "20" {
|
|
|
|
|
+ TaskTitle = task.TaskTitle + "(超期)"
|
|
|
|
|
+ }
|
|
|
// 固定日期提醒
|
|
// 固定日期提醒
|
|
|
if task.ReminderRule != "" {
|
|
if task.ReminderRule != "" {
|
|
|
rules := strings.Split(task.ReminderRule, " ")
|
|
rules := strings.Split(task.ReminderRule, " ")
|
|
@@ -79,8 +83,9 @@ func (c taskCron) Run() {
|
|
|
// 校验当前时间
|
|
// 校验当前时间
|
|
|
remindTime := gtime.NewFromStr(fmt.Sprintf("%v %v:%v:%v", now.Format("Y-m-d"), rules[2], rules[1], rules[0]))
|
|
remindTime := gtime.NewFromStr(fmt.Sprintf("%v %v:%v:%v", now.Format("Y-m-d"), rules[2], rules[1], rules[0]))
|
|
|
// 10分钟一次定时循环,两者相差在10分钟之内(纳秒转换1e9)
|
|
// 10分钟一次定时循环,两者相差在10分钟之内(纳秒转换1e9)
|
|
|
- if (now.Nanosecond() - remindTime.Nanosecond())/(1*60*1e9) <= 10 && now.Nanosecond() > remindTime.Nanosecond() {
|
|
|
|
|
- taskNotifyMessage(task.MainUserId, task.OwnerUserId, task.TaskTitle+"督办需要处理,请前往执行")
|
|
|
|
|
|
|
+ if (now.Nanosecond()-remindTime.Nanosecond())/(1*60*1e9) <= 10 && now.Nanosecond() > remindTime.Nanosecond() {
|
|
|
|
|
+
|
|
|
|
|
+ taskNotifyMessage(task.MainUserId, task.OwnerUserId, TaskTitle+"督办需要处理,请前往执行")
|
|
|
}
|
|
}
|
|
|
} else if rules[3] == "?" { // 每周提醒
|
|
} else if rules[3] == "?" { // 每周提醒
|
|
|
// 校验周选项是否匹配
|
|
// 校验周选项是否匹配
|
|
@@ -96,8 +101,8 @@ func (c taskCron) Run() {
|
|
|
// 校验当前时间
|
|
// 校验当前时间
|
|
|
remindTime := gtime.NewFromStr(fmt.Sprintf("%v %v:%v:%v", now.Format("Y-m-d"), rules[2], rules[1], rules[0]))
|
|
remindTime := gtime.NewFromStr(fmt.Sprintf("%v %v:%v:%v", now.Format("Y-m-d"), rules[2], rules[1], rules[0]))
|
|
|
// 10分钟一次定时循环,两者相差在10分钟之内(纳秒转换1e9)
|
|
// 10分钟一次定时循环,两者相差在10分钟之内(纳秒转换1e9)
|
|
|
- if (now.Nanosecond() - remindTime.Nanosecond())/(1*60*1e9) <= 10 && now.Nanosecond() > remindTime.Nanosecond() {
|
|
|
|
|
- taskNotifyMessage(task.MainUserId, task.OwnerUserId, task.TaskTitle+"督办需要处理,请前往执行")
|
|
|
|
|
|
|
+ if (now.Nanosecond()-remindTime.Nanosecond())/(1*60*1e9) <= 10 && now.Nanosecond() > remindTime.Nanosecond() {
|
|
|
|
|
+ taskNotifyMessage(task.MainUserId, task.OwnerUserId, TaskTitle+"督办需要处理,请前往执行")
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else { // 每月提醒
|
|
} else { // 每月提醒
|
|
@@ -113,8 +118,8 @@ func (c taskCron) Run() {
|
|
|
// 校验当前时间
|
|
// 校验当前时间
|
|
|
remindTime := gtime.NewFromStr(fmt.Sprintf("%v %v:%v:%v", now.Format("Y-m-d"), rules[2], rules[1], rules[0]))
|
|
remindTime := gtime.NewFromStr(fmt.Sprintf("%v %v:%v:%v", now.Format("Y-m-d"), rules[2], rules[1], rules[0]))
|
|
|
// 10分钟一次定时循环,两者相差在10分钟之内(纳秒转换1e9)
|
|
// 10分钟一次定时循环,两者相差在10分钟之内(纳秒转换1e9)
|
|
|
- if (now.Nanosecond() - remindTime.Nanosecond())/(1*60*1e9) <= 10 && now.Nanosecond() > remindTime.Nanosecond() {
|
|
|
|
|
- taskNotifyMessage(task.MainUserId, task.OwnerUserId, task.TaskTitle+"督办需要处理,请前往执行")
|
|
|
|
|
|
|
+ if (now.Nanosecond()-remindTime.Nanosecond())/(1*60*1e9) <= 10 && now.Nanosecond() > remindTime.Nanosecond() {
|
|
|
|
|
+ taskNotifyMessage(task.MainUserId, task.OwnerUserId, TaskTitle+"督办需要处理,请前往执行")
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|