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

fix: custom indicator report issue

Browse Source
This commit is contained in:
simonzhangsz
2024-09-09 16:32:17 +08:00
parent b5ae51d1cc
commit adec327bc3
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/pm/kpi_c_report/controller.go
View File

@@ -149,7 +149,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
"neName": *r.NeName, "neName": *r.NeName,
"rmUID": *r.RmUID, "rmUID": *r.RmUID,
"startIndex": r.Index, "startIndex": r.Index,
"timeGroup": r.Date[:10] + " " + *r.StartTime, "timeGroup": r.Date[:10] + " " + *r.EndTime,
"createdAt": r.CreatedAt, "createdAt": r.CreatedAt,
"granularity": r.Granularity, "granularity": r.Granularity,
} }

22
features/pm/kpi_c_report/model.go
View File

@@ -30,17 +30,16 @@ type KpiCReport struct {
} }
type KpiCReportQuery struct { type KpiCReportQuery struct {
NeType string `json:"neType" form:"neType" binding:"required"` NeType string `json:"neType" form:"neType" binding:"required"`
NeID string `json:"neId" form:"neId" binding:"required"` NeID string `json:"neId" form:"neId" binding:"required"`
RmUID string `json:"rmUID" form:"rmUID"` RmUID string `json:"rmUID" form:"rmUID"`
StartTime string `json:"startTime" form:"startTime"` StartTime string `json:"startTime" form:"startTime"`
EndTime string `json:"endTime" form:"endTime"` EndTime string `json:"endTime" form:"endTime"`
TenantName string `json:"tenantName" form:"tenantName"` UserName string `json:"userName" form:"userName"`
UserName string `json:"userName" form:"userName"` SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段 SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc
SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"` // 排序升降序，asc desc PageNum int `json:"pageNum" form:"pageNum"`
PageNum int `json:"pageNum" form:"pageNum"` PageSize int `json:"pageSize" form:"pageSize"`
PageSize int `json:"pageSize" form:"pageSize"`
} }
type KpiCReport2FE struct { type KpiCReport2FE struct {
@@ -51,7 +50,6 @@ type KpiCReport2FE struct {
TimeGroup string `json:"timeGroup"` TimeGroup string `json:"timeGroup"`
StartIndex int16 `json:"startIndex" gorm:"column:index"` StartIndex int16 `json:"startIndex" gorm:"column:index"`
Granularity int8 `json:"granularity" gorm:"column:granularity"` Granularity int8 `json:"granularity" gorm:"column:granularity"`
TenantID string `json:"tenantID" gorm:"column:tenant_id"`
} }
func TableName() string { func TableName() string {

2
features/pm/performance.go
View File

@@ -297,7 +297,7 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
"neName": kpiData.NEName, "neName": kpiData.NEName,
"rmUID": kpiData.RmUid, "rmUID": kpiData.RmUid,
"startIndex": kpiData.Index, "startIndex": kpiData.Index,
"timeGroup": kpiData.Date[:10] + " " + kpiData.StartTime, "timeGroup": kpiData.Date[:10] + " " + kpiData.EndTime,
"createdAt": kpiData.CreatedAt, "createdAt": kpiData.CreatedAt,
"granularity": kpiData.Granularity, "granularity": kpiData.Granularity,
} }