fix: 处理兼容旧网元查询函数
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"be.ems/lib/log"
|
||||
neService "be.ems/src/modules/network_element/service"
|
||||
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
"xorm.io/xorm"
|
||||
@@ -207,18 +208,23 @@ type NeInfo struct {
|
||||
|
||||
func XormGetNeInfo(neType string, neId string) (*NeInfo, error) {
|
||||
log.Debug("XormGetNeInfo processing... ")
|
||||
neInfox := neService.NewNeInfo.FindByNeTypeAndNeID(neType, neId)
|
||||
|
||||
neInfo := new(NeInfo)
|
||||
has, err := xEngine.Where("ne_type=? and ne_id=?", strings.ToUpper(neType), neId).Get(neInfo)
|
||||
if err != nil {
|
||||
log.Error("Failed to get table ne_info from database:", err)
|
||||
return nil, err
|
||||
} else if !has {
|
||||
log.Infof("Not found ne_info from database, neType=%s, neId=%s", neType, neId)
|
||||
return nil, nil
|
||||
}
|
||||
neInfo.NeType = neType
|
||||
neInfo.NeId = neId
|
||||
neInfo.RmUID = neInfox.RmUID
|
||||
neInfo.NeName = neInfox.NeName
|
||||
neInfo.Ip = neInfox.IP
|
||||
neInfo.Port = fmt.Sprint(neInfox.Port)
|
||||
neInfo.PvFlag = neInfox.PvFlag
|
||||
neInfo.NeAddress = neInfox.NeAddress
|
||||
neInfo.Province = neInfox.Province
|
||||
neInfo.VendorName = neInfox.VendorName
|
||||
neInfo.Dn = neInfox.Dn
|
||||
neInfo.Status = int(neInfox.Status)
|
||||
neInfo.UpdateTime = time.UnixMilli(neInfox.UpdateTime)
|
||||
|
||||
log.Debug("NE Info:", neInfo)
|
||||
return neInfo, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user