feat: 更新多个模块以支持新的数据结构和日志格式

src/modules/network_data/controller/all_alarm.go

@@ -1,12 +1,12 @@
 package controller
 
 import (
-	"strings"
+	"fmt"
 
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/reqctx"
+	"be.ems/src/framework/resp"
 	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/network_data/model"
 	neDataService "be.ems/src/modules/network_data/service"
 	neService "be.ems/src/modules/network_element/service"
@@ -31,49 +31,63 @@ type AlarmController struct {
 // 告警列表
 //
 // GET /list
+//
+//	@Tags			network_data/alarm
+//	@Accept			json
+//	@Produce		json
+//	@Param			neType			query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
+//	@Param			neId			query		string	false	"NE ID The actual record is the network element RmUid"
+//	@Param			neName			query		string	false	"NE Name"
+//	@Param			pvFlag			query		string	false	"PV Flag"	Enums(PNF,VNF)
+//	@Param			alarmCode		query		string	false	"alarm status code"
+//	@Param			alarmType		query		string	false	"Alarm type Communication alarms=1, Equipment alarms=2, Processing faults=3, Environmental alarms=4, Quality of service alarms=5"	Enums(1,2,3,4,5)
+//	@Param			alarmStatus		query		string	false	"Alarm status 0:clear, 1:active"																									Enums(0,1)
+//	@Param			origSeverity	query		string	false	"Alarm Type 1: Critical, 2: Major, 3: Minor, 4: Warning"																			Enums(1,2,3,4)
+//	@Param			sortField		query		string	false	"Sort fields, fill in result fields"																								default(event_time)
+//	@Param			sortOrder		query		string	false	"Sort by ascending or descending order, asc desc"																					default(asc)
+//	@Param			pageNum			query		number	true	"pageNum"																															default(1)
+//	@Param			pageSize		query		number	true	"pageSize"																															default(10)
+//	@Success		200				{object}	object	"Response Results"
+//	@Security		TokenAuth
+//	@Summary		Alarm List
+//	@Description	Alarm List
+//	@Router			/neData/alarm/list [get]
 func (s *AlarmController) List(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	var querys model.AlarmQuery
-	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	var query model.AlarmQuery
+	if err := c.ShouldBindQuery(&query); err != nil {
+		errMsgs := fmt.Sprintf("bind err: %s", resp.FormatBindError(err))
+		c.JSON(422, resp.CodeMsg(40422, errMsgs))
 		return
 	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	querys.RmUID = neInfo.RmUID
-
 	// 查询数据
-	rows, total := s.alarmService.SelectPage(querys)
-	c.JSON(200, result.Ok(map[string]any{"rows": rows, "total": total}))
+	rows, total := s.alarmService.FindByPage(query)
+	c.JSON(200, resp.OkData(map[string]any{"rows": rows, "total": total}))
 }
 
 // 告警删除
 //
-// DELETE /:alarmIds
+// DELETE /:id
 func (s *AlarmController) Remove(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	alarmIds := c.Param("alarmIds")
-	if alarmIds == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+	language := reqctx.AcceptLanguage(c)
+	id := c.Param("id")
+	if id == "" {
+		c.JSON(400, resp.CodeMsg(40010, "bind err: id is empty"))
 		return
 	}
+
 	// 处理字符转id数组后去重
-	ids := strings.Split(alarmIds, ",")
-	uniqueIDs := parse.RemoveDuplicates(ids)
-	if len(uniqueIDs) <= 0 {
-		c.JSON(200, result.Err(nil))
-		return
+	uniqueIDs := parse.RemoveDuplicatesToArray(id, ",")
+	// 转换成int64数组类型
+	ids := make([]int64, 0)
+	for _, v := range uniqueIDs {
+		ids = append(ids, parse.Number(v))
 	}
-	rows, err := s.alarmService.DeleteByIds(uniqueIDs)
+
+	rows, err := s.alarmService.DeleteByIds(ids)
 	if err != nil {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
 		return
 	}
 	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
-	c.JSON(200, result.OkMsg(msg))
+	c.JSON(200, resp.OkMsg(msg))
 }