From 08dee2a3c2eb5b238b96f0611b420297b5e90988 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 20 Sep 2024 17:27:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE=E5=B1=9E=E6=80=A7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/trace/controller/trace_data.go |  6 +++---
 src/modules/trace/model/trace_data.go      |  4 ++--
 src/modules/trace/repository/trace_data.go | 20 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/trace/controller/trace_data.go b/src/modules/trace/controller/trace_data.go
index 42e06241..2d8222b9 100644
--- a/src/modules/trace/controller/trace_data.go
+++ b/src/modules/trace/controller/trace_data.go
@@ -16,7 +16,7 @@ var NewTraceData = &TraceDataController{
 	traceDataService: traceService.NewTraceData,
 }
 
-// 跟踪任务
+// 跟踪任务数据
 //
 // PATH /data
 type TraceDataController struct {
@@ -24,7 +24,7 @@ type TraceDataController struct {
 	traceDataService *traceService.TraceData
 }
 
-// 跟踪任务列表
+// 跟踪任务数据列表
 //
 // GET /list
 func (s *TraceDataController) List(c *gin.Context) {
@@ -35,7 +35,7 @@ func (s *TraceDataController) List(c *gin.Context) {
 	c.JSON(200, result.Ok(data))
 }
 
-// 跟踪任务删除
+// 跟踪任务数据删除
 //
 // DELETE /:ids
 func (s *TraceDataController) Remove(c *gin.Context) {
diff --git a/src/modules/trace/model/trace_data.go b/src/modules/trace/model/trace_data.go
index 244dc908..368d16e7 100644
--- a/src/modules/trace/model/trace_data.go
+++ b/src/modules/trace/model/trace_data.go
@@ -4,8 +4,8 @@ package model
 type TraceData struct {
 	ID        string `json:"id" gorm:"column:id;primaryKey;autoIncrement"`
 	TaskId    int64  `json:"taskId" gorm:"task_id"` // 任务ID
-	Imsi      string `json:"imsi" gorm:"imsi"`
-	Msisdn    string `json:"msisdn" gorm:"msisdn"`    // 可能存在
+	IMSI      string `json:"imsi" gorm:"imsi"`
+	MSISDN    string `json:"msisdn" gorm:"msisdn"`    // 可能存在
 	SrcAddr   string `json:"srcAddr" gorm:"src_addr"` // 源地址带端口
 	DstAddr   string `json:"dstAddr" gorm:"dst_addr"` // 目标地址带端口
 	IfType    int64  `json:"ifType" gorm:"if_type"`   // 接口类型，未分类
diff --git a/src/modules/trace/repository/trace_data.go b/src/modules/trace/repository/trace_data.go
index 78ee254f..c1e791b4 100644
--- a/src/modules/trace/repository/trace_data.go
+++ b/src/modules/trace/repository/trace_data.go
@@ -17,8 +17,8 @@ var NewTraceData = &TraceData{
 	resultMap: map[string]string{
 		"id":         "ID",
 		"task_id":    "TaskId",
-		"imsi":       "Imsi",
-		"msisdn":     "Msisdn",
+		"imsi":       "IMSI",
+		"msisdn":     "MSISDN",
 		"src_addr":   "SrcAddr",
 		"dst_addr":   "DstAddr",
 		"if_type":    "IfType",
@@ -124,13 +124,13 @@ func (r *TraceData) SelectList(data model.TraceData) []model.TraceData {
 	// 查询条件拼接
 	var conditions []string
 	var params []any
-	if data.Imsi != "" {
+	if data.IMSI != "" {
 		conditions = append(conditions, "imsi = ?")
-		params = append(params, data.Imsi)
+		params = append(params, data.IMSI)
 	}
-	if data.Msisdn != "" {
+	if data.MSISDN != "" {
 		conditions = append(conditions, "msisdn = ?")
-		params = append(params, data.Msisdn)
+		params = append(params, data.MSISDN)
 	}
 
 	// 构建查询条件语句
@@ -171,11 +171,11 @@ func (r *TraceData) Insert(data model.TraceData) string {
 	if data.TaskId > 0 {
 		params["task_id"] = data.TaskId
 	}
-	if data.Imsi != "" {
-		params["imsi"] = data.Imsi
+	if data.IMSI != "" {
+		params["imsi"] = data.IMSI
 	}
-	if data.Msisdn != "" {
-		params["msisdn"] = data.Msisdn
+	if data.MSISDN != "" {
+		params["msisdn"] = data.MSISDN
 	}
 	if data.SrcAddr != "" {
 		params["src_addr"] = data.SrcAddr