1.1.4

internal/logic/node/node.go

@@ -111,18 +111,22 @@ func (c *sNode) GetNode(ctx context.Context) ([]*entity.Node, error) {
 // GetNodePingStatus 获取节点监控结果
 func (c *sNode) GetNodePingStatus(ctx context.Context) ([]*model.UserItem, error) {
 	//查询10分钟内的数据
-	startTime, err := g.Cfg().Get(ctx, "node.startTime")
-	if err != nil {
-		glog.Debug(ctx, err.Error())
-		return nil, err
-	}
+	//startTime, err := g.Cfg().Get(ctx, "node.startTime")
+	//if err != nil {
+	//	glog.Debug(ctx, err.Error())
+	//	return nil, err
+	//}
+
+	timeStartStr := gtime.Now().Add(-7200 * time.Second).String()
+	timeEnd := gtime.Now().String()
 	var nodeList []*model.UserItem
-	timeStartStr := gtime.Now().Add(-startTime.Duration() * time.Second).String()
-	err = dao.Node.Ctx(ctx).OrderDesc("create_at").ScanList(&nodeList, "Node")
+
+	err := dao.Node.Ctx(ctx).OrderDesc("create_at").ScanList(&nodeList, "Node")
 	if err != nil {
 		return nil, err
 	}
-	err = dao.Pinglog.Ctx(ctx).Where("serverid", gdb.ListItemValuesUnique(nodeList, "Node", "Id")).Where("create_at > ?", timeStartStr).OrderDesc("create_at").ScanList(&nodeList, "PingLog", "Node", "serverid=id")
+	//获取2个小时内的数据
+	err = dao.Pinglog.Ctx(ctx).Where("serverid", gdb.ListItemValuesUnique(nodeList, "Node", "Id")).WhereBetween("create_at", timeStartStr, timeEnd).OrderDesc("create_at").ScanList(&nodeList, "PingLog", "Node", "serverid=id")
 	glog.Debug(ctx, timeStartStr)
 	if err != nil {
 		return nil, err

main.go

@@ -3,12 +3,20 @@ package main
 import (
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/os/gtime"
+	"log"
 	_ "nodeMonitor/internal/logic"
 	_ "nodeMonitor/internal/packed"
+	"time"
 
 	"nodeMonitor/internal/cmd"
 )
 
 func main() {
+	timeStartStr := gtime.Now().Add(-7200 * time.Second).String()
+	log.Println(timeStartStr)
+
+	timeEnd := gtime.Now().String()
+	log.Println(timeEnd)
 	cmd.Main.Run(gctx.New())
 }