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

fix: UDM用户获取sql查询问题

Browse Source
This commit is contained in:
TsMask
2023-09-12 16:13:04 +08:00
parent eb18ea22a4
commit a7a4819a0f
6 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
features/udm_user/repo/repo_udm_auth_user.go
View File

@@ -118,7 +118,7 @@ func (r *RepoUdmAuthUser) SelectList(auth model.UdmAuthUser) []model.UdmAuthUser
var conditions []string
var params []any
if auth.Imsi != "" {
conditions = append(conditions, "msisdn like concat(?, '%')")
conditions = append(conditions, "imsi = ?")
params = append(params, auth.Imsi)
}
if auth.NeID != "" {
@@ -207,8 +207,8 @@ func (r *RepoUdmAuthUser) Inserts(neID string, authUser model.UdmAuthUser, num s
func (r *RepoUdmAuthUser) Update(neID string, authUser model.UdmAuthUser) int64 {
// 查询先
var user model.UdmAuthUser
err := datasource.DefaultDB().Table("u_auth_user").Where("imsi = ? and ne_id = ?", authUser.Imsi, neID).Find(&user)
if err != nil {
has, err := datasource.DefaultDB().Table("u_auth_user").Where("imsi = ? and ne_id = ?", authUser.Imsi, neID).Get(&user)
if !has || err != nil {
return 0
}
@@ -225,7 +225,7 @@ func (r *RepoUdmAuthUser) Update(neID string, authUser model.UdmAuthUser) int64
user.Opc = authUser.Opc
}
results, err := datasource.DefaultDB().Table("u_auth_user").Update(user)
results, err := datasource.DefaultDB().Table("u_auth_user").Where("imsi = ? and ne_id = ?", user.Imsi, user.NeID).Update(user)
if err != nil {
return 0
}

18
features/udm_user/repo/repo_udm_sub_user.go
View File

@@ -22,7 +22,7 @@ var NewRepoUdmSubUser = &RepoUdmSubUser{
"msisdn": "Msisdn",
"imsi": "Imsi",
"ambr": "Ambr",
"nssai": "Assai",
"nssai": "Nssai",
"rat": "Rat",
"arfb": "Arfb",
"sar": "Sar",
@@ -130,7 +130,7 @@ func (r *RepoUdmSubUser) SelectList(auth model.UdmSubUser) []model.UdmSubUser {
var conditions []string
var params []any
if auth.Imsi != "" {
conditions = append(conditions, "msisdn like concat(?, '%')")
conditions = append(conditions, "imsi = ?")
params = append(params, auth.Imsi)
}
if auth.NeID != "" {
@@ -257,8 +257,8 @@ func (r *RepoUdmSubUser) Insert4G(neID string, subUser model.UdmSubUser) int64 {
func (r *RepoUdmSubUser) Update(neID string, authUser model.UdmSubUser) int64 {
// 查询先
var user model.UdmSubUser
err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", authUser.Imsi, neID).Find(&user)
if err != nil {
has, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", authUser.Imsi, neID).Get(&user)
if !has || err != nil {
return 0
}
@@ -290,7 +290,7 @@ func (r *RepoUdmSubUser) Update(neID string, authUser model.UdmSubUser) int64 {
user.EpsDat = authUser.EpsDat
}
results, err := datasource.DefaultDB().Table("u_sub_user").Update(user)
results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", user.Imsi, user.NeID).Update(user)
if err != nil {
return 0
}
@@ -315,8 +315,8 @@ func (r *RepoUdmSubUser) Update4GIP(neID string, subUser model.UdmSubUser) int64
// 查询先
var user model.UdmSubUser
err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", subUser.Imsi, neID).Find(&user)
if err == nil {
has, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", subUser.Imsi, neID).Get(&user)
if has && err == nil {
// IP会自动递增
parts := strings.Split(subUser.StaticIp, ".")
lastPart := parts[3]
@@ -354,8 +354,8 @@ func (r *RepoUdmSubUser) UpdateSmData(neID string, subUser model.UdmSubUser) int
// 查询先
var user model.UdmSubUser
err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", subUser.Imsi, neID).Find(&user)
if err == nil {
has, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", subUser.Imsi, neID).Get(&user)
if has && err == nil {
// IP会自动递增，需提前规划好DNN对应的IP；如dnn不需要绑定IP则不带此字段名
// parts := strings.Split(subUser.SmData, "&")
user.SmData = subUser.SmData