feat: 合并代码

src/modules/network_element/controller/ne_info.go

@@ -1,6 +1,8 @@
 package controller
 
 import (
+	"fmt"
+
 	"ems.agt/src/framework/i18n"
 	"ems.agt/src/framework/utils/ctx"
 	"ems.agt/src/framework/utils/parse"
@@ -23,6 +25,9 @@ type NeInfoController struct {
 	neInfoService neService.INeInfo
 }
 
+// neStateCacheMap 网元状态缓存最后一次成功的信息
+var neStateCacheMap map[string]map[string]any = make(map[string]map[string]any)
+
 // 网元状态
 //
 // GET /state
@@ -42,14 +47,31 @@ func (s *NeInfoController) NeState(c *gin.Context) {
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
+	neKey := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
 
 	// 网元直连
 	resData, err := neService.NeState(neInfo)
 	if err != nil {
-		c.JSON(200, result.ErrMsg("connection failure"))
+		// 异常取上次缓存
+		if v, ok := neStateCacheMap[neKey]; ok && v != nil {
+			v["online"] = false
+			neStateCacheMap[neKey] = v
+		} else {
+			neStateCacheMap[neKey] = map[string]any{
+				"online": false,
+				"neId":   neInfo.NeId,
+				"neName": neInfo.NeName,
+				"neType": neInfo.NeType,
+				"neIP":   neInfo.IP,
+			}
+		}
+		c.JSON(200, result.OkData(neStateCacheMap[neKey]))
 		return
 	}
 
+	// 存入缓存
+	resData["online"] = true
+	neStateCacheMap[neKey] = resData
 	c.JSON(200, result.OkData(resData))
 }
 

src/modules/network_element/controller/udm_auth.go

@@ -187,7 +187,7 @@ func (s *UDMAuthController) Adds(c *gin.Context) {
 		return
 	}
 
-	msg := fmt.Sprintf("bad authdat:start_imsi=%s,sub_num=%s,ki=%s,amf=%s,algo=%s,opc=%s", body.Imsi, num, body.Ki, body.Amf, body.AlgoIndex, body.Opc)
+	msg := fmt.Sprintf("baa authdat:start_imsi=%s,sub_num=%s,ki=%s,amf=%s,algo=%s,opc=%s", body.Imsi, num, body.Ki, body.Amf, body.AlgoIndex, body.Opc)
 
 	// 发送MML
 	data, err := mmlclient.MMLSendMsgToString(neInfo.IP, msg)

src/modules/network_element/controller/udm_sub.go

@@ -216,7 +216,7 @@ func (s *UDMSubController) Adds(c *gin.Context) {
 		return
 	}
 
-	msg := fmt.Sprintf("bad udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s",
+	msg := fmt.Sprintf("baa udmuser:start_imsi=%s,start_msisdn=%s,sub_num=%s,ambr=%s,nssai=%s,arfb=%s,sar=%s,rat=%s,cn=%s,smf_sel=%s,sm_data=%s,eps_flag=%s,eps_odb=%s,hplmn_odb=%s,ard=%s,epstpl=%s,context_id=%s,apn_context=%s",
 		body.Imsi, body.Msisdn, num, body.Ambr, body.Nssai, body.Arfb, body.Sar, body.Rat, body.Cn, body.SmfSel, body.SmData, body.EpsFlag, body.EpsOdb, body.HplmnOdb, body.Ard, body.Epstpl, body.ContextId, body.ApnContext)
 	//  static_ip指给4G UE分配的静态IP，没有可不带此字段名，批量添加IP会自动递增
 	if body.StaticIp != "" {

src/modules/network_element/repository/ne_info.impl.go

@@ -135,7 +135,7 @@ func (r *NeInfoImpl) SelectNeList(ne model.NeInfo) []model.NeInfo {
 	}
 
 	// 查询数据
-	querySql := r.selectSql + whereSql + " order by ne_type asc "
+	querySql := r.selectSql + whereSql + " order by ne_type asc, ne_id desc "
 	results, err := datasource.RawDB("", querySql, params)
 	if err != nil {
 		logger.Errorf("query err => %v", err)

src/modules/network_element/repository/perf_kpi.impl.go

@@ -52,8 +52,14 @@ func (r *PerfKPIImpl) SelectGoldKPI(query model.GoldKPIQuery, kpiIds []string) [
 		"min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName",
 	}
 	for _, kid := range kpiIds {
-		str := fmt.Sprintf("sum(CASE WHEN gk.kpi_id = '%s' THEN gk.value ELSE 0 END) AS '%s'", kid, kid)
-		fields = append(fields, str)
+		// 特殊字段，只取最后一次收到的非0值
+		if kid == "AMF.01" || kid == "UDM.01" || kid == "UDM.02" || kid == "UDM.03" {
+			str := fmt.Sprintf("IFNULL(SUBSTRING_INDEX(GROUP_CONCAT( CASE WHEN gk.kpi_id = '%s' and gk.VALUE != 0 THEN gk.VALUE END  ), ',', 1), 0) AS '%s'", kid, kid)
+			fields = append(fields, str)
+		} else {
+			str := fmt.Sprintf("sum(CASE WHEN gk.kpi_id = '%s' THEN gk.value ELSE 0 END) AS '%s'", kid, kid)
+			fields = append(fields, str)
+		}
 	}
 	fieldsSql := strings.Join(fields, ",")
 

src/modules/network_element/service/ne_direct_link.go

@@ -15,7 +15,7 @@ import (
 func NeState(neInfo model.NeInfo) (map[string]any, error) {
 	// 网元直连
 	neUrl := fmt.Sprintf("http://%s:%d/api/rest/systemManagement/v1/elementType/%s/objectType/systemState", neInfo.IP, neInfo.Port, strings.ToLower(neInfo.NeType))
-	resBytes, err := fetch.Get(neUrl, nil, 1)
+	resBytes, err := fetch.Get(neUrl, nil, 200)
 	if err != nil {
 		logger.Warnf("NeState %s", err.Error())
 		return nil, err
@@ -33,6 +33,7 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
 		"neType":      neInfo.NeType,
 		"neId":        neInfo.NeId,
 		"neName":      neInfo.NeName,
+		"neIP":        neInfo.IP,
 		"refreshTime": time.Now().UnixMilli(), // 获取时间
 		"version":     resData["version"],
 		"capability":  resData["capability"],