marge: 合并代码

features/cdr/cdrevent.go

@@ -10,6 +10,7 @@ import (
 	"ems.agt/lib/log"
 	"ems.agt/lib/services"
 	"ems.agt/restagent/config"
+	wsService "ems.agt/src/modules/ws/service"
 )
 
 var (
@@ -41,7 +42,7 @@ func PostCDREventFromNF(w http.ResponseWriter, r *http.Request) {
 
 	cdrEvent := new(CDREvent)
 	err = json.Unmarshal(body, &cdrEvent)
-	if err != nil {
+	if cdrEvent.NeType == "" || err != nil {
 		log.Error("Failed to Unmarshal cdrEvent:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
@@ -55,5 +56,12 @@ func PostCDREventFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// 推送到ws订阅组
+	if v, ok := cdrEvent.CDR["recordType"]; ok {
+		if v == "MOC" || v == "MTSM" {
+			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_IMS_CDR, cdrEvent)
+		}
+	}
+
 	services.ResponseStatusOK204NoContent(w)
 }

features/cm/ne.go

@@ -16,6 +16,7 @@ import (
 	"ems.agt/lib/services"
 	"ems.agt/restagent/config"
 	tokenConst "ems.agt/src/framework/constants/token"
+	neService "ems.agt/src/modules/network_element/service"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
@@ -136,7 +137,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 		services.ResponseNotFound404UriNotExist(w, r)
 		return
 	}
-	log.Debug("Body:", string(body))
+	log.Trace("Body:", string(body))
 
 	neInfo := new(dborm.NeInfo)
 	err = json.Unmarshal(body, neInfo)
@@ -158,6 +159,9 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// 刷新缓存，不存在结构体网元Id空字符串
+		neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+
 		mapRow := make(map[string]interface{})
 		row := map[string]interface{}{"affectedRows": affected}
 		mapRow["data"] = row
@@ -205,6 +209,10 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 			} else if affected <= 0 {
 				log.Infof("Not record affected to insert ne_info")
 			}
+
+			// 刷新缓存，不存在结构体网元Id空字符串
+			neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+
 			services.ResponseStatusOK204NoContent(w)
 			return
 		default:
@@ -261,6 +269,9 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// 刷新缓存，不存在结构体网元Id空字符串
+		neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+
 		mapRow := make(map[string]interface{})
 		row := map[string]interface{}{"affectedRows": affected}
 		mapRow["data"] = row
@@ -309,6 +320,10 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 			} else if affected <= 0 {
 				log.Infof("Not record affected to insert ne_info")
 			}
+
+			// 刷新缓存，不存在结构体网元Id空字符串
+			neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+
 			services.ResponseStatusOK204NoContent(w)
 			return
 		default:
@@ -390,6 +405,9 @@ func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// 刷新缓存，不存在结构体网元Id空字符串
+		neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+
 		mapRow := make(map[string]interface{})
 		row := map[string]interface{}{"affectedRows": affected}
 		mapRow["data"] = row

features/event/event.go

@@ -0,0 +1,69 @@
+package event
+
+import (
+	"encoding/json"
+	"io"
+	"time"
+
+	"ems.agt/lib/dborm"
+	"ems.agt/lib/global"
+	"ems.agt/lib/log"
+	"ems.agt/lib/services"
+	wsService "ems.agt/src/modules/ws/service"
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	UriUEEvent = "/upload-ue/v1/:eventType"
+)
+
+type UEEvent struct {
+	NeType    string         `json:"neType" xorm:"ne_type"`
+	NeName    string         `json:"neName" xorm:"ne_name"`
+	RmUID     string         `json:"rmUID" xorm:"rm_uid"`
+	Timestamp int            `json:"timestamp" xorm:"timestamp"`
+	EventType string         `json:"eventType" xorm:"event_type"`
+	EventJson map[string]any `json:"eventJSON" xorm:"event_json"`
+}
+
+func PostUEEventFromAMF(c *gin.Context) {
+	log.Info("PostUEEventFromAMF processing... ")
+
+	body, err := io.ReadAll(io.LimitReader(c.Request.Body, global.RequestBodyMaxLen))
+	if err != nil {
+		log.Error("Failed to io.ReadAll: ", err)
+		services.ResponseNotFound404UriNotExist(c.Writer, c.Request)
+		return
+	}
+
+	//vars := mux.Vars(c.Request)
+	eventType, ok := c.Params.Get("eventType")
+	if !ok || eventType == "" {
+		log.Error("eventType is empty")
+		services.ResponseNotFound404UriNotExist(c.Writer, c.Request)
+		return
+	}
+	ueEvent := new(UEEvent)
+	err = json.Unmarshal(body, &ueEvent.EventJson)
+	if err != nil {
+		log.Error("Failed to Unmarshal ueEvent:", err)
+		services.ResponseInternalServerError500ProcessError(c.Writer, err)
+		return
+	}
+	ueEvent.NeType = "AMF"
+	ueEvent.Timestamp = int(time.Now().Unix())
+	ueEvent.EventType = eventType
+	log.Trace("ueEvent:", ueEvent)
+
+	affected, err := dborm.XormInsertTableOne("ue_event", ueEvent)
+	if err != nil && affected <= 0 {
+		log.Error("Failed to insert ue_event:", err)
+		services.ResponseInternalServerError500ProcessError(c.Writer, err)
+		return
+	}
+
+	// 推送到ws订阅组
+	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_AMF_UE, ueEvent)
+
+	services.ResponseStatusOK204NoContent(c.Writer)
+}

features/pm/performance.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math"
 	"net/http"
 	"strconv"
 	"time"
@@ -16,6 +17,7 @@ import (
 	"ems.agt/restagent/config"
 	"xorm.io/xorm"
 
+	wsService "ems.agt/src/modules/ws/service"
 	"github.com/go-resty/resty/v2"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/gorilla/mux"
@@ -47,17 +49,18 @@ type KpiReport struct {
 
 type GoldKpi struct {
 	//	Id        int    `json:"-" xorm:"pk 'id' autoincr"`
-	Date      string `json:"date" xorm:"date"`
-	Index     int    `json:"index"`
-	StartTime string `json:"startTime"`
-	EndTime   string `json:"endTime"`
-	NEName    string `json:"neName" xorm:"ne_name"`
-	RmUid     string `json:"rmUid" xorm:"rm_uid"`
-	NEType    string `json:"neType" xorm:"ne_type"`
-	KpiId     string `json:"kpiId" xorm:"kpi_id"`
-	Value     int    `json:"value"`
-	Error     string `json:"error"`
-	Timestamp string `json:"timestamp"`
+	Date        string `json:"date" xorm:"date"`
+	Index       int    `json:"index"`
+	Granularity int8   `json:"granularity"`
+	StartTime   string `json:"startTime"`
+	EndTime     string `json:"endTime"`
+	NEName      string `json:"neName" xorm:"ne_name"`
+	RmUid       string `json:"rmUid" xorm:"rm_uid"`
+	NEType      string `json:"neType" xorm:"ne_type"`
+	KpiId       string `json:"kpiId" xorm:"kpi_id"`
+	Value       int    `json:"value"`
+	Error       string `json:"error"`
+	Timestamp   string `json:"timestamp"`
 }
 
 var (
@@ -182,11 +185,26 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 	goldKpi.Index, _ = strconv.Atoi(vars["index"])
 	goldKpi.StartTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.StartTime, time.DateTime)
 	goldKpi.EndTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.EndTime, time.DateTime)
+	// get time granularity from startTime and endTime
+	seconds, _ := global.GetSecondDuration(goldKpi.StartTime, goldKpi.EndTime)
+	goldKpi.Granularity = 60
+	if seconds != 0 && seconds <= math.MaxInt8 && seconds >= math.MinInt8 {
+		goldKpi.Granularity = int8(seconds)
+	}
 	goldKpi.NEName = kpiReport.Task.NE.NEName
 	goldKpi.RmUid = kpiReport.Task.NE.RmUID
 	goldKpi.NEType = kpiReport.Task.NE.NeType
 	goldKpi.Timestamp = global.GetFmtTimeString(layout, kpiReport.Timestamp, time.DateTime)
+	// 黄金指标事件对象
+	kpiEvent := map[string]any{
+		// kip_id ...
+		"neType":     goldKpi.NEType,
+		"neName":     goldKpi.NEName,
+		"startIndex": goldKpi.Index,
+		"timeGroup":  goldKpi.StartTime,
+	}
 	for _, k := range kpiReport.Task.NE.KPIs {
+		kpiEvent[k.KPIID] = k.Value // kip_id
 		goldKpi.KpiId = k.KPIID
 		goldKpi.Value = k.Value
 		goldKpi.Error = k.Err
@@ -224,6 +242,9 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	// 推送到ws订阅组
+	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
+
 	services.ResponseStatusOK200Null(w)
 }
 

features/state/state_linux.go

@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"ems.agt/lib/log"
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/disk"
-	"github.com/shirou/gopsutil/mem"
-	"github.com/shirou/gopsutil/process"
+	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v3/process"
 )
 
 type SysInfo struct {

features/state/state_windows.go

@@ -11,10 +11,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/shirou/gopsutil/cpu"
-	"github.com/shirou/gopsutil/disk"
-	"github.com/shirou/gopsutil/mem"
-	"github.com/shirou/gopsutil/process"
+	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v3/process"
 )
 
 type SysInfo struct {

features/ue/ue.go

@@ -302,7 +302,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// Get UEInfo from NF/NFs
+// POST User Info from NF/NFs
 func PostPCFUserInfo(w http.ResponseWriter, r *http.Request) {
 	log.Info("PostPCFUserInfo processing... ")
 
@@ -374,7 +374,7 @@ func PostPCFUserInfo(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// Get UEInfo from NF/NFs
+// PUT PCF User Info from NF/NFs
 func PutPCFUserInfo(w http.ResponseWriter, r *http.Request) {
 	log.Info("PutPCFUserInfo processing... ")
 
@@ -575,7 +575,7 @@ func GetUENumFromNF(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// Get UEInfo from NF/NFs
+// Get Radio Info from NF/NFs
 func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	log.Info("GetNBInfoFromNF processing... ")
 
@@ -639,6 +639,83 @@ func GetNBInfoFromNF(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// Get Radio Info from NF/NFs
+func GetNBInfoAllFromNF(w http.ResponseWriter, r *http.Request) {
+	log.Info("GetNBInfoAllFromNF processing... ")
+
+	vars := mux.Vars(r)
+	neType := vars["elementTypeValue"]
+	if neType == "" {
+		services.ResponseNotFound404UriNotExist(w, r)
+		return
+	}
+	//neTypeLower := strings.ToLower(neType)
+	// var neID string
+	neIDs := services.GetParamsArrByName("neId", r)
+	// if len(neIDs) == 1 {
+	// 	neID = neIDs[0]
+	// } else {
+	// 	services.ResponseNotFound404UriNotExist(w, r)
+	// 	return
+	// }
+
+	// token, err := services.CheckFrontValidRequest(w, r)
+	// if err != nil {
+	// 	log.Error("Request error:", err)
+	// 	return
+	// }
+	// log.Debug("token:", token)
+
+	//var ret error
+	var statusCode int = 500
+	var dataResponse []services.MapResponse
+	var neInfos []dborm.NeInfo
+	dborm.XormGetNeInfo2(neType, neIDs, &neInfos)
+	for _, neInfo := range neInfos {
+		// neInfo, err := dborm.XormGetNeInfo(neType, neID)
+		// if err != nil {
+		// 	log.Error("Failed to XormGetNeInfo:", err)
+		// 	services.ResponseInternalServerError500ProcessError(w, err)
+		// 	return
+		// } else if neInfo == nil {
+		// 	err := global.ErrCMNotFoundTargetNE
+		// 	log.Error(global.ErrCMNotFoundTargetNE)
+		// 	services.ResponseInternalServerError500ProcessError(w, err)
+		// 	return
+		// }
+
+		hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
+		requestURI2NF := fmt.Sprintf("%s%s", hostUri, r.RequestURI)
+
+		log.Debug("requestURI2NF:", requestURI2NF)
+
+		resp, err := client.R().
+			EnableTrace().
+			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
+			//SetHeaders(map[string]string{"accessToken": token}).
+			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
+			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
+			Get(requestURI2NF)
+		if err != nil {
+			log.Error("Failed to GET:", err)
+			continue
+			// services.ResponseInternalServerError500ProcessError(w, err)
+			// return
+		} else {
+			switch resp.StatusCode() {
+			case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
+				var response services.MapResponse
+				_ = json.Unmarshal(resp.Body(), &response)
+				dataResponse = append(dataResponse, response)
+				statusCode = http.StatusOK
+			}
+		}
+	}
+	var response services.DataResponse
+	response.Data = dataResponse
+	services.ResponseWithJson(w, statusCode, response)
+}
+
 // Get GetUEInfoFileExportNF from NF/NFs
 func GetUEInfoFileExportNF(w http.ResponseWriter, r *http.Request) {
 	log.Info("GetUEInfoFromNF processing... ")