marge: 合并代码

src/modules/network_element/controller/ne_info.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"fmt"
+	"sync"
 
 	"ems.agt/src/framework/i18n"
 	"ems.agt/src/framework/utils/ctx"
@@ -26,7 +27,8 @@ type NeInfoController struct {
 }
 
 // neStateCacheMap 网元状态缓存最后一次成功的信息
-var neStateCacheMap map[string]map[string]any = make(map[string]map[string]any)
+var neStateCacheMap sync.Map
+var mutex sync.Mutex
 
 // 网元状态
 //
@@ -52,12 +54,13 @@ func (s *NeInfoController) NeState(c *gin.Context) {
 	// 网元直连
 	resData, err := neService.NeState(neInfo)
 	if err != nil {
+		mutex.Lock()
 		// 异常取上次缓存
-		if v, ok := neStateCacheMap[neKey]; ok && v != nil {
-			v["online"] = false
-			neStateCacheMap[neKey] = v
+		resDataCache, ok := neStateCacheMap.Load(neKey)
+		if ok && resDataCache != nil {
+			resDataCache.(map[string]any)["online"] = false
 		} else {
-			neStateCacheMap[neKey] = map[string]any{
+			resDataCache = map[string]any{
 				"online": false,
 				"neId":   neInfo.NeId,
 				"neName": neInfo.NeName,
@@ -65,13 +68,17 @@ func (s *NeInfoController) NeState(c *gin.Context) {
 				"neIP":   neInfo.IP,
 			}
 		}
-		c.JSON(200, result.OkData(neStateCacheMap[neKey]))
+		neStateCacheMap.Store(neKey, resDataCache)
+		mutex.Unlock()
+		c.JSON(200, result.OkData(resDataCache))
 		return
 	}
 
 	// 存入缓存
 	resData["online"] = true
-	neStateCacheMap[neKey] = resData
+	mutex.Lock()
+	neStateCacheMap.Store(neKey, resData)
+	mutex.Unlock()
 	c.JSON(200, result.OkData(resData))
 }
 

src/modules/network_element/network_element.go

@@ -6,6 +6,7 @@ import (
 	"ems.agt/src/framework/middleware/collectlogs"
 	"ems.agt/src/framework/middleware/repeat"
 	"ems.agt/src/modules/network_element/controller"
+	"ems.agt/src/modules/network_element/service"
 
 	"github.com/gin-gonic/gin"
 )
@@ -14,7 +15,12 @@ import (
 func Setup(router *gin.Engine) {
 	logger.Infof("开始加载 ====> network_element 模块路由")
 
+	// 启动时需要的初始参数
+	InitLoad()
+
 	neGroup := router.Group("/ne")
+
+	// 网元信息
 	{
 		neGroup.GET("/info",
 			middleware.PreAuthorize(nil),
@@ -155,18 +161,10 @@ func Setup(router *gin.Engine) {
 			controller.NewUDMSub.Import,
 		)
 	}
-
-	// 性能统计信息
-	kpiGroup := neGroup.Group("/kpi")
-	{
-		kpiGroup.GET("/title",
-			middleware.PreAuthorize(nil),
-			controller.NewPerfKPI.Title,
-		)
-		kpiGroup.GET("/data",
-			middleware.PreAuthorize(nil),
-			controller.NewPerfKPI.GoldKPI,
-		)
-	}
-
+}
+
+// InitLoad 初始参数
+func InitLoad() {
+	// 启动时，清除缓存-网元类型
+	service.NewNeInfoImpl.ClearNeCacheByNeType("*")
 }

src/modules/network_element/service/ne_direct_link.go

@@ -41,5 +41,6 @@ func NeState(neInfo model.NeInfo) (map[string]any, error) {
 		"expire":      resData["expiryDate"],
 		"cpu":         resData["cpuUsage"],
 		"mem":         resData["memUsage"],
+		"disk":        resData["diskSpace"],
 	}, nil
 }

src/modules/network_element/service/ne_info.go

@@ -7,6 +7,12 @@ type INeInfo interface {
 	// SelectNeInfoByNeTypeAndNeID 通过ne_type和ne_id查询网元信息
 	SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeInfo
 
+	// RefreshByNeTypeAndNeID 通过ne_type和ne_id刷新redis中的缓存
+	RefreshByNeTypeAndNeID(neType, neID string) model.NeInfo
+
+	// ClearNeCacheByNeType 清除网元类型缓存
+	ClearNeCacheByNeType(neType string) bool
+
 	// SelectNeList 查询网元列表
 	SelectNeList(ne model.NeInfo, bandStatus bool) []model.NeInfo
 }

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

@@ -1,6 +1,11 @@
 package service
 
 import (
+	"encoding/json"
+	"fmt"
+
+	"ems.agt/src/framework/constants/cachekey"
+	"ems.agt/src/framework/redis"
 	"ems.agt/src/modules/network_element/model"
 	"ems.agt/src/modules/network_element/repository"
 )
@@ -18,7 +23,50 @@ type NeInfoImpl struct {
 
 // SelectNeInfoByNeTypeAndNeID 通过ne_type和ne_id查询网元信息
 func (r *NeInfoImpl) SelectNeInfoByNeTypeAndNeID(neType, neID string) model.NeInfo {
-	return r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
+	var neInfo model.NeInfo
+	key := fmt.Sprintf("%s%s.%s", cachekey.NE_KEY, neType, neID)
+	jsonStr, _ := redis.Get("", key)
+	if len(jsonStr) > 7 {
+		err := json.Unmarshal([]byte(jsonStr), &neInfo)
+		if err != nil {
+			neInfo = model.NeInfo{}
+		}
+	} else {
+		neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
+		if neInfo.NeId == neID {
+			redis.Del("", key)
+			values, _ := json.Marshal(neInfo)
+			redis.Set("", key, string(values))
+		}
+	}
+	return neInfo
+}
+
+// RefreshByNeTypeAndNeID 通过ne_type和ne_id刷新redis中的缓存
+func (r *NeInfoImpl) RefreshByNeTypeAndNeID(neType, neID string) model.NeInfo {
+	var neInfo model.NeInfo
+	key := fmt.Sprintf("%s%s.%s", cachekey.NE_KEY, neType, neID)
+	redis.Del("", key)
+	neInfo = r.neInfoRepository.SelectNeInfoByNeTypeAndNeID(neType, neID)
+	if neInfo.NeId == neID {
+		values, _ := json.Marshal(neInfo)
+		redis.Set("", key, string(values))
+	}
+	return neInfo
+}
+
+// ClearNeCacheByNeType 清除网元类型缓存
+func (r *NeInfoImpl) ClearNeCacheByNeType(neType string) bool {
+	key := fmt.Sprintf("%s*", cachekey.NE_KEY)
+	if neType != "*" {
+		key = fmt.Sprintf("%s%s*", cachekey.NE_KEY, neType)
+	}
+	keys, err := redis.GetKeys("", key)
+	if err != nil {
+		return false
+	}
+	delOk, _ := redis.DelKeys("", keys)
+	return delOk
 }
 
 // SelectNeList 查询网元列表