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

55
features/pm/kpi_c_title/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"
)
@@ -21,7 +21,7 @@ func (k *KpiCTitle) GetToalList(c *gin.Context) {
return
}
dborm := datasource.DefaultDB().Table(k.TableName())
dbg := dborm.DefaultDB().Table(k.TableName())
// construct condition to get
if neType := querys.NeType; neType != "" {
conditions = append(conditions, "ne_type = ?")
@@ -34,30 +34,30 @@ func (k *KpiCTitle) GetToalList(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
if err := dborm.Count(&total).Error; err != nil {
if err := dbg.Count(&total).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
// 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)
}
if err := dborm.Find(&titles).Error; err != nil {
if err := dbg.Find(&titles).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
@@ -84,7 +84,7 @@ func (k *KpiCTitle) Get(c *gin.Context) {
if len(conditions) > 0 {
whereSql += strings.Join(conditions, " and ")
}
if err := datasource.DefaultDB().Where(whereSql, params...).Find(&titles).Error; err != nil {
if err := dborm.DefaultDB().Where(whereSql, params...).Find(&titles).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
@@ -111,7 +111,7 @@ func (k *KpiCTitle) Total(c *gin.Context) {
whereSql += strings.Join(conditions, " and ")
}
var total int64 = 0
if err := datasource.DefaultDB().Table(k.TableName()).Where(whereSql, params...).Count(&total).Error; err != nil {
if err := dborm.DefaultDB().Table(k.TableName()).Where(whereSql, params...).Count(&total).Error; err != nil {
c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
@@ -126,11 +126,34 @@ func (k *KpiCTitle) Post(c *gin.Context) {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
return
}
if err := datasource.DefaultDB().Create(&title).Error; err != nil {
result := dborm.DefaultDB().Where("ne_type=? and kpi_id=?", title.NeType, title.KpiID).First(&title)
if result.RowsAffected > 0 {
c.JSON(http.StatusInternalServerError, services.ErrResp("target kpiC title already exist"))
return
}
if err := dborm.DefaultDB().Create(&title).Error; err != nil {
c.JSON(http.StatusInternalServerError, 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.StatusInternalServerError, 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.StatusInternalServerError, 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.StatusInternalServerError, services.ErrResp(err.Error()))
return
}
}
c.JSON(http.StatusCreated, services.DataResp(title))
}
@@ -138,7 +161,7 @@ func (k *KpiCTitle) Put(c *gin.Context) {
var title KpiCTitle
id := c.Param("id")
if err := datasource.DefaultDB().First(&title, id).Error; err != nil {
if err := dborm.DefaultDB().First(&title, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPIC Title not found"))
return
}
@@ -147,7 +170,7 @@ func (k *KpiCTitle) Put(c *gin.Context) {
c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
return
}
datasource.DefaultDB().Save(&title)
dborm.DefaultDB().Save(&title)
c.JSON(http.StatusOK, services.DataResp(title))
}
@@ -155,7 +178,7 @@ func (k *KpiCTitle) Put(c *gin.Context) {
func (k *KpiCTitle) Delete(c *gin.Context) {
id := c.Param("id")
if err := datasource.DefaultDB().Delete(&KpiCTitle{}, id).Error; err != nil {
if err := dborm.DefaultDB().Delete(&KpiCTitle{}, id).Error; err != nil {
c.JSON(http.StatusNotFound, services.ErrResp("KPIC Title not found"))
return
}
@@ -166,7 +189,7 @@ func (k *KpiCTitle) Delete(c *gin.Context) {
func GetActiveKPICList(neType string) []KpiCTitle {
k := new([]KpiCTitle)
err := datasource.DefaultDB().Where("`ne_type` = ? and `status` = 'Active'", neType).Find(&k).Error
err := dborm.DefaultDB().Where("`ne_type` = ? and `status` = 'Active'", neType).Find(&k).Error
if err != nil {
return nil
}