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

fix: UDM导入文件成功相应原始文本

Browse Source
This commit is contained in:
TsMask
2023-09-13 14:35:10 +08:00
parent 757f2f09a8
commit e1923ee683
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
features/udm_user/api_udm_user.go
View File

@@ -513,14 +513,18 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
return
}
neInfo, err := NeInfoByUDM(neId)
// 获取文件名
_, fileHeader, err := r.FormFile("file")
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
}
if !strings.HasSuffix(fileHeader.Filename, ".csv") {
ctx.JSON(w, 200, result.ErrMsg("请上传CSV格式文件，内容字段imsi, ki, algo, amf, opc"))
return
}
// 获取文件名
_, fileHeader, err := r.FormFile("file")
neInfo, err := NeInfoByUDM(neId)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -558,8 +562,7 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
neId = "-"
s.authUser.InsertCSV(neId, data)
}
// ctx.JSON(w, 200, result.OkData(data))
ctx.FileAttachment(w, r, filePath, fileName)
ctx.JSON(w, 200, result.OkData(data))
}
// UDM签约用户
@@ -1038,14 +1041,18 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
return
}
neInfo, err := NeInfoByUDM(neId)
// 获取文件名
_, fileHeader, err := r.FormFile("file")
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
}
if !strings.HasSuffix(fileHeader.Filename, ".csv") {
ctx.JSON(w, 200, result.ErrMsg("请上传CSV格式文件，内容字段imsi, msisdn, ambr, nssai, arfb, sar,rat, cn, smf_sel, sm_dat,eps_dat"))
return
}
// 获取文件名
_, fileHeader, err := r.FormFile("file")
neInfo, err := NeInfoByUDM(neId)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -1083,6 +1090,5 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
neId = "-"
s.subUser.InsertCSV(neId, data)
}
// ctx.JSON(w, 200, result.OkData(data))
ctx.FileAttachment(w, r, filePath, fileName)
ctx.JSON(w, 200, result.OkData(data))
}

2
features/udm_user/service/service_udm_auth_user.go
View File

@@ -69,7 +69,7 @@ func (r *ServiceUdmAuthUser) InsertCSV(neID string, data []map[string]string) in
if s, ok := v["opc"]; ok {
authUser.Opc = s
}
r.repoAuthUser.Insert(neID, authUser)
num += r.repoAuthUser.Insert(neID, authUser)
}
return num
}

2
features/udm_user/service/service_udm_sub_user.go
View File

@@ -86,7 +86,7 @@ func (r *ServiceUdmSubUser) InsertCSV(neID string, data []map[string]string) int
if s, ok := v["eps_dat"]; ok {
subUser.EpsDat = s
}
r.repoSunUser.Insert(neID, subUser)
num += r.repoSunUser.Insert(neID, subUser)
}
return num
}