opt: kpi performance optimize

features/pm/performance.go

@@ -8,6 +8,7 @@ import (
 	"math"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"be.ems/lib/dborm"
@@ -63,6 +64,26 @@ type GoldKpi struct {
 	Timestamp   string `json:"timestamp"`
 }
 
+type KpiData struct {
+	ID          int       `json:"id" xorm:"pk 'id' '<-' autoincr"`
+	NEType      string    `json:"neType" xorm:"ne_type"`
+	NEName      string    `json:"neName" xorm:"ne_name"`
+	RmUid       string    `json:"rmUid" xorm:"rm_uid"`
+	Date        string    `json:"date" xorm:"date"`
+	StartTime   time.Time `json:"startTime" xorm:"start_time"`
+	EndTime     time.Time `json:"endTime" xorm:"end_time"`
+	Index       int       `json:"index" xorm:"index"`
+	Granularity int8      `json:"granularity" xorm:"granularity"`
+	KPIValues   []KPIVal  `json:"kpiValues" xorm:"json 'kpi_values'"`
+	//CreatedAt   int64     `json:"createdAt" xorm:"created 'created_at'"`
+	CreatedAt int64 `json:"createdAt" xorm:"'created_at'"`
+}
+type KPIVal struct {
+	KPIID string `json:"kpiID"`
+	Value int64  `json:"value"`
+	Err   string `json:"err"`
+}
+
 var (
 	// performance management
 	PerformanceUri   = config.DefaultUriPrefix + "/performanceManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/kpiReport/{index}"
@@ -124,6 +145,21 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam st
 	}
 	xEngine = DbClient.XEngine
 
+	// exist, err := xEngine.IsTableExist("kpi_report")
+	// if err != nil {
+	// 	log.Error("Failed to IsTableExist:", err)
+	// 	return err
+	// }
+	// if exist {
+	// 	// 复制表结构到新表
+	// 	sql := fmt.Sprintf("CREATE TABLE IF NOT EXISTS `%s` AS SELECT * FROM kpi_report WHERE 1=0", "kpi_report_amf")
+	// 	_, err := xEngine.Exec(sql)
+	// 	if err != nil {
+	// 		log.Error("Failed to Exec:", err)
+	// 		return err
+	// 	}
+	// }
+
 	return nil
 }
 
@@ -204,12 +240,34 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		"startIndex": goldKpi.Index,
 		"timeGroup":  goldKpi.StartTime,
 	}
+	// insert into new kpi_report_xxx table
+	kpiData := new(KpiData)
+	kpiData.Date = goldKpi.Date
+	kpiData.Index = goldKpi.Index
+	st, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.StartTime, time.Local)
+	et, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.EndTime, time.Local)
+	// kpiData.StartTime = goldKpi.StartTime
+	// kpiData.EndTime = goldKpi.EndTime
+	kpiData.StartTime = st
+	kpiData.EndTime = et
+	kpiData.Granularity = goldKpi.Granularity
+	kpiData.NEName = goldKpi.NEName
+	kpiData.NEType = goldKpi.NEType
+	kpiData.RmUid = goldKpi.RmUid
+	kpiVal := new(KPIVal)
+	kpiData.CreatedAt = time.Now().UnixMilli()
 	for _, k := range kpiReport.Task.NE.KPIs {
 		kpiEvent[k.KPIID] = k.Value // kip_id
 		goldKpi.KpiId = k.KPIID
 		goldKpi.Value = k.Value
 		goldKpi.Error = k.Err
-		log.Trace("goldKpi:", goldKpi)
+
+		kpiVal.KPIID = k.KPIID
+		kpiVal.Value = int64(k.Value)
+		kpiVal.Err = k.Err
+		kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
+
+		//log.Trace("goldKpi:", goldKpi)
 
 		// 启动事务
 		err := session.Begin()
@@ -243,13 +301,22 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// insert kpi_report table, no session
+	tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
+	affected, err := xEngine.Table(tableName).Insert(kpiData)
+	if err != nil && affected <= 0 {
+		log.Errorf("Failed to insert %s:%v", tableName, err)
+		services.ResponseInternalServerError500ProcessError(w, err)
+		return
+	}
+
 	// 推送到ws订阅组
 	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
 	if goldKpi.NEType == "UPF" {
 		wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF, kpiEvent)
 	}
 
-	services.ResponseStatusOK200Null(w)
+	services.ResponseStatusOK204NoContent(w)
 }
 
 type MeasureTask struct {