fix: 网元版本列表主动检查服务状态的版本

This commit is contained in:
TsMask
2024-09-21 15:50:55 +08:00
parent 90ec72b280
commit f597f36bbe
8 changed files with 1033 additions and 1038 deletions

View File

@@ -20,7 +20,7 @@ import (
var NewNeInfo = &NeInfoController{
neInfoService: neService.NewNeInfoImpl,
neLicenseService: neService.NewNeLicenseImpl,
neVersionService: neService.NewNeVersionImpl,
neVersionService: neService.NewNeVersion,
}
// 网元信息请求
@@ -32,7 +32,7 @@ type NeInfoController struct {
// 网元授权激活信息服务
neLicenseService neService.INeLicense
// 网元版本信息服务
neVersionService neService.INeVersion
neVersionService *neService.NeVersion
}
// neStateCacheMap 网元状态缓存最后一次成功的信息
@@ -318,6 +318,8 @@ func (s *NeInfoController) Add(c *gin.Context) {
// 已有网元可获取的信息
if body.ServerState != nil {
if v, ok := body.ServerState["version"]; ok && v != nil {
neVersion.Name = "-"
neVersion.Path = "-"
neVersion.Version = v.(string)
}
if v, ok := body.ServerState["sn"]; ok && v != nil {
@@ -397,6 +399,8 @@ func (s *NeInfoController) Edit(c *gin.Context) {
// 已有网元可获取的信息
if body.ServerState != nil {
if v, ok := body.ServerState["version"]; ok && v != nil {
neVersion.Name = "-"
neVersion.Path = "-"
neVersion.Version = v.(string)
neVersion.UpdateBy = loginUserName
}

View File

@@ -11,7 +11,7 @@ import (
// 实例化控制层 NeVersionController 结构体
var NewNeVersion = &NeVersionController{
neVersionService: neService.NewNeVersionImpl,
neVersionService: neService.NewNeVersion,
}
// 网元版本请求
@@ -19,7 +19,7 @@ var NewNeVersion = &NeVersionController{
// PATH /version
type NeVersionController struct {
// 网元版本服务
neVersionService neService.INeVersion
neVersionService *neService.NeVersion
}
// 网元版本列表
@@ -27,7 +27,7 @@ type NeVersionController struct {
// GET /list
func (s *NeVersionController) List(c *gin.Context) {
querys := ctx.QueryMap(c)
data := s.neVersionService.SelectPage(querys)
data := s.neVersionService.SelectPage(querys, true)
c.JSON(200, result.Ok(data))
}