fix: 网元主机title唯一导致冲突5002修改失败
This commit is contained in:
@@ -9,8 +9,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"be.ems/src/framework/constants/cachekey"
|
"be.ems/src/framework/constants/cachekey"
|
||||||
|
"be.ems/src/framework/database/redis"
|
||||||
"be.ems/src/framework/logger"
|
"be.ems/src/framework/logger"
|
||||||
"be.ems/src/framework/redis"
|
|
||||||
"be.ems/src/framework/telnet"
|
"be.ems/src/framework/telnet"
|
||||||
"be.ems/src/framework/utils/generate"
|
"be.ems/src/framework/utils/generate"
|
||||||
"be.ems/src/framework/utils/parse"
|
"be.ems/src/framework/utils/parse"
|
||||||
@@ -76,8 +76,8 @@ func (r *NeInfo) ClearNeCacheByNeType(neType string) bool {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
delOk, _ := redis.DelKeys("", keys)
|
err = redis.DelKeys("", keys)
|
||||||
return delOk
|
return err == nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// SelectNeInfoByNeType 通过ne_type查询网元信息
|
// SelectNeInfoByNeType 通过ne_type查询网元信息
|
||||||
@@ -252,7 +252,7 @@ func (r *NeInfo) Insert(neInfo model.NeInfo) string {
|
|||||||
uuid := generate.Code(4)
|
uuid := generate.Code(4)
|
||||||
var hostIDs []string
|
var hostIDs []string
|
||||||
for _, host := range neInfo.Hosts {
|
for _, host := range neInfo.Hosts {
|
||||||
host.Title = neInfo.NeName + "_" + uuid
|
host.Title = fmt.Sprintf("%s_%d_%s", neInfo.NeName, neInfo.Port, uuid)
|
||||||
host.GroupID = "1"
|
host.GroupID = "1"
|
||||||
host.CreateBy = neInfo.CreateBy
|
host.CreateBy = neInfo.CreateBy
|
||||||
hostId := NewNeHost.Insert(host)
|
hostId := NewNeHost.Insert(host)
|
||||||
@@ -278,7 +278,7 @@ func (r *NeInfo) Update(neInfo model.NeInfo) int64 {
|
|||||||
uuid := generate.Code(4)
|
uuid := generate.Code(4)
|
||||||
for _, host := range neInfo.Hosts {
|
for _, host := range neInfo.Hosts {
|
||||||
if host.HostID != "" {
|
if host.HostID != "" {
|
||||||
host.Title = neInfo.NeName + "_" + uuid
|
host.Title = fmt.Sprintf("%s_%d_%s", neInfo.NeName, neInfo.Port, uuid)
|
||||||
host.GroupID = "1"
|
host.GroupID = "1"
|
||||||
host.UpdateBy = neInfo.UpdateBy
|
host.UpdateBy = neInfo.UpdateBy
|
||||||
NewNeHost.Update(host)
|
NewNeHost.Update(host)
|
||||||
|
|||||||
Reference in New Issue
Block a user