OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 移除网元状态过滤判断status in ('0','3')

Browse Source
This commit is contained in:
TsMask
2024-03-09 18:05:23 +08:00
parent 345caff325
commit 3f02e2e557
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crontask/db.go
View File

@@ -95,7 +95,7 @@ func XormGetNeInfoByType(neType string, nes *[]NeInfo) (*[]NeInfo, error) {
log.Debug("XormGetNeInfoByType processing... ") log.Debug("XormGetNeInfoByType processing... ")
ne := new(NeInfo) ne := new(NeInfo)
rows, err := dbClient.xEngine.Table("ne_info").Where("status in ('0','3') and ne_type =?", neType).Rows(ne) rows, err := dbClient.xEngine.Table("ne_info").Where("ne_type =?", neType).Rows(ne)
if err != nil { if err != nil {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return nil, err return nil, err
@@ -117,7 +117,7 @@ func XormGetAllNeInfo(nes *[]NeInfo) (*[]NeInfo, error) {
log.Debug("XormGetAllNeInfo processing... ") log.Debug("XormGetAllNeInfo processing... ")
ne := new(NeInfo) ne := new(NeInfo)
rows, err := dbClient.xEngine.Table("ne_info").Where("status in ('0','3')").Rows(ne) rows, err := dbClient.xEngine.Table("ne_info").Rows(ne)
if err != nil { if err != nil {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return nil, err return nil, err

14
lib/dborm/dborm.go
View File

@@ -228,12 +228,12 @@ func XormGetNeInfo(neType string, neId string) (*NeInfo, error) {
log.Debug("XormGetNeInfo processing... ") log.Debug("XormGetNeInfo processing... ")
neInfo := new(NeInfo) neInfo := new(NeInfo)
has, err := xEngine.Where("status in ('0','3') and ne_type=? and ne_id=?", strings.ToUpper(neType), neId).Get(neInfo) has, err := xEngine.Where("ne_type=? and ne_id=?", strings.ToUpper(neType), neId).Get(neInfo)
if err != nil { if err != nil {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return nil, err return nil, err
} else if !has { } else if !has {
log.Infof("Not found ne_info from database, status in ('0','3'), neType=%s, neId=%s", neType, neId) log.Infof("Not found ne_info from database, neType=%s, neId=%s", neType, neId)
return nil, nil return nil, nil
} }
@@ -245,12 +245,12 @@ func XormGetNeInfoByRmUID(neType string, rmUID string) (*NeInfo, error) {
log.Debug("XormGetNeInfoByRmUID processing... ") log.Debug("XormGetNeInfoByRmUID processing... ")
neInfo := new(NeInfo) neInfo := new(NeInfo)
has, err := xEngine.Where("status in ('0','3') and ne_type=? and rm_uid=?", strings.ToUpper(neType), rmUID).Get(neInfo) has, err := xEngine.Where("ne_type=? and rm_uid=?", strings.ToUpper(neType), rmUID).Get(neInfo)
if err != nil { if err != nil {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return nil, err return nil, err
} else if !has { } else if !has {
log.Infof("Not found ne_info from database, status in ('0','3'), neType=%s, neId=%s", neType, rmUID) log.Infof("Not found ne_info from database, neType=%s, neId=%s", neType, rmUID)
return nil, nil return nil, nil
} }
@@ -284,7 +284,7 @@ func XormGetNeInfoByNeType(neType string, nes *[]NeInfo) error {
log.Debug("XormGetNeInfoByNeType processing... ") log.Debug("XormGetNeInfoByNeType processing... ")
ne := new(NeInfo) ne := new(NeInfo)
rows, err := xEngine.Table("ne_info").Where("status in ('0','3') and ne_type=?", neType).Rows(ne) rows, err := xEngine.Table("ne_info").Where("ne_type=?", neType).Rows(ne)
if err != nil { if err != nil {
log.Error("Failed to get table ne_info from database:", err) log.Error("Failed to get table ne_info from database:", err)
return err return err
@@ -310,12 +310,12 @@ func XormGetNeInfo2(neType string, neIDs []string, nes *[]NeInfo) error {
var err error var err error
if len(neIDs) == 0 { if len(neIDs) == 0 {
rows, err = xEngine.Table("ne_info"). rows, err = xEngine.Table("ne_info").
Where("status in ('0','3') and ne_type=?", neType). Where("ne_type=?", neType).
Rows(ne) Rows(ne)
} else { } else {
rows, err = xEngine.Table("ne_info"). rows, err = xEngine.Table("ne_info").
In("ne_id", neIDs). In("ne_id", neIDs).
And("status in ('0','3') and ne_type=?", neType). And("ne_type=?", neType).
Rows(ne) Rows(ne)
} }
if err != nil { if err != nil {