merge: 合并OMC分支

src/modules/network_element/network_element.go

@@ -4,7 +4,6 @@ import (
 	"nms_cxy/src/framework/logger"
 	"nms_cxy/src/framework/middleware"
 	"nms_cxy/src/framework/middleware/collectlogs"
-	"nms_cxy/src/framework/middleware/repeat"
 	"nms_cxy/src/modules/network_element/controller"
 	"nms_cxy/src/modules/network_element/service"
 
@@ -36,15 +35,46 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neAction", collectlogs.BUSINESS_TYPE_IMPORT)),
 			controller.NewNeAction.PushFile,
 		)
+		neActionGroup.PUT("/service",
+			middleware.PreAuthorize(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neAction", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeAction.Service,
+		)
 	}
 
 	// 网元信息
 	neInfoGroup := neGroup.Group("/info")
 	{
+		neInfoGroup.GET("/state",
+			middleware.PreAuthorize(nil),
+			controller.NewNeInfo.State,
+		)
+		neInfoGroup.GET("/byTypeAndID",
+			middleware.PreAuthorize(nil),
+			controller.NewNeInfo.NeTypeAndID,
+		)
 		neInfoGroup.GET("/listAll",
 			middleware.PreAuthorize(nil),
 			controller.NewNeInfo.ListAll,
 		)
+		neInfoGroup.GET("/para5GFile",
+			middleware.PreAuthorize(nil),
+			controller.NewNeInfo.Para5GFileRead,
+		)
+		neInfoGroup.PUT("/para5GFile",
+			middleware.PreAuthorize(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeInfo.Para5GFileWrite,
+		)
+		neInfoGroup.GET("/oamFile",
+			middleware.PreAuthorize(nil),
+			controller.NewNeInfo.OAMFileRead,
+		)
+		neInfoGroup.PUT("/oamFile",
+			middleware.PreAuthorize(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeInfo.OAMFileWrite,
+		)
 		neInfoGroup.GET("/list",
 			middleware.PreAuthorize(nil),
 			controller.NewNeInfo.List,
@@ -68,14 +98,6 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neInfo", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewNeInfo.Remove,
 		)
-		neInfoGroup.GET("/state",
-			middleware.PreAuthorize(nil),
-			controller.NewNeInfo.State,
-		)
-		neInfoGroup.GET("/byTypeAndID",
-			middleware.PreAuthorize(nil),
-			controller.NewNeInfo.NeTypeAndID,
-		)
 	}
 
 	// 网元主机
@@ -119,6 +141,11 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neHost", collectlogs.BUSINESS_TYPE_OTHER)),
 			controller.NewNeHost.CheckBySSH,
 		)
+		neHostGroup.POST("/authorizedBySSH",
+			middleware.PreAuthorize(nil),
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neHost", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeHost.AuthorizedBySSH,
+		)
 	}
 
 	// 网元主机命令
@@ -160,20 +187,10 @@ func Setup(router *gin.Engine) {
 			middleware.PreAuthorize(nil),
 			controller.NewNeVersion.Info,
 		)
-		neVersionGroup.POST("",
+		neVersionGroup.POST("/operate",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neVersion", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewNeVersion.Add,
-		)
-		neVersionGroup.PUT("",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neVersion", collectlogs.BUSINESS_TYPE_UPDATE)),
-			controller.NewNeVersion.Edit,
-		)
-		neVersionGroup.DELETE("/:versionIds",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neVersion", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewNeVersion.Remove,
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neVersion", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeVersion.Operate,
 		)
 	}
 
@@ -203,118 +220,76 @@ func Setup(router *gin.Engine) {
 			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neSoftware", collectlogs.BUSINESS_TYPE_DELETE)),
 			controller.NewNeSoftware.Remove,
 		)
-		neSoftwareGroup.POST("/install",
+		neSoftwareGroup.POST("/newNeVersion",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neSoftware", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewNeSoftware.Install,
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neSoftware", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeSoftware.NewNeVersion,
 		)
 	}
 
-	// UDM鉴权用户信息
-	udmAuthGroup := neGroup.Group("/udm/auth")
+	// 网元授权激活信息
+	neLicenseGroup := neGroup.Group("/license")
 	{
-		udmAuthGroup.PUT("/resetData/:neId",
-			repeat.RepeatSubmit(5),
+		neLicenseGroup.GET("/list",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_CLEAN)),
-			controller.NewUDMAuth.ResetData,
+			controller.NewNeLicense.List,
 		)
-		udmAuthGroup.GET("/list",
+		neLicenseGroup.GET("/:licenseId",
 			middleware.PreAuthorize(nil),
-			controller.NewUDMAuth.List,
+			controller.NewNeLicense.Info,
 		)
-		udmAuthGroup.GET("/:neId/:imsi",
+		neLicenseGroup.GET("/byTypeAndID",
 			middleware.PreAuthorize(nil),
-			controller.NewUDMAuth.Info,
+			controller.NewNeLicense.NeTypeAndID,
 		)
-		udmAuthGroup.POST("/:neId",
+		neLicenseGroup.GET("/code",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMAuth.Add,
+			controller.NewNeLicense.Code,
 		)
-		udmAuthGroup.POST("/:neId/:num",
+		neLicenseGroup.POST("/change",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMAuth.Adds,
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neLicense", collectlogs.BUSINESS_TYPE_OTHER)),
+			controller.NewNeLicense.Change,
 		)
-		udmAuthGroup.PUT("/:neId",
+		neLicenseGroup.GET("/state",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_UPDATE)),
-			controller.NewUDMAuth.Edit,
-		)
-		udmAuthGroup.DELETE("/:neId/:imsi",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMAuth.Remove,
-		)
-		udmAuthGroup.DELETE("/:neId/:imsi/:num",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMAuth.Removes,
-		)
-		udmAuthGroup.POST("/export",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewUDMAuth.Export,
-		)
-		udmAuthGroup.POST("/import",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmAuth", collectlogs.BUSINESS_TYPE_IMPORT)),
-			controller.NewUDMAuth.Import,
+			controller.NewNeLicense.State,
 		)
 	}
 
-	// UDM签约用户信息
-	udmSubGroup := neGroup.Group("/udm/sub")
+	// 网元参数配置
+	neConfigGroup := neGroup.Group("/config")
 	{
-		udmSubGroup.PUT("/resetData/:neId",
-			repeat.RepeatSubmit(5),
+		neConfigGroup.GET("/list",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_CLEAN)),
-			controller.NewUDMSub.ResetData,
+			controller.NewNeConfig.List,
 		)
-		udmSubGroup.GET("/list",
+		neConfigGroup.GET("/info/:id",
 			middleware.PreAuthorize(nil),
-			controller.NewUDMSub.List,
+			controller.NewNeConfig.Info,
 		)
-		udmSubGroup.GET("/:neId/:imsi",
+		neConfigGroup.POST("",
 			middleware.PreAuthorize(nil),
-			controller.NewUDMSub.Info,
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neConfig", collectlogs.BUSINESS_TYPE_INSERT)),
+			controller.NewNeConfig.Add,
 		)
-		udmSubGroup.POST("/:neId",
+		neConfigGroup.PUT("",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMSub.Add,
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neConfig", collectlogs.BUSINESS_TYPE_UPDATE)),
+			controller.NewNeConfig.Edit,
 		)
-		udmSubGroup.POST("/:neId/:num",
+		neConfigGroup.DELETE("/:ids",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_INSERT)),
-			controller.NewUDMSub.Adds,
+			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.neConfig", collectlogs.BUSINESS_TYPE_DELETE)),
+			controller.NewNeConfig.Remove,
 		)
-		udmSubGroup.PUT("/:neId",
+		neConfigGroup.GET("/list/:neType",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_UPDATE)),
-			controller.NewUDMSub.Edit,
+			controller.NewNeConfig.ListByNeType,
 		)
-		udmSubGroup.DELETE("/:neId/:imsi",
+		neConfigGroup.GET("/data",
 			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMSub.Remove,
-		)
-		udmSubGroup.DELETE("/:neId/:imsi/:num",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_DELETE)),
-			controller.NewUDMSub.Removes,
-		)
-		udmSubGroup.POST("/export",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_EXPORT)),
-			controller.NewUDMSub.Export,
-		)
-		udmSubGroup.POST("/import",
-			middleware.PreAuthorize(nil),
-			collectlogs.OperateLog(collectlogs.OptionNew("log.operate.title.udmSub", collectlogs.BUSINESS_TYPE_IMPORT)),
-			controller.NewUDMSub.Import,
+			controller.NewNeConfig.Data,
 		)
 	}
 }
@@ -324,4 +299,11 @@ func InitLoad() {
 	// 启动时，清除缓存-网元类型
 	service.NewNeInfoImpl.ClearNeCacheByNeType("*")
 	service.NewNeInfoImpl.SelectNeInfoByRmuid("")
+	// 启动时，网元公共参数数据记录到全局变量
+	if para5GMap, err := service.NewNeInfoImpl.NeConfPara5GRead(); para5GMap != nil && err == nil {
+		service.NewNeInfoImpl.NeConfPara5GWirte(para5GMap, nil)
+	}
+	// 启动时，清除缓存-网元参数配置可用属性值
+	service.NewNeConfigImpl.ClearNeCacheByNeType("*")
+	service.NewNeConfigImpl.RefreshByNeTypeAndNeID("*")
 }