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

fix: UDM不区分NeID

Browse Source
This commit is contained in:
TsMask
2023-09-12 20:11:19 +08:00
parent ea01504e6c
commit 273c6c2bbb
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
features/udm_user/api_udm_user.go
View File

@@ -220,6 +220,7 @@ func (s *UdmUserApi) UdmAuthUserSave(w http.ResponseWriter, r *http.Request) {
return return
} }
neId = "-"
data := s.authUser.Save(neId) data := s.authUser.Save(neId)
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -249,7 +250,7 @@ func (s *UdmUserApi) UdmAuthUserInfo(w http.ResponseWriter, r *http.Request) {
ctx.JSON(w, 200, result.ErrMsg(err.Error())) ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return return
} }
neId = "-"
var userInfo model.UdmAuthUser var userInfo model.UdmAuthUser
list := s.authUser.List(model.UdmAuthUser{NeID: neId, Imsi: imsi}) list := s.authUser.List(model.UdmAuthUser{NeID: neId, Imsi: imsi})
if len(list) > 0 { if len(list) > 0 {
@@ -303,7 +304,8 @@ func (s *UdmUserApi) UdmAuthUserAdd(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.authUser.Insert(neInfo.NeId, body) neId = "-"
s.authUser.Insert(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -343,7 +345,8 @@ func (s *UdmUserApi) UdmAuthUserAdds(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.authUser.Inserts(neInfo.NeId, body, num) neId = "-"
s.authUser.Inserts(neId, body, num)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -395,7 +398,8 @@ func (s *UdmUserApi) UdmAuthUserEdit(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.authUser.Update(neInfo.NeId, body) neId = "-"
s.authUser.Update(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -428,6 +432,7 @@ func (s *UdmUserApi) UdmAuthUserRemove(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
neId = "-"
s.authUser.Delete(neId, imsi) s.authUser.Delete(neId, imsi)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
@@ -462,6 +467,7 @@ func (s *UdmUserApi) UdmAuthUserRemoves(w http.ResponseWriter, r *http.Request)
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
neId = "-"
s.authUser.Deletes(neId, imsi, num) s.authUser.Deletes(neId, imsi, num)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
@@ -476,6 +482,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
ctx.JSON(w, 400, result.CodeMsg(400, "参数错误")) ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
return return
} }
neId = "-"
list := s.authUser.List(model.UdmAuthUser{NeID: neId}) list := s.authUser.List(model.UdmAuthUser{NeID: neId})
// 文件名 // 文件名
fileName := fmt.Sprintf("OMC_AUTH_USER_EXPORT_%s_%d.csv", neId, time.Now().UnixMilli()) fileName := fmt.Sprintf("OMC_AUTH_USER_EXPORT_%s_%d.csv", neId, time.Now().UnixMilli())
@@ -540,6 +547,7 @@ func (s *UdmUserApi) UdmAuthUserImport(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)
neId = "-"
s.authUser.InsertCSV(neId, data) s.authUser.InsertCSV(neId, data)
} }
// ctx.JSON(w, 200, result.OkData(data)) // ctx.JSON(w, 200, result.OkData(data))
@@ -565,6 +573,7 @@ func (s *UdmUserApi) UdmSubUserSave(w http.ResponseWriter, r *http.Request) {
return return
} }
neId = "-"
data := s.subUser.Save(neId) data := s.subUser.Save(neId)
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -595,6 +604,7 @@ func (s *UdmUserApi) UdmSubUserInfo(w http.ResponseWriter, r *http.Request) {
return return
} }
neId = "-"
var userInfo model.UdmSubUser var userInfo model.UdmSubUser
list := s.subUser.List(model.UdmSubUser{NeID: neId, Imsi: imsi}) list := s.subUser.List(model.UdmSubUser{NeID: neId, Imsi: imsi})
if len(list) > 0 { if len(list) > 0 {
@@ -671,7 +681,8 @@ func (s *UdmUserApi) UdmSubUserAdd(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.subUser.Insert(neInfo.NeId, body) neId = "-"
s.subUser.Insert(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -716,7 +727,8 @@ func (s *UdmUserApi) UdmSubUserAdds(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.subUser.Inserts(neInfo.NeId, body, num) neId = "-"
s.subUser.Inserts(neId, body, num)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -755,7 +767,8 @@ func (s *UdmUserApi) UdmSubUserAdd4G(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.subUser.Insert4G(neInfo.NeId, body) neId = "-"
s.subUser.Insert4G(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -823,7 +836,8 @@ func (s *UdmUserApi) UdmSubUserEdit(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
s.subUser.Update(neInfo.NeId, body) neId = "-"
s.subUser.Update(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
} }
@@ -861,6 +875,7 @@ func (s *UdmUserApi) UdmSubUser4GIP(w http.ResponseWriter, r *http.Request) {
} }
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
neId = "-"
s.subUser.Update4GIP(neId, body) s.subUser.Update4GIP(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
@@ -900,6 +915,7 @@ func (s *UdmUserApi) UdmSubUserSmData(w http.ResponseWriter, r *http.Request) {
} }
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
neId = "-"
s.subUser.UpdateSmData(neId, body) s.subUser.UpdateSmData(neId, body)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
@@ -933,6 +949,7 @@ func (s *UdmUserApi) UdmSubUserRemove(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
neId = "-"
s.subUser.Delete(neId, imsi) s.subUser.Delete(neId, imsi)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
@@ -967,6 +984,7 @@ func (s *UdmUserApi) UdmSubUserRemoves(w http.ResponseWriter, r *http.Request) {
// 命令ok时 // 命令ok时
if strings.Contains(data, "ok") { if strings.Contains(data, "ok") {
neId = "-"
s.subUser.Deletes(neId, imsi, num) s.subUser.Deletes(neId, imsi, num)
} }
ctx.JSON(w, 200, result.OkData(data)) ctx.JSON(w, 200, result.OkData(data))
@@ -981,6 +999,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
ctx.JSON(w, 400, result.CodeMsg(400, "参数错误")) ctx.JSON(w, 400, result.CodeMsg(400, "参数错误"))
return return
} }
neId = "-"
list := s.subUser.List(model.UdmSubUser{NeID: neId}) list := s.subUser.List(model.UdmSubUser{NeID: neId})
// 文件名 // 文件名
fileName := fmt.Sprintf("OMC_AUTH_USER_EXPORT_%s_%d.csv", neId, time.Now().UnixMilli()) fileName := fmt.Sprintf("OMC_AUTH_USER_EXPORT_%s_%d.csv", neId, time.Now().UnixMilli())
@@ -1045,6 +1064,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)
neId = "-"
s.subUser.InsertCSV(neId, data) s.subUser.InsertCSV(neId, data)
} }
// ctx.JSON(w, 200, result.OkData(data)) // ctx.JSON(w, 200, result.OkData(data))