TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-05 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

集群看板数据中增加当月流量

Browse Source
This commit is contained in:
GoEdgeLab
2023-03-15 16:24:36 +08:00
parent 39ec1c3f38
commit f4b46cffc5
2 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/db/models/stats/node_cluster_traffic_daily_stat_dao.go
View File

@@ -114,6 +114,20 @@ func (this *NodeClusterTrafficDailyStatDAO) FindDailyStats(tx *dbs.Tx, clusterId
return result, nil return result, nil
} }
// SumDailyStats 计算当月总流量
func (this *NodeClusterTrafficDailyStatDAO) SumDailyStats(tx *dbs.Tx, clusterId int64, dayFrom string, dayTo string) (*NodeClusterTrafficDailyStat, error) {
one, err := this.Query(tx).
Result("SUM(bytes) AS bytes", "SUM(cachedBytes) AS cachedBytes", "SUM(countRequests) AS countRequests", "SUM(countCachedRequests) AS countCachedRequests", "SUM(countAttackRequests) AS countAttackRequests", "SUM(attackBytes) AS attackBytes").
Attr("clusterId", clusterId).
Between("day", dayFrom, dayTo).
Find()
if err != nil || one == nil {
return nil, err
}
return one.(*NodeClusterTrafficDailyStat), nil
}
// Clean 清理历史数据 // Clean 清理历史数据
func (this *NodeClusterTrafficDailyStatDAO) Clean(tx *dbs.Tx, days int) error { func (this *NodeClusterTrafficDailyStatDAO) Clean(tx *dbs.Tx, days int) error {
var day = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -days)) var day = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -days))

21
internal/rpc/services/service_server_stat_board.go
View File

@@ -85,13 +85,32 @@ func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx contex
} }
result.CountServers = countServers result.CountServers = countServers
// 当月总流量
monthlyTrafficStat, err := stats.SharedNodeClusterTrafficDailyStatDAO.SumDailyStats(tx, req.NodeClusterId, timeutil.Format("Ym01"), timeutil.Format("Ym31"))
if err != nil {
return nil, err
}
var monthlyTrafficBytes int64
if monthlyTrafficStat != nil {
monthlyTrafficBytes = int64(monthlyTrafficStat.Bytes)
}
result.MonthlyTrafficBytes = monthlyTrafficBytes
// 按日流量统计 // 按日流量统计
var dayFrom = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -14)) var dayFrom = timeutil.Format("Ymd", time.Now().AddDate(0, 0, -14))
dailyTrafficStats, err := stats.SharedNodeClusterTrafficDailyStatDAO.FindDailyStats(tx, req.NodeClusterId, dayFrom, timeutil.Format("Ymd")) dailyTrafficStats, err := stats.SharedNodeClusterTrafficDailyStatDAO.FindDailyStats(tx, req.NodeClusterId, dayFrom, timeutil.Format("Ymd"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
var dailyTrafficBytes int64
var lastDailyTrafficBytes int64
for _, stat := range dailyTrafficStats { for _, stat := range dailyTrafficStats {
if stat.Day == timeutil.Format("Ymd") { // 今天
dailyTrafficBytes = int64(stat.Bytes)
} else if stat.Day == timeutil.Format("Ymd", time.Now().AddDate(0, 0, -1)) {
lastDailyTrafficBytes = int64(stat.Bytes)
}
result.DailyTrafficStats = append(result.DailyTrafficStats, &pb.ComposeServerStatNodeClusterBoardResponse_DailyTrafficStat{ result.DailyTrafficStats = append(result.DailyTrafficStats, &pb.ComposeServerStatNodeClusterBoardResponse_DailyTrafficStat{
Day: stat.Day, Day: stat.Day,
Bytes: int64(stat.Bytes), Bytes: int64(stat.Bytes),
@@ -102,6 +121,8 @@ func (this *ServerStatBoardService) ComposeServerStatNodeClusterBoard(ctx contex
AttackBytes: int64(stat.AttackBytes), AttackBytes: int64(stat.AttackBytes),
}) })
} }
result.DailyTrafficBytes = dailyTrafficBytes
result.LastDailyTrafficBytes = lastDailyTrafficBytes
// 小时流量统计 // 小时流量统计
var hourFrom = timeutil.Format("YmdH", time.Now().Add(-23*time.Hour)) var hourFrom = timeutil.Format("YmdH", time.Now().Add(-23*time.Hour))