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

Merge branch 'lichang' into lite

Browse Source
This commit is contained in:
TsMask
2025-04-29 16:15:16 +08:00
parent b82f359b5f 23881042bc
commit 2a51f0fa86
670 changed files with 17749 additions and 19324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
features/pm/kpi_c_report/route.go
View File

@@ -12,31 +12,31 @@ func Register(r *gin.RouterGroup) {
{
var k *KpiCReport
pmKPIC.GET("/report",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.GetReport2FE,
)
pmKPIC.GET("/report/list",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Get,
)
pmKPIC.GET("/report/totalList",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Total,
)
pmKPIC.GET("/report/total",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Total,
)
pmKPIC.POST("/report",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Post,
)
pmKPIC.PUT("/report/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Put,
)
pmKPIC.DELETE("/report/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Delete,
)
}

12
features/pm/kpi_c_title/route.go
View File

@@ -12,27 +12,27 @@ func Register(r *gin.RouterGroup) {
{
var k *KpiCTitle
pmKPIC.GET("/title",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Get,
)
pmKPIC.GET("/title/total",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Total,
)
pmKPIC.GET("/title/totalList",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.GetToalList,
)
pmKPIC.POST("/title",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Post,
)
pmKPIC.PUT("/title/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Put,
)
pmKPIC.DELETE("/title/:id",
middleware.PreAuthorize(nil),
middleware.AuthorizeUser(nil),
k.Delete,
)
}

20
features/pm/performance.go
View File

@@ -695,7 +695,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
}
log.Debug("ips:", ips)
measureTask.NotifyUrl = global.SetNotifyUrl(ips[0], config.GetYamlConfig().Rest[0].Port, fmt.Sprintf(MeasureReportFmt, neType))
measureTask.NotifyUrl = global.SetNotifyUrl(ips[0], 33030, fmt.Sprintf(MeasureReportFmt, neType))
log.Debug("Measure Task to NF:", measureTask)
if len(task.NeIds) == 0 {
@@ -1124,9 +1124,9 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
log.Debug("measurement:", measurement)
// layout := global.DateTime
// layout := time.RFC3339
// measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
// measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
layout := time.RFC3339
measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
// tx := db.DB("").Table("nbi_pm").Create(measurement)
// if tx.Error != nil && tx.RowsAffected <= 0 {
// log.Error("Failed to insert nbi_pm:", err)
@@ -1207,12 +1207,12 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
layout := time.RFC3339
measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
tx := db.DB("").Table("nbi_pm").Create(measurement)
if tx.Error != nil && tx.RowsAffected <= 0 {
log.Error("Failed to insert nbi_pm:", err)
services.ResponseInternalServerError500DatabaseOperationFailed(w)
return
}
// tx := db.DB("").Table("nbi_pm").Create(measurement)
// if tx.Error != nil && tx.RowsAffected <= 0 {
// log.Error("Failed to insert nbi_pm:", err)
// services.ResponseInternalServerError500DatabaseOperationFailed(w)
// return
// }
default:
log.Debug("response body:", string(response.Body()))
body := new(map[string]interface{})