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

fix: voip export task issue

Browse Source
This commit is contained in:
zhangsz
2025-05-13 20:11:34 +08:00
parent f0ff35db87
commit 18dea169a3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/network_data/model/udm_voip.go
View File

@@ -1,6 +1,6 @@
package model package model
// UDMVOIPUser UDMVOIP用户 udm_voip // UDMVOIPUser UDMVOIP用户 udm_voip
type UDMVOIPUser struct { type UDMVOIPUser struct {
ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键 ID string `json:"id" gorm:"column:id;primaryKey;autoIncrement"` // 主键
NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识 NeId string `json:"neId" gorm:"column:ne_id"` // UDM网元标识
@@ -11,5 +11,5 @@ type UDMVOIPUser struct {
// TableName 表名称 // TableName 表名称
func (*UDMVOIPUser) TableName() string { func (*UDMVOIPUser) TableName() string {
return "udm_voip" return "u_voip_auth"
} }

14
src/modules/network_data/repository/udm_voip.go
View File

@@ -67,7 +67,7 @@ func (r UDMVOIPUser) SelectPage(query map[string]string) (int64, []model.UDMVOIP
} }
tx = tx.Order(sortSql) tx = tx.Order(sortSql)
} else { } else {
tx = tx.Order("username asc") tx = tx.Order("user_name asc")
} }
// 查询数据 // 查询数据
@@ -83,7 +83,7 @@ func (r UDMVOIPUser) SelectList(u model.UDMVOIPUser) []model.UDMVOIPUser {
tx := db.DB("").Model(&model.UDMVOIPUser{}) tx := db.DB("").Model(&model.UDMVOIPUser{})
// 查询条件拼接 // 查询条件拼接
if u.UserName != "" { if u.UserName != "" {
tx = tx.Where("username = ?", u.UserName) tx = tx.Where("user_name = ?", u.UserName)
} }
if u.NeId != "" { if u.NeId != "" {
tx = tx.Where("ne_id = ?", u.NeId) tx = tx.Where("ne_id = ?", u.NeId)
@@ -91,7 +91,7 @@ func (r UDMVOIPUser) SelectList(u model.UDMVOIPUser) []model.UDMVOIPUser {
// 查询数据 // 查询数据
arr := []model.UDMVOIPUser{} arr := []model.UDMVOIPUser{}
if err := tx.Order("username asc").Find(&arr).Error; err != nil { if err := tx.Order("user_name asc").Find(&arr).Error; err != nil {
logger.Errorf("query err => %v", err) logger.Errorf("query err => %v", err)
} }
return arr return arr
@@ -102,9 +102,9 @@ func (r UDMVOIPUser) SelectByUserNameAndNeID(username, neId string) model.UDMVOI
tx := db.DB("").Model(&model.UDMVOIPUser{}) tx := db.DB("").Model(&model.UDMVOIPUser{})
item := model.UDMVOIPUser{} item := model.UDMVOIPUser{}
// 查询条件拼接 // 查询条件拼接
tx = tx.Where("username = ? and ne_id = ?", username, neId) tx = tx.Where("user_name = ? and ne_id = ?", username, neId)
// 查询数据 // 查询数据
if err := tx.Order("username asc").Limit(1).Find(&item).Error; err != nil { if err := tx.Order("user_name asc").Limit(1).Find(&item).Error; err != nil {
logger.Errorf("query err => %v", err) logger.Errorf("query err => %v", err)
} }
return item return item
@@ -121,7 +121,7 @@ func (r UDMVOIPUser) Inserts(uArr []model.UDMVOIPUser) int64 {
// Delete 删除实体 // Delete 删除实体
func (r UDMVOIPUser) Delete(username, neId string) int64 { func (r UDMVOIPUser) Delete(username, neId string) int64 {
tx := db.DB("").Where("username = ? and ne_id = ?", username, neId).Delete(&model.UDMVOIPUser{}) tx := db.DB("").Where("user_name = ? and ne_id = ?", username, neId).Delete(&model.UDMVOIPUser{})
if err := tx.Error; err != nil { if err := tx.Error; err != nil {
logger.Errorf("Delete err => %v", err) logger.Errorf("Delete err => %v", err)
} }
@@ -130,7 +130,7 @@ func (r UDMVOIPUser) Delete(username, neId string) int64 {
// DeletePrefixByUserName 删除前缀匹配的实体 // DeletePrefixByUserName 删除前缀匹配的实体
func (r UDMVOIPUser) DeletePrefixByUserName(username, neId string) int64 { func (r UDMVOIPUser) DeletePrefixByUserName(username, neId string) int64 {
tx := db.DB("").Where("username like ? and ne_id = ?", fmt.Sprintf("%s%%", username), neId).Delete(&model.UDMVOIPUser{}) tx := db.DB("").Where("user_name like ? and ne_id = ?", fmt.Sprintf("%s%%", username), neId).Delete(&model.UDMVOIPUser{})
if err := tx.Error; err != nil { if err := tx.Error; err != nil {
logger.Errorf("DeletePrefixByUserName err => %v", err) logger.Errorf("DeletePrefixByUserName err => %v", err)
} }