From 94ed370efa029f00d59c2b29f1793b4f975c234b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 26 Mar 2025 16:19:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=97=A7=E7=BD=91=E5=85=83=E6=9F=A5=E8=AF=A2=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/dborm/dborm.go | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/lib/dborm/dborm.go b/lib/dborm/dborm.go
index 1943ee0b..cfe12f29 100644
--- a/lib/dborm/dborm.go
+++ b/lib/dborm/dborm.go
@@ -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
 }