floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator 

Former-commit-id: a6430e732985c66f4c6439eb65a1aee44b13f05a
This commit is contained in:
zhangwei 2024-06-22 22:58:52 +08:00
parent b3b9acc4bd 13a99c2f73
commit c25cc58f3e
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/internal/cron/aiCronTask.go
View File

@ -225,6 +225,7 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
var start time.Time var start time.Time
var end time.Time var end time.Time
// distinguish train or infer temporarily
if task.TaskTypeDict == 11 { if task.TaskTypeDict == 11 {
start, _ = time.ParseInLocation(time.RFC3339, aiTask[0].StartTime, time.Local) start, _ = time.ParseInLocation(time.RFC3339, aiTask[0].StartTime, time.Local)
end, _ = time.ParseInLocation(time.RFC3339, aiTask[0].EndTime, time.Local) end, _ = time.ParseInLocation(time.RFC3339, aiTask[0].EndTime, time.Local)
@ -236,8 +237,16 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
var status string var status string
var count int var count int
for _, a := range aiTask { for _, a := range aiTask {
s, _ := time.ParseInLocation(constants.Layout, a.StartTime, time.Local) var s time.Time
e, _ := time.ParseInLocation(constants.Layout, a.EndTime, time.Local) var e time.Time
// distinguish train or infer temporarily
if task.TaskTypeDict == 11 {
s, _ = time.ParseInLocation(time.RFC3339, a.StartTime, time.Local)
e, _ = time.ParseInLocation(time.RFC3339, a.EndTime, time.Local)
} else {
s, _ = time.ParseInLocation(constants.Layout, a.StartTime, time.Local)
e, _ = time.ParseInLocation(constants.Layout, a.EndTime, time.Local)
}
if s.Before(start) { if s.Before(start) {
start = s start = s
@ -274,8 +283,15 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
if status != "" { if status != "" {
task.Status = status task.Status = status
task.StartTime = start.Format(constants.Layout) // distinguish train or infer temporarily
task.EndTime = end.Format(constants.Layout) if task.TaskTypeDict == 11 {
task.StartTime = start.Format(time.RFC3339)
task.EndTime = end.Format(time.RFC3339)
} else {
task.StartTime = start.Format(constants.Layout)
task.EndTime = end.Format(constants.Layout)
}
} }
task.UpdatedTime = time.Now().Format(constants.Layout) task.UpdatedTime = time.Now().Format(constants.Layout)