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

fix: UDM用户删除引用表错误

Browse Source
This commit is contained in:
TsMask
2023-09-12 17:25:07 +08:00
parent bb7d03bff9
commit 7527e90af0
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
features/udm_user/api_udm_user.go
View File

@@ -187,6 +187,9 @@ func NeInfoByUDM(neId string) (*dborm.NeInfo, error) {
log.Error("dborm.XormGetNeInfo is failed:", err) log.Error("dborm.XormGetNeInfo is failed:", err)
return nil, err return nil, err
} }
if neInfo.Ip == "" {
return nil, fmt.Errorf("ne_info not IP")
}
return neInfo, nil return neInfo, nil
} }
@@ -963,7 +966,7 @@ func (s *UdmUserApi) UdmSubUserRemoves(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.authUser.Deletes(neId, imsi, num) s.subUser.Deletes(neId, imsi, num)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -1041,7 +1044,7 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
data := file.ReadCSVFile(filePath) data := file.ReadCSVFile(filePath)
s.authUser.InsertCSV(neId, data) s.subUser.InsertCSV(neId, data)
} }
// ctx.JSON(w, 200, result.OkData(data)) // ctx.JSON(w, 200, result.OkData(data))
ctx.FileAttachment(w, r, filePath, fileName) ctx.FileAttachment(w, r, filePath, fileName)

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

@@ -210,14 +210,16 @@ func (r *RepoUdmSubUser) Inserts(neID string, subUser model.UdmSubUser, num stri
subUser.Imsi = fmt.Sprint(imsiV + i) subUser.Imsi = fmt.Sprint(imsiV + i)
subUser.Msisdn = fmt.Sprint(msisdnV + i) subUser.Msisdn = fmt.Sprint(msisdnV + i)
// IP会自动递增 // IP会自动递增
parts := strings.Split(subUser.StaticIp, ".") if subUser.StaticIp != "" {
lastPart := parts[3] parts := strings.Split(subUser.StaticIp, ".")
lastNum, _ := strconv.Atoi(lastPart) lastPart := parts[3]
lastNum += i lastNum, _ := strconv.Atoi(lastPart)
newLastPart := strconv.Itoa(lastNum) lastNum += i
parts[3] = newLastPart newLastPart := strconv.Itoa(lastNum)
newIP := strings.Join(parts, ".") parts[3] = newLastPart
subUser.StaticIp = newIP newIP := strings.Join(parts, ".")
subUser.StaticIp = newIP
}
results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser) results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
if err == nil { if err == nil {
insertNum += results insertNum += results

15
features/udm_user/service/service_ne_ifno.go
View File

@@ -1,15 +0,0 @@
package service
import (
"ems.agt/lib/dborm"
"ems.agt/lib/log"
)
func UDMNeInfo(neId string) (*dborm.NeInfo, error) {
neInfo, err := dborm.XormGetNeInfo("UDM", neId)
if err != nil {
log.Error("dborm.XormGetNeInfo is failed:", err)
return nil, err
}
return neInfo, nil
}