diff --git a/features/monitor/monitor/monitor.go b/features/monitor/monitor/monitor.go index d9815668..5cacfc21 100644 --- a/features/monitor/monitor/monitor.go +++ b/features/monitor/monitor/monitor.go @@ -68,8 +68,9 @@ func LoadMonitor(w http.ResponseWriter, r *http.Request) { var backdatas []MonitorData if bodyArgs.Param == "all" || bodyArgs.Param == "cpu" || bodyArgs.Param == "memory" || bodyArgs.Param == "load" { var bases []MonitorBase - err := dborm.DbClient.XEngine.SQL("SELECT * FROM monitor_base"). + err := dborm.DbClient.XEngine.Table("monitor_base"). Where("created_at > ? AND created_at < ?", bodyArgs.StartTime, bodyArgs.EndTime). + Desc("created_at"). Find(&bases) if err != nil { services.ResponseErrorWithJson(w, 400, err.Error()) @@ -86,8 +87,9 @@ func LoadMonitor(w http.ResponseWriter, r *http.Request) { } if bodyArgs.Param == "all" || bodyArgs.Param == "io" { var bases []MonitorIO - err := dborm.DbClient.XEngine.SQL("SELECT * FROM monitor_io"). + err := dborm.DbClient.XEngine.Table("monitor_io"). Where("created_at > ? AND created_at < ?", bodyArgs.StartTime, bodyArgs.EndTime). + Desc("created_at"). Find(&bases) if err != nil { services.ResponseErrorWithJson(w, 400, err.Error()) @@ -104,8 +106,9 @@ func LoadMonitor(w http.ResponseWriter, r *http.Request) { } if bodyArgs.Param == "all" || bodyArgs.Param == "network" { var bases []MonitorNetwork - err := dborm.DbClient.XEngine.SQL("SELECT * FROM monitor_network"). + err := dborm.DbClient.XEngine.Table("monitor_network"). Where("name = ? AND created_at > ? AND created_at < ?", bodyArgs.Info, bodyArgs.StartTime, bodyArgs.EndTime). + Desc("created_at"). Find(&bases) if err != nil { services.ResponseErrorWithJson(w, 400, err.Error()) diff --git a/features/monitor/monitor/task.go b/features/monitor/monitor/task.go index 8c6736d7..a8185c32 100644 --- a/features/monitor/monitor/task.go +++ b/features/monitor/monitor/task.go @@ -186,11 +186,10 @@ func loadNetIO() { } } - rows, err := dborm.DbClient.XEngine.Table("monitor_network").Insert(netList) + _, err := dborm.DbClient.XEngine.Table("monitor_network").Insert(netList) if err != nil { log.Errorf("Insert network monitoring data failed, err: %v", err) } - fmt.Println(rows, err) } var c *cron.Cron @@ -198,6 +197,7 @@ var monitorCronID int func init() { c = cron.New() + c.Start() monitorCronID = 0 }