ref: 重构网元跟踪任务功能

src/modules/trace/repository/trace_data.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"strings"
 
 	"be.ems/src/framework/database/db"
 	"be.ems/src/framework/logger"
@@ -18,11 +19,8 @@ type TraceData struct{}
 func (r TraceData) SelectByPage(query map[string]string) ([]model.TraceData, int64) {
 	tx := db.DB("").Model(&model.TraceData{})
 	// 查询条件拼接
-	if v, ok := query["imsi"]; ok && v != "" {
-		tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", v))
-	}
-	if v, ok := query["msisdn"]; ok && v != "" {
-		tx = tx.Where("msisdn like ?", fmt.Sprintf("%s%%", v))
+	if v, ok := query["traceId"]; ok && v != "" {
+		tx = tx.Where("trace_id = ?", v)
 	}
 	if v, ok := query["startTime"]; ok && v != "" {
 		if len(v) == 10 {
@@ -53,7 +51,33 @@ func (r TraceData) SelectByPage(query map[string]string) ([]model.TraceData, int
 	// 查询数据分页
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
-	err := tx.Find(&rows).Error
+	// 排序
+	sortByStr, sortOk := query["sortBy"]
+	sortOrderStr, orderOk := query["sortOrder"]
+	if sortOk && sortByStr != "" && orderOk && sortOrderStr != "" {
+		sortByArr := strings.Split(sortByStr, ",")
+		sortOrderArr := strings.Split(sortOrderStr, ",")
+		for i := range sortByArr {
+			sortBy := sortByArr[i]
+			sortOrder := sortOrderArr[i]
+			// 排序字段
+			sort := "id"
+			if sortBy == "timestamp" {
+				sort = "timestamp"
+			}
+			// 排序方式
+			order := "ASC"
+			if strings.HasPrefix(sortOrder, "asc") {
+				order = "ASC"
+			} else if strings.HasPrefix(sortOrder, "desc") {
+				order = "DESC"
+			}
+			tx = tx.Order(fmt.Sprintf("%s %s", sort, order))
+		}
+	} else {
+		tx = tx.Order("id desc")
+	}
+	err := tx.Omit("raw_msg").Find(&rows).Error
 	if err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows, total
@@ -100,3 +124,16 @@ func (r TraceData) DeleteByIds(ids []int64) int64 {
 	}
 	return tx.RowsAffected
 }
+
+// DeleteByTraceId 删除跟踪任务数据 返回受影响行数
+func (r TraceData) DeleteByTraceId(traceId string) int64 {
+	if traceId == "" || traceId == "<nil>" {
+		return 0
+	}
+	tx := db.DB("").Where("trace_id = ?", traceId)
+	if err := tx.Delete(&model.TraceData{}).Error; err != nil {
+		logger.Errorf("delete err => %v", err.Error())
+		return 0
+	}
+	return tx.RowsAffected
+}

src/modules/trace/repository/trace_task.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"be.ems/src/framework/database/db"
@@ -19,8 +20,8 @@ type TraceTask struct{}
 func (r TraceTask) SelectByPage(query map[string]string) ([]model.TraceTask, int64) {
 	tx := db.DB("").Model(&model.TraceTask{})
 	// 查询条件拼接
-	if v, ok := query["neType"]; ok && v != "" {
-		tx = tx.Where("ne_type = ?", v)
+	if v, ok := query["traceType"]; ok && v != "" {
+		tx = tx.Where("trace_type = ?", v)
 	}
 	if v, ok := query["imsi"]; ok && v != "" {
 		tx = tx.Where("imsi like ?", fmt.Sprintf("%s%%", v))
@@ -29,10 +30,20 @@ func (r TraceTask) SelectByPage(query map[string]string) ([]model.TraceTask, int
 		tx = tx.Where("msisdn like ?", fmt.Sprintf("%s%%", v))
 	}
 	if v, ok := query["startTime"]; ok && v != "" {
-		tx = tx.Where("start_time >= ?", v)
+		if len(v) == 10 {
+			v = fmt.Sprintf("%s000", v)
+			tx = tx.Where("start_time >= ?", v)
+		} else if len(v) == 13 {
+			tx = tx.Where("start_time >= ?", v)
+		}
 	}
 	if v, ok := query["endTime"]; ok && v != "" {
-		tx = tx.Where("end_time >= ?", v)
+		if len(v) == 10 {
+			v = fmt.Sprintf("%s999", v)
+			tx = tx.Where("end_time <= ?", v)
+		} else if len(v) == 13 {
+			tx = tx.Where("end_time <= ?", v)
+		}
 	}
 
 	// 查询结果
@@ -47,18 +58,33 @@ func (r TraceTask) SelectByPage(query map[string]string) ([]model.TraceTask, int
 	// 查询数据分页
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Limit(pageSize).Offset(pageSize * pageNum)
-
 	// 排序
-	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v
-		if v, ok := query["sortOrder"]; ok && v != "" {
-			if v == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
+	sortByStr, sortOk := query["sortBy"]
+	sortOrderStr, orderOk := query["sortOrder"]
+	if sortOk && sortByStr != "" && orderOk && sortOrderStr != "" {
+		sortByArr := strings.Split(sortByStr, ",")
+		sortOrderArr := strings.Split(sortOrderStr, ",")
+		for i := range sortByArr {
+			sortBy := sortByArr[i]
+			sortOrder := sortOrderArr[i]
+			// 排序字段
+			sort := "id"
+			if sortBy == "operaBy" {
+				sort = "opera_by"
+			} else if sortBy == "endTime" {
+				sort = "end_time"
 			}
+			// 排序方式
+			order := "ASC"
+			if strings.HasPrefix(sortOrder, "asc") {
+				order = "ASC"
+			} else if strings.HasPrefix(sortOrder, "desc") {
+				order = "DESC"
+			}
+			tx = tx.Order(fmt.Sprintf("%s %s", sort, order))
 		}
-		tx.Order(sortSql)
+	} else {
+		tx = tx.Order("id desc")
 	}
 
 	err := tx.Find(&rows).Error
@@ -90,8 +116,6 @@ func (r TraceTask) SelectByIds(ids []int64) []model.TraceTask {
 func (r TraceTask) Insert(param model.TraceTask) int64 {
 	if param.CreateBy != "" {
 		ms := time.Now().UnixMilli()
-		param.UpdateBy = param.CreateBy
-		param.UpdateTime = ms
 		param.CreateTime = ms
 	}
 	// 执行插入
@@ -102,26 +126,6 @@ func (r TraceTask) Insert(param model.TraceTask) int64 {
 	return param.ID
 }
 
-// Update 修改信息 返回受影响行数
-func (r TraceTask) Update(param model.TraceTask) int64 {
-	if param.ID <= 0 {
-		return 0
-	}
-	if param.UpdateBy != "" {
-		param.UpdateTime = time.Now().UnixMilli()
-	}
-	tx := db.DB("").Model(&model.TraceTask{})
-	// 构建查询条件
-	tx = tx.Where("id = ?", param.ID)
-	tx = tx.Omit("id", "create_by", "create_time")
-	// 执行更新
-	if err := tx.Updates(param).Error; err != nil {
-		logger.Errorf("update err => %v", err.Error())
-		return 0
-	}
-	return tx.RowsAffected
-}
-
 // DeleteByIds 批量删除信息 返回受影响行数
 func (r TraceTask) DeleteByIds(ids []int64) int64 {
 	if len(ids) <= 0 {