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

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

View File

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

View File

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

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
}