OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: kpi_report issue

Browse Source
This commit is contained in:
simonzhangsz
2024-06-24 17:24:55 +08:00
parent c699bf22ed
commit d8e7de9e18
1 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/modules/network_data/repository/perf_kpi.impl.go
View File

@@ -96,19 +96,47 @@ func (r *PerfKPIImpl) SelectKpiReport(query model.GoldKPIQuery, kpiIds []string)
params = append(params, query.RmUID) params = append(params, query.RmUID)
} }
if query.NeType != "" { if query.NeType != "" {
conditions = append(conditions, "gk.ne_type = ?") //conditions = append(conditions, "gk.ne_type = ?")
params = append(params, query.NeType) // params = append(params, query.NeType)
tableName += strings.ToLower(query.NeType) tableName += strings.ToLower(query.NeType)
} }
var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
var dateStr1, dateStr2, timeStr1, timeStr2 string
if query.StartTime != "" { if query.StartTime != "" {
conditions = append(conditions, dateTimeStr+" >= ?") dateStr1 = query.StartTime[:10]
params = append(params, query.StartTime) timeStr1 = query.StartTime[11:]
} }
if query.EndTime != "" { if query.EndTime != "" {
conditions = append(conditions, dateTimeStr+" <= ?") dateStr2 = query.EndTime[:10]
params = append(params, query.EndTime) timeStr2 = query.EndTime[11:]
} }
if dateStr1 == dateStr2 && dateStr1 != "" {
conditions = append(conditions, "gk.`date` = ?")
params = append(params, dateStr1)
conditions = append(conditions, "gk.`start_time` >= ?")
params = append(params, timeStr1)
conditions = append(conditions, "gk.`start_time` <= ?")
params = append(params, timeStr2)
} else {
if dateStr1 != "" {
conditions = append(conditions, "(gk.`date` > ? OR (gk.`date` = ? AND gk.`start_time` >= ?))")
params = append(params, dateStr1, dateStr1, timeStr1)
}
if dateStr2 != "" {
conditions = append(conditions, "(gk.`date` < ? OR (gk.`date` = ? AND gk.`start_time` <= ?))")
params = append(params, dateStr2, dateStr2, timeStr2)
}
}
// var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
// if query.StartTime != "" {
// conditions = append(conditions, dateTimeStr+" >= ?")
// params = append(params, query.StartTime)
// }
// if query.EndTime != "" {
// conditions = append(conditions, dateTimeStr+" <= ?")
// params = append(params, query.EndTime)
// }
// 构建查询条件语句 // 构建查询条件语句
whereSql := "" whereSql := ""
if len(conditions) > 0 { if len(conditions) > 0 {
@@ -116,6 +144,7 @@ func (r *PerfKPIImpl) SelectKpiReport(query model.GoldKPIQuery, kpiIds []string)
} }
// 查询字段列 // 查询字段列
var dateTimeStr string = "CONCAT(gk.`date`, \" \", gk.start_time)"
timeFormat := "DATE_FORMAT(" + dateTimeStr + ", '%Y-%m-%d %H:%i:')" timeFormat := "DATE_FORMAT(" + dateTimeStr + ", '%Y-%m-%d %H:%i:')"
secondGroup := fmt.Sprintf("LPAD(FLOOR(SECOND(gk.start_time) / %d) * %d, 2, '0')", query.Interval, query.Interval) secondGroup := fmt.Sprintf("LPAD(FLOOR(SECOND(gk.start_time) / %d) * %d, 2, '0')", query.Interval, query.Interval)
groupByField := fmt.Sprintf("CONCAT( %s, %s ) AS timeGroup", timeFormat, secondGroup) groupByField := fmt.Sprintf("CONCAT( %s, %s ) AS timeGroup", timeFormat, secondGroup)