Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
webcron*
bin/
*.tar.gz
.idea/
34 changes: 30 additions & 4 deletions app/controllers/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,24 @@ func (this *MainController) Index() {

// 最近执行的日志
logs, _ := models.TaskLogGetList(1, 20)

// 批量查询task得到taskMap
taskIds := make([]int, 0)
for _, v := range logs {
taskIds = append(taskIds, v.TaskId)
}
taskIds = models.MakeIntSliceUnique(taskIds)
tasks,_ := models.TaskGetList(1, 100, "id__in", taskIds)
var taskMap = map[int]*models.Task{}
for _, task := range tasks {
taskMap[task.Id] = task
}

recentLogs := make([]map[string]interface{}, len(logs))
for k, v := range logs {
task, err := models.TaskGetById(v.TaskId)
task, ok := taskMap[v.TaskId]
taskName := ""
if err == nil {
if ok {
taskName = task.TaskName
}
row := make(map[string]interface{})
Expand All @@ -54,11 +67,24 @@ func (this *MainController) Index() {

// 最近执行失败的日志
logs, _ = models.TaskLogGetList(1, 20, "status__lt", 0)

// 批量查询task得到taskMap
taskIds = make([]int, 0)
for _, v := range logs {
taskIds = append(taskIds, v.TaskId)
}
taskIds = models.MakeIntSliceUnique(taskIds)
tasks,_ = models.TaskGetList(1, 100, "id__in", taskIds)
taskMap = map[int]*models.Task{}
for _, task := range tasks {
taskMap[task.Id] = task
}

errLogs := make([]map[string]interface{}, len(logs))
for k, v := range logs {
task, err := models.TaskGetById(v.TaskId)
task, ok := taskMap[v.TaskId]
taskName := ""
if err == nil {
if ok {
taskName = task.TaskName
}
row := make(map[string]interface{})
Expand Down
14 changes: 14 additions & 0 deletions app/models/helpers.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package models

func MakeIntSliceUnique(s []int) []int {
rt := make([]int, 0)
m := map[int]bool{}
ok := false
for _, v := range s {
if _, ok = m[v]; !ok {
rt = append(rt, v)
m[v] = true
}
}
return rt
}