marge: 合并11.2版本

2024-11-22 10:06:51 +08:00
parent 86ba2fb4a6
commit 1bdb13a2ab
67 changed files with 3536 additions and 3765 deletions
--- a/features/pm/kpi_c_report/controller.go
+++ b/features/pm/kpi_c_report/controller.go
@@ -0,0 +1,326 @@
+package kpi_c_report
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"be.ems/lib/dborm"
+	"be.ems/lib/services"
+	"github.com/gin-gonic/gin"
+)
+
+func (k *KpiCReport) Get(c *gin.Context) {
+	var reports []KpiCReport
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusBadRequest, services.ErrResp("Not found NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.NeID != "" {
+		conditions = append(conditions, "rm_uid = (select n.rm_uid from ne_info n where n.ne_type=? and n.ne_id=? and n.status=1)")
+		params = append(params, strings.ToUpper(querys.NeType), querys.NeID)
+	} else {
+		c.JSON(http.StatusBadRequest, services.ErrResp("Not found required parameter NE ID"))
+		return
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+
+	//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
+	err := dbg.Find(&reports).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusOK, services.DataResp(reports))
+}
+
+func (k *KpiCReport) GetReport2FE(c *gin.Context) {
+	var results []KpiCReport
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusOK, services.ErrResp("Not found required parameter NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.NeID != "" {
+		conditions = append(conditions, "rm_uid = (select n.rm_uid from ne_info n where n.ne_type=? and n.ne_id=? and n.status=1)")
+		params = append(params, querys.NeType, querys.NeID)
+	} else {
+		c.JSON(http.StatusBadRequest, services.ErrResp("Not found required parameter NE ID"))
+		return
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+
+	//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
+	err := dbg.Find(&results).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	reports := []map[string]any{}
+	for _, r := range results {
+		report := map[string]any{
+			// kip_id ...
+			"neType":      *r.NeType,
+			"neId":        querys.NeID,
+			"neName":      *r.NeName,
+			"rmUID":       *r.RmUID,
+			"startIndex":  r.Index,
+			"timeGroup":   r.Date[:10] + " " + *r.EndTime,
+			"createdAt":   r.CreatedAt,
+			"granularity": r.Granularity,
+		}
+
+		for _, k := range r.KpiValues {
+			report[k.KPIID] = k.Value
+		}
+		reports = append(reports, report)
+	}
+	c.JSON(http.StatusOK, services.DataResp(reports))
+}
+
+func (k *KpiCReport) GetTotalList(c *gin.Context) {
+	var reports []KpiCReport
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusOK, services.ErrResp("Not found NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.StartTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+
+	// get total number
+	var total int64 = 0
+	err := dbg.Count(&total).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+
+	//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
+	err = dbg.Find(&reports).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalDataResp(reports, total))
+}
+
+func (k *KpiCReport) Total(c *gin.Context) {
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusOK, services.ErrResp("Not found NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.StartTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "(UNIX_TIMESTAMP(created_at) * 1000) <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+	var total int64 = 0
+	err := dbg.Count(&total).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalResp(total))
+}
+
+func (k *KpiCReport) Post(c *gin.Context) {
+	var report KpiCReport
+
+	if err := c.ShouldBindJSON(&report); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	if err := dborm.DefaultDB().Create(&report).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusCreated, services.DataResp(report))
+}
+
+func (k *KpiCReport) Put(c *gin.Context) {
+	var report KpiCReport
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().First(&report, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator report not found"))
+		return
+	}
+
+	if err := c.ShouldBindJSON(&report); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	dborm.DefaultDB().Save(&report)
+	c.JSON(http.StatusOK, services.DataResp(report))
+}
+
+func (k *KpiCReport) Delete(c *gin.Context) {
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().Delete(&KpiCReport{}, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator report not found"))
+		return
+	}
+
+	c.JSON(http.StatusNoContent, nil) // 204 No Content
+}
+
+func InsertKpiCReport(neType string, report KpiCReport) {
+	tableName := TableName() + "_" + strings.ToLower(neType)
+	if err := dborm.DefaultDB().Table(tableName).Create(&report).Error; err != nil {
+		return
+	}
+}
--- a/features/pm/kpi_c_report/model.go
+++ b/features/pm/kpi_c_report/model.go
@@ -0,0 +1,71 @@
+package kpi_c_report
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+type KpiCVal struct {
+	KPIID string  `json:"kpi_id" gorm:"column:kpi_id"`
+	Value float64 `json:"value" gorm:"column:value"`
+	Err   string  `json:"err" gorm:"column:err"`
+}
+
+type KpiCValues []KpiCVal
+
+type KpiCReport struct {
+	ID          int        `gorm:"column:id;primary_key;auto_increment" json:"id"`
+	NeType      *string    `gorm:"column:ne_type;default:NULL" json:"neType,omitempty"`
+	NeName      *string    `gorm:"column:ne_name;default:" json:"neName,omitempty"`
+	RmUID       *string    `gorm:"column:rm_uid;default:NULL" json:"rmUid,omitempty"`
+	Date        string     `gorm:"column:date" json:"date"` // time.Time `gorm:"column:date" json:"date"`
+	StartTime   *string    `gorm:"column:start_time;default:NULL" json:"startTime,omitempty"`
+	EndTime     *string    `gorm:"column:end_time;default:NULL" json:"endTime,omitempty"`
+	Index       int16      `gorm:"column:index" json:"index"`
+	Granularity *int8      `gorm:"column:granularity;default:60" json:"granularity,omitempty"` //Time granualarity: 5/10/.../60/300 (second)
+	KpiValues   KpiCValues `gorm:"column:kpi_values;type:json" json:"kpiValues,omitempty"`
+	CreatedAt   *time.Time `gorm:"column:created_at;default:current_timestamp()" json:"createdAt,omitempty"`
+}
+
+type KpiCReportQuery struct {
+	NeType    string `json:"neType" form:"neType" binding:"required"`
+	NeID      string `json:"neId" form:"neId" binding:"required"`
+	RmUID     string `json:"rmUID" form:"rmUID"`
+	StartTime string `json:"startTime" form:"startTime"`
+	EndTime   string `json:"endTime" form:"endTime"`
+	UserName  string `json:"userName" form:"userName"`
+	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
+	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
+	PageNum   int    `json:"pageNum" form:"pageNum"`
+	PageSize  int    `json:"pageSize" form:"pageSize"`
+}
+
+type KpiCReport2FE struct {
+	NeType      string `json:"neType" gorm:"column:ne_type"`
+	NeId        string `json:"neId"`
+	NeName      string `json:"neName" gorm:"column:ne_name"`
+	RmUID       string `json:"rmUid" gorm:"column:rm_uid"`
+	TimeGroup   string `json:"timeGroup"`
+	StartIndex  int16  `json:"startIndex" gorm:"column:index"`
+	Granularity int8   `json:"granularity" gorm:"column:granularity"`
+}
+
+func TableName() string {
+	return "kpi_c_report"
+}
+
+// 将 KpiCValues 转换为 JSON 字节
+func (k KpiCValues) Value() (driver.Value, error) {
+	return json.Marshal(k)
+}
+
+// 从字节中扫描 KpiCValues
+func (k *KpiCValues) Scan(value interface{}) error {
+	b, ok := value.([]byte)
+	if !ok {
+		return fmt.Errorf("failed to scan value: %v", value)
+	}
+	return json.Unmarshal(b, k)
+}
--- a/features/pm/kpi_c_report/route.go
+++ b/features/pm/kpi_c_report/route.go
@@ -0,0 +1,43 @@
+package kpi_c_report
+
+import (
+	"be.ems/src/framework/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+// Register Routes for kpi_c_report
+func Register(r *gin.RouterGroup) {
+
+	pmKPIC := r.Group("/kpiC")
+	{
+		var k *KpiCReport
+		pmKPIC.GET("/report",
+			middleware.PreAuthorize(nil),
+			k.GetReport2FE,
+		)
+		pmKPIC.GET("/report/list",
+			middleware.PreAuthorize(nil),
+			k.Get,
+		)
+		pmKPIC.GET("/report/totalList",
+			middleware.PreAuthorize(nil),
+			k.Total,
+		)
+		pmKPIC.GET("/report/total",
+			middleware.PreAuthorize(nil),
+			k.Total,
+		)
+		pmKPIC.POST("/report",
+			middleware.PreAuthorize(nil),
+			k.Post,
+		)
+		pmKPIC.PUT("/report/:id",
+			middleware.PreAuthorize(nil),
+			k.Put,
+		)
+		pmKPIC.DELETE("/report/:id",
+			middleware.PreAuthorize(nil),
+			k.Delete,
+		)
+	}
+}
--- a/features/pm/kpi_c_title/controller.go
+++ b/features/pm/kpi_c_title/controller.go
@@ -0,0 +1,262 @@
+package kpi_c_title
+
+import (
+	"fmt"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
+
+	"be.ems/lib/dborm"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/src/framework/utils/ctx"
+	"github.com/gin-gonic/gin"
+)
+
+// get customize kpi total and list
+func (k *KpiCTitle) GetToalList(c *gin.Context) {
+	var titles []KpiCTitle
+	var conditions []string
+	var params []any
+	i18n := ctx.AcceptLanguage(c)
+
+	var querys KpiCTitleQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	dbg := dborm.DefaultDB().Table(k.TableName())
+	// construct condition to get
+	if neType := querys.NeType; neType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(neType))
+	}
+	if status := querys.Status; status != "" {
+		conditions = append(conditions, "status = ?")
+		params = append(params, status)
+	}
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+
+	// Get total number
+	var total int64 = 0
+	if err := dbg.Count(&total).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+	if err := dbg.Find(&titles).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	k.expressionAlias(titles, i18n)
+
+	c.JSON(http.StatusOK, services.TotalDataResp(titles, total))
+	//c.JSON(http.StatusOK, titles)
+}
+
+func (k *KpiCTitle) Get(c *gin.Context) {
+	var titles []KpiCTitle
+	var conditions []string
+	var params []any
+	i18n := ctx.AcceptLanguage(c)
+
+	// construct condition to get
+	if neType := c.Query("neType"); neType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(neType))
+	}
+	if status := c.Query("status"); status != "" {
+		conditions = append(conditions, "status = ?")
+		params = append(params, status)
+	}
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+	}
+	if err := dborm.DefaultDB().Where(whereSql, params...).Find(&titles).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	k.expressionAlias(titles, i18n)
+
+	c.JSON(http.StatusOK, services.DataResp(titles))
+	//c.JSON(http.StatusOK, titles)
+}
+
+// alias customized kpi expression with cn/en title
+func (k *KpiCTitle) expressionAlias(titles []KpiCTitle, i18n string) {
+	var title *KpiCTitle
+	for i := 0; i < len(titles); i++ {
+		title = &titles[i]
+		title.ExprAlias = *title.Expression
+		re := regexp.MustCompile(`'([^']+)'`)
+		matches := re.FindAllStringSubmatch(title.ExprAlias, -1)
+
+		for _, match := range matches {
+			var alias, sql string
+			if i18n == "zh" {
+				sql = fmt.Sprintf("SELECT cn_title FROM kpi_title WHERE kpi_id='%s'", match[1])
+			} else {
+				sql = fmt.Sprintf("SELECT en_title FROM kpi_title WHERE kpi_id='%s'", match[1])
+			}
+			err := dborm.XCoreDB().QueryRow(sql).Scan(&alias)
+			if err != nil {
+				log.Warn("Failed to QueryRow:", err)
+				continue
+			}
+			title.ExprAlias = regexp.MustCompile(match[1]).ReplaceAllString(title.ExprAlias, alias)
+		}
+	}
+}
+
+func (k *KpiCTitle) Total(c *gin.Context) {
+	var conditions []string
+	var params []any
+
+	// construct condition to get
+	if neType := c.Query("neType"); neType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(neType))
+	}
+	if status := c.Query("status"); status != "" {
+		conditions = append(conditions, "status = ?")
+		params = append(params, status)
+	}
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+	}
+	var total int64 = 0
+	if err := dborm.DefaultDB().Table(k.TableName()).Where(whereSql, params...).Count(&total).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalResp(total))
+}
+
+func (k *KpiCTitle) Post(c *gin.Context) {
+	var title, res KpiCTitle
+
+	if err := c.ShouldBindJSON(&title); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	userName := ctx.LoginUserToUserName(c)
+	title.CreatedBy = &userName
+	result := dborm.DefaultDB().Where("ne_type=? and (kpi_id=? or title=?)", title.NeType, title.KpiID, title.Title).First(&title)
+	if result.RowsAffected > 0 {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist"))
+		return
+	}
+	ret := dborm.DefaultDB().Table("kpi_c_title").Where("ne_type=? ORDER BY kpi_id DESC LIMIT 1", title.NeType).Scan(&res)
+	if err := ret.Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	newKpiID := *title.NeType + ".C" + ".01"
+	if ret.RowsAffected != 0 {
+		maxKpiID := *res.KpiID
+		prefix := maxKpiID[:len(maxKpiID)-2]
+		suffix := maxKpiID[len(maxKpiID)-2:]
+		suffixInt, err := strconv.Atoi(suffix)
+		if err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+		if suffixInt >= MAX_KPI_C_ID {
+			err := fmt.Errorf("exceed the max customized KPI ID")
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+
+		suffixInt++
+		newSuffix := fmt.Sprintf("%02d", suffixInt)
+		newKpiID = prefix + newSuffix
+	}
+	title.KpiID = &newKpiID
+	if err := dborm.DefaultDB().Create(&title).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	kpiCReportTable := "kpi_c_report_" + strings.ToLower(*title.NeType)
+	if !dborm.DefaultDB().Migrator().HasTable(kpiCReportTable) {
+		// clone table "kpi_c_report" to "kpi_c_report_{neType}"
+		sql := fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s AS SELECT * FROM %s WHERE 1=0", kpiCReportTable, "kpi_c_report")
+		if _, err := dborm.ExecSQL(sql, nil); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+		sql = fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`)", kpiCReportTable)
+		if _, err := dborm.ExecSQL(sql, nil); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+		sql = fmt.Sprintf("ALTER TABLE %s ADD INDEX IF NOT EXISTS `idx_timestamp`(`created_at`) USING BTREE, ADD INDEX IF NOT EXISTS `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE", kpiCReportTable)
+		if _, err := dborm.ExecSQL(sql, nil); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+	}
+	c.JSON(http.StatusCreated, services.DataResp(title))
+}
+
+func (k *KpiCTitle) Put(c *gin.Context) {
+	var title KpiCTitle
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().First(&title, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator not found"))
+		return
+	}
+
+	if err := c.ShouldBindJSON(&title); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	dborm.DefaultDB().Save(&title)
+
+	c.JSON(http.StatusOK, services.DataResp(title))
+}
+
+func (k *KpiCTitle) Delete(c *gin.Context) {
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().Delete(&KpiCTitle{}, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator not found"))
+		return
+	}
+
+	c.JSON(http.StatusNoContent, nil) // 204 No Content
+}
+
+func GetActiveKPICList(neType string) []KpiCTitle {
+	k := new([]KpiCTitle)
+
+	err := dborm.DefaultDB().Where("`ne_type` = ? and `status` = 'Active'", neType).Find(&k).Error
+	if err != nil {
+		return nil
+	}
+	return *k
+}
--- a/features/pm/kpi_c_title/model.go
+++ b/features/pm/kpi_c_title/model.go
@@ -0,0 +1,35 @@
+package kpi_c_title
+
+import "time"
+
+const (
+	MAX_KPI_C_ID = 99
+)
+
+type KpiCTitle struct {
+	ID          int        `gorm:"column:id;primary_key;auto_increment" json:"id"`
+	NeType      *string    `gorm:"column:ne_type;default:NULL," json:"neType,omitempty"`
+	KpiID       *string    `gorm:"column:kpi_id;default:NULL," json:"kpiId,omitempty"`
+	Title       *string    `gorm:"column:title;default:NULL," json:"title,omitempty"`
+	Expression  *string    `gorm:"column:expression;default:NULL," json:"expression,omitempty"`
+	ExprAlias   string     `gorm:"-" json:"exprAlias"`
+	Status      string     `gorm:"column:status;default:'Active'" json:"status"`
+	Unit        *string    `gorm:"column:unit" json:"unit,omitempty"`
+	Description *string    `gorm:"column:description;default:NULL," json:"description,omitempty"`
+	CreatedBy   *string    `gorm:"column:created_by;default:NULL," json:"createdBy,omitempty"`
+	UpdatedAt   *time.Time `gorm:"column:updated_at;default:current_timestamp()," json:"updatedAt,omitempty"`
+}
+
+type KpiCTitleQuery struct {
+	ID        int    `json:"id" form:"id"`
+	NeType    string `json:"neType" form:"neType"`
+	Status    string `json:"status" form:"status"`
+	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
+	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
+	PageNum   int    `json:"pageNum" form:"pageNum"`
+	PageSize  int    `json:"pageSize" form:"pageSize"`
+}
+
+func (k *KpiCTitle) TableName() string {
+	return "kpi_c_title"
+}
--- a/features/pm/kpi_c_title/route.go
+++ b/features/pm/kpi_c_title/route.go
@@ -0,0 +1,39 @@
+package kpi_c_title
+
+import (
+	"be.ems/src/framework/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+// Register Routes for kpi_c_title
+func Register(r *gin.RouterGroup) {
+
+	pmKPIC := r.Group("/kpiC")
+	{
+		var k *KpiCTitle
+		pmKPIC.GET("/title",
+			middleware.PreAuthorize(nil),
+			k.Get,
+		)
+		pmKPIC.GET("/title/total",
+			middleware.PreAuthorize(nil),
+			k.Total,
+		)
+		pmKPIC.GET("/title/totalList",
+			middleware.PreAuthorize(nil),
+			k.GetToalList,
+		)
+		pmKPIC.POST("/title",
+			middleware.PreAuthorize(nil),
+			k.Post,
+		)
+		pmKPIC.PUT("/title/:id",
+			middleware.PreAuthorize(nil),
+			k.Put,
+		)
+		pmKPIC.DELETE("/title/:id",
+			middleware.PreAuthorize(nil),
+			k.Delete,
+		)
+	}
+}
--- a/features/pm/performance.go
+++ b/features/pm/performance.go
@@ -10,7 +10,10 @@ import (
 	"strings"
 	"time"

+	"be.ems/features/pm/kpi_c_report"
+	"be.ems/features/pm/kpi_c_title"
 	"be.ems/lib/dborm"
+	evaluate "be.ems/lib/eval"
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
@@ -41,7 +44,7 @@ type KpiReport struct {
 			NeType string `json:"NeType"`
 			KPIs   []struct {
 				KPIID string `json:"KPIID"`
-				Value int    `json:"Value"`
+				Value int64  `json:"Value"`
 				Err   string `json:"Err"`
 			} `json:"KPIs"`
 		} `json:"NE"`
@@ -59,7 +62,7 @@ type GoldKpi struct {
 	RmUid       string `json:"rmUid" xorm:"rm_uid"`
 	NEType      string `json:"neType" xorm:"ne_type"`
 	KpiId       string `json:"kpiId" xorm:"kpi_id"`
-	Value       int    `json:"value"`
+	Value       int64  `json:"value"`
 	Error       string `json:"error"`
 	Timestamp   string `json:"timestamp"`
 }
@@ -246,9 +249,13 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		// kip_id ...
 		"neType":     kpiReport.Task.NE.NeType,
 		"neName":     kpiReport.Task.NE.NEName,
+		"rmUID":      kpiReport.Task.NE.RmUID,
 		"startIndex": kpiIndex,
 		"timeGroup":  kpiData.CreatedAt,
 	}
+
+	// for custom kpi
+	kpiValMap := map[string]any{}
 	for _, k := range kpiReport.Task.NE.KPIs {
 		kpiEvent[k.KPIID] = k.Value // kip_id

@@ -256,7 +263,9 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		kpiVal.Value = int64(k.Value)
 		kpiVal.Err = k.Err
 		kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
+		kpiValMap[k.KPIID] = k.Value
 	}
+	kpiValMap["granularity"] = kpiData.Granularity

 	// insert kpi_report table, no session
 	tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
@@ -267,147 +276,65 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}

+	report := kpi_c_report.KpiCReport{
+		NeType:      &kpiData.NEType,
+		NeName:      &kpiData.NEName,
+		RmUID:       &kpiData.RmUid,
+		Date:        kpiData.Date,
+		StartTime:   &kpiData.StartTime,
+		EndTime:     &kpiData.EndTime,
+		Index:       int16(kpiData.Index),
+		Granularity: &kpiData.Granularity,
+	}
+
 	// 发送到匹配的网元
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByRmuid(kpiData.RmUid)
+	neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(kpiData.RmUid)
+	// custom kpi report to FE
+	kpiCEvent := map[string]any{
+		// kip_id ...
+		"neType":      kpiData.NEType,
+		"neId":        neInfo.NeId,
+		"neName":      kpiData.NEName,
+		"rmUID":       kpiData.RmUid,
+		"startIndex":  kpiData.Index,
+		"timeGroup":   kpiData.Date[:10] + " " + kpiData.EndTime,
+		"createdAt":   kpiData.CreatedAt,
+		"granularity": kpiData.Granularity,
+	}
+	kpiCList := kpi_c_title.GetActiveKPICList(kpiData.NEType)
+	for _, k := range kpiCList {
+		result, err := evaluate.CalcExpr(*k.Expression, kpiValMap)
+		kpiCVal := new(kpi_c_report.KpiCVal)
+		kpiCVal.KPIID = *k.KpiID
+		if err != nil {
+			kpiCVal.Value = 0.0
+			kpiCVal.Err = err.Error()
+		} else {
+			kpiCVal.Value = result
+		}
+
+		report.KpiValues = append(report.KpiValues, *kpiCVal)
+
+		// set KPIC event kpiid and value
+		kpiCEvent[kpiCVal.KPIID] = kpiCVal.Value
+	}
+
+	// KPI自定义指标入库
+	kpi_c_report.InsertKpiCReport(kpiData.NEType, report)
+
 	if neInfo.RmUID == kpiData.RmUid {
 		// 推送到ws订阅组
-		wsService.NewWSSendImpl.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
+		wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
+		// 推送自定义KPI到ws订阅组
+		wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
 		if neInfo.NeType == "UPF" {
-			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF+neInfo.NeId, kpiEvent)
+			wsService.NewWSSend.ByGroupID(wsService.GROUP_KPI_UPF+neInfo.NeId, kpiEvent)
 		}
 	}

 	services.ResponseStatusOK204NoContent(w)
 }

-// PostGoldKPIFromNF 已废弃
-// post kpi report from NEs, insert insto gold_kpi table, discard...
-func PostGoldKPIFromNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("PostKPIReportFromNF processing... ")
-
-	vars := mux.Vars(r)
-	apiVer := vars["apiVersion"]
-	if apiVer != global.ApiVersionV1 {
-		log.Error("Uri api version is invalid. apiVersion:", apiVer)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	//	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("Faile to io.ReadAll: ", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	log.Trace("Request body:", string(body))
-	kpiReport := new(KpiReport)
-	_ = json.Unmarshal(body, &kpiReport)
-	log.Trace("kpiReport:", kpiReport)
-
-	session := xEngine.NewSession()
-	defer session.Close()
-	goldKpi := new(GoldKpi)
-	layout := time.RFC3339Nano
-	goldKpi.Date = GetDateFromTimeString(layout, kpiReport.Task.Period.StartTime)
-	goldKpi.Index, _ = strconv.Atoi(vars["index"])
-	goldKpi.StartTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.StartTime, time.DateTime)
-	goldKpi.EndTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.EndTime, time.DateTime)
-	// get time granularity from startTime and endTime
-	seconds, _ := global.GetSecondDuration(goldKpi.StartTime, goldKpi.EndTime)
-	goldKpi.Granularity = 60
-	if seconds != 0 && seconds <= math.MaxInt8 && seconds >= math.MinInt8 {
-		goldKpi.Granularity = int8(seconds)
-	}
-	goldKpi.NEName = kpiReport.Task.NE.NEName
-	goldKpi.RmUid = kpiReport.Task.NE.RmUID
-	goldKpi.NEType = kpiReport.Task.NE.NeType
-	goldKpi.Timestamp = global.GetFmtTimeString(layout, kpiReport.Timestamp, time.DateTime)
-	// 黄金指标事件对象
-	kpiEvent := map[string]any{
-		// kip_id ...
-		"neType":     goldKpi.NEType,
-		"neName":     goldKpi.NEName,
-		"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.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
-
-		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()
-		if err != nil {
-			log.Error("Failed to Begin gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		gkpi := &GoldKpi{}
-		_, err = session.Where("id = ?", 1).ForUpdate().Get(gkpi)
-		if err != nil {
-			// 回滚事务
-			session.Rollback()
-			log.Error("Failed to ForUpdate gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		affected, err := session.Insert(goldKpi)
-		if err != nil && affected <= 0 {
-			session.Rollback()
-			log.Error("Failed to insert gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		// 提交事务
-		err = session.Commit()
-		if err != nil {
-			log.Error("Failed to Commit gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-	}
-
-	// 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.ResponseStatusOK204NoContent(w)
-}
-
 type MeasureTask struct {
 	Tasks     []Task `json:"Tasks"`
 	NotifyUrl string `json:"NotifyUrl"` /* "http://xEngine.xEngine.xEngine.x:xxxx/api/rest/performanceManagement/v1/elementType/smf/objectType/measureReport */
--- a/features/pm/service.go
+++ b/features/pm/service.go
@@ -0,0 +1,19 @@
+package pm
+
+import (
+	"be.ems/features/pm/kpi_c_report"
+	"be.ems/features/pm/kpi_c_title"
+	"be.ems/lib/log"
+	"github.com/gin-gonic/gin"
+)
+
+func InitSubServiceRoute(r *gin.Engine) {
+	log.Info("======init PM group gin.Engine")
+
+	pmGroup := r.Group("/pm")
+	// register sub modules routes
+	kpi_c_title.Register(pmGroup)
+	kpi_c_report.Register(pmGroup)
+
+	// return featuresGroup
+}