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

fix for custom kpi and export log&cdr table file

Browse Source
This commit is contained in:
simonzhangsz
2024-08-30 11:41:22 +08:00
parent 0555d4a3d2
commit fb3ce6183b
11 changed files with 408 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,8 @@ import (
"net/http"
"strings"
"be.ems/lib/dborm"
"be.ems/lib/services"
"be.ems/src/framework/datasource"
"github.com/gin-gonic/gin"
)
@@ -30,7 +30,7 @@ func (k *KpiCReport) Get(c *gin.Context) {
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
dborm := datasource.DefaultDB().Table(tableName)
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)")
@@ -51,30 +51,29 @@ func (k *KpiCReport) Get(c *gin.Context) {
whereSql := ""
if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ")
dborm = dborm.Where(whereSql, params...)
dbg = dbg.Where(whereSql, params...)
}
// page number and size
if pageSize := querys.PageSize; pageSize > 0 {
dborm = dborm.Limit(pageSize)
dbg = dbg.Limit(pageSize)
if pageNum := querys.PageNum; pageNum > 0 {
dborm = dborm.Offset((pageNum - 1) * pageSize)
dbg = dbg.Offset((pageNum - 1) * pageSize)
}
}
// order by
if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
dborm = dborm.Order(orderBy)
dbg = dbg.Order(orderBy)
}
//err := datasource.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err := dborm.Find(&reports).Error
//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err := dbg.Find(&reports).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusOK, services.DataResp(reports))
//c.JSON(http.StatusOK, reports)
}
func (k *KpiCReport) GetReport2FE(c *gin.Context) {
@@ -97,7 +96,7 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
dborm := datasource.DefaultDB().Table(tableName)
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)")
@@ -118,24 +117,24 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
whereSql := ""
if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ")
dborm = dborm.Where(whereSql, params...)
dbg = dbg.Where(whereSql, params...)
}
// page number and size
if pageSize := querys.PageSize; pageSize > 0 {
dborm = dborm.Limit(pageSize)
dbg = dbg.Limit(pageSize)
if pageNum := querys.PageNum; pageNum > 0 {
dborm = dborm.Offset((pageNum - 1) * pageSize)
dbg = dbg.Offset((pageNum - 1) * pageSize)
}
}
// order by
if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
dborm = dborm.Order(orderBy)
dbg = dbg.Order(orderBy)
}
//err := datasource.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err := dborm.Find(&results).Error
//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err := dbg.Find(&results).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
@@ -153,7 +152,6 @@ func (k *KpiCReport) GetReport2FE(c *gin.Context) {
"timeGroup": r.Date[:10] + " " + *r.StartTime,
"createdAt": r.CreatedAt,
"granularity": r.Granularity,
"tenantID": r.TenantID,
}
for _, k := range r.KpiValues {
@@ -184,7 +182,7 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
dborm := datasource.DefaultDB().Table(tableName)
dbg := dborm.DefaultDB().Table(tableName)
if querys.StartTime != "" {
conditions = append(conditions, "created_at >= ?")
@@ -198,12 +196,12 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
whereSql := ""
if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ")
dborm = dborm.Where(whereSql, params...)
dbg = dbg.Where(whereSql, params...)
}
// get total number
var total int64 = 0
err := dborm.Count(&total).Error
err := dbg.Count(&total).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
@@ -211,27 +209,26 @@ func (k *KpiCReport) GetTotalList(c *gin.Context) {
// page number and size
if pageSize := querys.PageSize; pageSize > 0 {
dborm = dborm.Limit(pageSize)
dbg = dbg.Limit(pageSize)
if pageNum := querys.PageNum; pageNum > 0 {
dborm = dborm.Offset((pageNum - 1) * pageSize)
dbg = dbg.Offset((pageNum - 1) * pageSize)
}
}
// order by
if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
dborm = dborm.Order(orderBy)
dbg = dbg.Order(orderBy)
}
//err := datasource.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err = dborm.Find(&reports).Error
//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
err = dbg.Find(&reports).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
c.JSON(http.StatusOK, services.TotalDataResp(reports, total))
//c.JSON(http.StatusOK, reports)
}
func (k *KpiCReport) Total(c *gin.Context) {
@@ -253,7 +250,7 @@ func (k *KpiCReport) Total(c *gin.Context) {
return
}
tableName := TableName() + "_" + strings.ToLower(querys.NeType)
dborm := datasource.DefaultDB().Table(tableName)
dbg := dborm.DefaultDB().Table(tableName)
if querys.StartTime != "" {
conditions = append(conditions, "created_at >= ?")
@@ -267,10 +264,10 @@ func (k *KpiCReport) Total(c *gin.Context) {
whereSql := ""
if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ")
dborm = dborm.Where(whereSql, params...)
dbg = dbg.Where(whereSql, params...)
}
var total int64 = 0
err := dborm.Count(&total).Error
err := dbg.Count(&total).Error
if err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
@@ -286,7 +283,7 @@ func (k *KpiCReport) Post(c *gin.Context) {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
return
}
if err := datasource.DefaultDB().Create(&report).Error; err != nil {
if err := dborm.DefaultDB().Create(&report).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
@@ -297,7 +294,7 @@ func (k *KpiCReport) Put(c *gin.Context) {
var report KpiCReport
id := c.Param("id")
if err := datasource.DefaultDB().First(&report, id).Error; err != nil {
if err := dborm.DefaultDB().First(&report, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPI report not found"))
return
}
@@ -306,14 +303,14 @@ func (k *KpiCReport) Put(c *gin.Context) {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
return
}
datasource.DefaultDB().Save(&report)
dborm.DefaultDB().Save(&report)
c.JSON(http.StatusOK, services.DataResp(report))
}
func (k *KpiCReport) Delete(c *gin.Context) {
id := c.Param("id")
if err := datasource.DefaultDB().Delete(&KpiCReport{}, id).Error; err != nil {
if err := dborm.DefaultDB().Delete(&KpiCReport{}, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPI report not found"))
return
}
@@ -323,7 +320,7 @@ func (k *KpiCReport) Delete(c *gin.Context) {
func InsertKpiCReport(neType string, report KpiCReport) {
tableName := TableName() + "_" + strings.ToLower(neType)
if err := datasource.DefaultDB().Table(tableName).Create(&report).Error; err != nil {
if err := dborm.DefaultDB().Table(tableName).Create(&report).Error; err != nil {
return
}
}