Merge branch 'main-v2' into lite-ba

src/modules/ne/controller/ne_info.go

@@ -399,9 +399,6 @@ func (s NeInfoController) Add(c *gin.Context) {
 			neVersion.Path = "-"
 			neVersion.Version = fmt.Sprint(v)
 		}
-		if v, ok := body.ServerState["capability"]; ok && v != nil {
-			neLicense.Capability = parse.Number(v)
-		}
 		if v, ok := body.ServerState["sn"]; ok && v != nil {
 			neLicense.SerialNum = fmt.Sprint(v)
 		}
@@ -409,6 +406,12 @@ func (s NeInfoController) Add(c *gin.Context) {
 			neLicense.ExpiryDate = fmt.Sprint(v)
 			neLicense.Status = "1"
 		}
+		if v, ok := body.ServerState["ueNumber"]; ok && v != nil {
+			neLicense.UeNumber = parse.Number(v)
+		}
+		if v, ok := body.ServerState["nbNumber"]; ok && v != nil {
+			neLicense.NbNumber = parse.Number(v)
+		}
 	}
 
 	s.neVersionService.Insert(neVersion)
@@ -501,9 +504,6 @@ func (s NeInfoController) Edit(c *gin.Context) {
 			neVersion.Version = fmt.Sprint(v)
 			neVersion.UpdateBy = loginUserName
 		}
-		if v, ok := body.ServerState["capability"]; ok && v != nil {
-			neLicense.Capability = parse.Number(v)
-		}
 		if v, ok := body.ServerState["sn"]; ok && v != nil {
 			neLicense.SerialNum = fmt.Sprint(v)
 		}
@@ -512,6 +512,12 @@ func (s NeInfoController) Edit(c *gin.Context) {
 			neLicense.Status = "1"
 			neLicense.UpdateBy = loginUserName
 		}
+		if v, ok := body.ServerState["ueNumber"]; ok && v != nil {
+			neLicense.UeNumber = parse.Number(v)
+		}
+		if v, ok := body.ServerState["nbNumber"]; ok && v != nil {
+			neLicense.NbNumber = parse.Number(v)
+		}
 	}
 
 	if neVersion.ID <= 0 {

src/modules/ne/controller/ne_license.go

@@ -157,9 +157,10 @@ func (s *NeLicenseController) Code(c *gin.Context) {
 	if licensePath != "" {
 		neLicense.LicensePath = licensePath
 	} else {
-		neLicense.Capability = 0
 		neLicense.SerialNum = ""
 		neLicense.ExpiryDate = ""
+		neLicense.UeNumber = 0
+		neLicense.NbNumber = 0
 		neLicense.Status = "0"
 	}
 	neLicense.UpdateBy = reqctx.LoginUserToUserName(c)
@@ -261,9 +262,10 @@ func (s *NeLicenseController) State(c *gin.Context) {
 	}
 	if neState, err := neFetchlink.NeState(neInfo); err == nil && neState["sn"] != nil {
 		neLicense.Status = "1"
-		neLicense.Capability = parse.Number(neState["capability"])
 		neLicense.SerialNum = fmt.Sprint(neState["sn"])
 		neLicense.ExpiryDate = fmt.Sprint(neState["expire"])
+		neLicense.UeNumber = parse.Number(neState["ueNumber"])
+		neLicense.NbNumber = parse.Number(neState["nbNumber"])
 	} else {
 		neLicense.Status = "0"
 	}
@@ -280,9 +282,10 @@ func (s *NeLicenseController) State(c *gin.Context) {
 
 	if neLicense.Status == "1" {
 		c.JSON(200, resp.OkData(map[string]any{
-			"capability": neLicense.Capability,
-			"sn":         neLicense.SerialNum,
-			"expire":     neLicense.ExpiryDate,
+			"sn":       neLicense.SerialNum,
+			"expire":   neLicense.ExpiryDate,
+			"ueNumber": neLicense.UeNumber,
+			"nbNumber": neLicense.NbNumber,
 		}))
 		return
 	}

src/modules/ne/controller/ne_software.go

@@ -101,7 +101,7 @@ func (s NeSoftwareController) Add(c *gin.Context) {
 	})
 	if len(neSoftwares) > 0 {
 		neSoftware := neSoftwares[0]
-		s.neSoftwareService.DeleteByIds([]int64{neSoftware.ID})
+		s.neSoftwareService.DeleteByIds([]int64{neSoftware.ID}, false)
 	}
 
 	// 检查属性值唯一
@@ -183,7 +183,7 @@ func (s NeSoftwareController) Remove(c *gin.Context) {
 		ids = append(ids, parse.Number(v))
 	}
 
-	rows, err := s.neSoftwareService.DeleteByIds(ids)
+	rows, err := s.neSoftwareService.DeleteByIds(ids, true)
 	if err != nil {
 		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
 		return

src/modules/ne/fetch_link/ne_state.go

@@ -8,6 +8,7 @@ import (
 
 	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/fetch"
+	"be.ems/src/framework/utils/parse"
 	"be.ems/src/modules/ne/model"
 )
 
@@ -39,7 +40,7 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
 		}
 	}
 
-	return map[string]any{
+	info := map[string]any{
 		"neType":      neInfo.NeType,
 		"neId":        neInfo.NeId,
 		"neName":      neInfo.NeName,
@@ -55,5 +56,18 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
 		"cpu":         resData["cpuUsage"],
 		"mem":         resData["memUsage"],
 		"disk":        resData["diskSpace"],
-	}, nil
+	}
+
+	if ueNumber, ok := resData["capability"]; ok {
+		info["ueNumber"] = parse.Number(ueNumber)
+	} else {
+		info["ueNumber"] = 0
+	}
+	if nbNumber, ok := resData["nbNumber"]; ok {
+		info["nbNumber"] = parse.Number(nbNumber)
+	} else {
+		info["nbNumber"] = 0
+	}
+
+	return info, nil
 }

src/modules/ne/model/ne_license.go

@@ -7,9 +7,10 @@ type NeLicense struct {
 	NeId                  string `json:"neId" gorm:"column:ne_id" binding:"required"`                 // 网元ID
 	ActivationRequestCode string `json:"activationRequestCode" gorm:"column:activation_request_code"` // 激活申请代码
 	LicensePath           string `json:"licensePath" gorm:"column:license_path"`                      // 激活授权文件
-	Capability            int64  `json:"capability" gorm:"column:capability"`                         // 容量
 	SerialNum             string `json:"serialNum" gorm:"column:serial_num"`                          // 序列号
 	ExpiryDate            string `json:"expiryDate" gorm:"column:expiry_date"`                        // 许可证到期日期
+	UeNumber              int64  `json:"ueNumber" gorm:"ue_number"`                                   // 用户容量
+	NbNumber              int64  `json:"nbNumber" gorm:"nb_number"`                                   // 基站容量
 	Status                string `json:"status" gorm:"column:status"`                                 // 状态 0无效 1有效
 	Remark                string `json:"remark" gorm:"column:remark"`                                 // 备注
 	CreateBy              string `json:"createBy" gorm:"column:create_by"`                            // 创建者

src/modules/ne/repository/ne_info.go

@@ -41,6 +41,7 @@ func (r NeInfo) neListSort(arr []model.NeInfo) []model.NeInfo {
 		"CHF",
 		"HLR",
 		"SGWC",
+		"PGWC",
 		"IP-SM-GW",
 		"MMTel-AS",
 		"I-CSCF",

src/modules/ne/service/ne_software.go

@@ -87,7 +87,7 @@ func (r NeSoftware) Update(neSoftware model.NeSoftware) int64 {
 }
 
 // DeleteByIds 批量删除信息
-func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) {
+func (r NeSoftware) DeleteByIds(ids []int64, delFile bool) (int64, error) {
 	// 检查是否存在
 	rows := r.neSoftwareRepository.SelectByIds(ids)
 	if len(rows) <= 0 {
@@ -95,15 +95,18 @@ func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) {
 	}
 
 	if len(rows) == len(ids) {
-		// 遍历软件包列表进行文件删除
-		for _, row := range rows {
-			// 检查文件是否存在
-			filePath := file.ParseUploadFileAbsPath(row.Path)
-			if _, err := os.Stat(filePath); err != nil {
-				continue
+		if delFile {
+			// 遍历软件包列表进行文件删除
+			for _, row := range rows {
+				// 检查文件是否存在
+				filePath := file.ParseUploadFileAbsPath(row.Path)
+				if _, err := os.Stat(filePath); err != nil {
+					continue
+				}
+				os.Remove(filePath)
 			}
-			os.Remove(filePath)
 		}
+
 		rows := r.neSoftwareRepository.DeleteByIds(ids)
 		return rows, nil
 	}

src/modules/ne_data/repository/cdr_event.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -91,26 +92,64 @@ func (r CDREvent) SelectByPage(neType string, query map[string]string) ([]model.
 
 	// 分页
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
-	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
-
-	// 排序
-	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v
-		if o, ok := query["sortOrder"]; ok && o != "" {
-			if o == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		tx = tx.Order(sortSql)
+	if pageNum == 0 && pageSize > int(total) {
+		pageSize = int(total)
 	}
+	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query err => %v", err)
 	}
 
+	// 排序
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortField := v
+		sortOrder := "asc"
+		if o, ok := query["sortOrder"]; ok && o != "" {
+			if o == "desc" {
+				sortOrder = "desc"
+			} else {
+				sortOrder = "asc"
+			}
+		}
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.CDREvent) any{
+				"id":        func(row *model.CDREvent) any { return row.ID },
+				"timestamp": func(row *model.CDREvent) any { return row.Timestamp },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
+
 	return rows, total
 }
 

src/modules/ne_data/repository/kpi_c_report.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -37,19 +38,52 @@ func (r KpiCReport) SelectKPI(query model.KPICQuery) []model.KpiCReport {
 	if query.EndTime != 0 {
 		tx = tx.Where("created_at <= ?", query.EndTime)
 	}
-	// 排序
-	if query.SortField == "" || query.SortField == "timeGroup" {
-		query.SortField = "created_at"
-	}
-	if query.SortOrder == "" {
-		query.SortOrder = "desc"
-	}
-	tx = tx.Order(fmt.Sprintf("%s %s", query.SortField, query.SortOrder))
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows
 	}
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		sortOrder := query.SortOrder
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.KpiCReport) any{
+				"id":        func(row *model.KpiCReport) any { return row.ID },
+				"timeGroup": func(row *model.KpiCReport) any { return row.CreatedAt },
+				"createdAt": func(row *model.KpiCReport) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows
 }
 

src/modules/ne_data/repository/kpi_report.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -37,19 +38,52 @@ func (r KpiReport) SelectKPI(query model.KPIQuery) []model.KpiReport {
 	if query.EndTime != 0 {
 		tx = tx.Where("created_at <= ?", query.EndTime)
 	}
-	// 排序
-	if query.SortField == "" || query.SortField == "timeGroup" {
-		query.SortField = "created_at"
-	}
-	if query.SortOrder == "" {
-		query.SortOrder = "desc"
-	}
-	tx = tx.Order(fmt.Sprintf("%s %s", query.SortField, query.SortOrder))
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query find err => %v", err.Error())
 		return rows
 	}
+	// 排序
+	if query.SortField != "" {
+		sortField := query.SortField
+		sortOrder := query.SortOrder
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.KpiReport) any{
+				"id":        func(row *model.KpiReport) any { return row.ID },
+				"timeGroup": func(row *model.KpiReport) any { return row.CreatedAt },
+				"createdAt": func(row *model.KpiReport) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows
 }
 

src/modules/ne_data/repository/ue_event.go

@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"time"
 
@@ -58,24 +59,59 @@ func (r UEEvent) SelectByPage(neType string, query map[string]string) ([]model.U
 	pageNum, pageSize := db.PageNumSize(query["pageNum"], query["pageSize"])
 	tx = tx.Offset(int(pageNum * pageSize)).Limit(int(pageSize))
 
-	// 排序
-	if v, ok := query["sortField"]; ok && v != "" {
-		sortSql := v
-		if o, ok := query["sortOrder"]; ok && o != "" {
-			if o == "desc" {
-				sortSql += " desc "
-			} else {
-				sortSql += " asc "
-			}
-		}
-		tx = tx.Order(sortSql)
-	}
-
 	// 查询数据
 	if err := tx.Find(&rows).Error; err != nil {
 		logger.Errorf("query err => %v", err)
 	}
 
+	// 排序
+	if v, ok := query["sortField"]; ok && v != "" {
+		sortField := v
+		sortOrder := "asc"
+		if o, ok := query["sortOrder"]; ok && o != "" {
+			if o == "desc" {
+				sortOrder = "desc"
+			} else {
+				sortOrder = "asc"
+			}
+		}
+		sort.SliceStable(rows, func(i, j int) bool {
+			// 支持的排序字段映射
+			fieldGetters := map[string]func(*model.UEEvent) any{
+				"id":        func(row *model.UEEvent) any { return row.ID },
+				"timestamp": func(row *model.UEEvent) any { return row.CreatedAt },
+				"createdAt": func(row *model.UEEvent) any { return row.CreatedAt },
+				// 可添加更多支持的字段
+			}
+
+			// 获取字段 getter 函数
+			getter, ok := fieldGetters[sortField]
+			if !ok {
+				// 非法字段，使用默认排序（id升序）
+				return rows[i].ID < rows[j].ID
+			}
+
+			// 获取比较值
+			valI, valJ := getter(&rows[i]), getter(&rows[j])
+
+			// 根据字段类型进行比较
+			switch v := valI.(type) {
+			case int64:
+				if sortOrder == "desc" {
+					return v > valJ.(int64)
+				}
+				return v < valJ.(int64)
+			case string:
+				if sortOrder == "desc" {
+					return v > valJ.(string)
+				}
+				return v < valJ.(string)
+			default:
+				// 不支持的字段类型，使用默认排序
+				return rows[i].ID < rows[j].ID
+			}
+		})
+	}
 	return rows, total
 }