simonzhangsz/omc_api
1
0
Fork 0
Code Activity

marge: 合并代码，包名变更be.ems

Browse Source
This commit is contained in:
TsMask
2024-03-18 15:22:47 +08:00
parent df904f5328
commit 78bd110b03
393 changed files with 7870 additions and 5170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
features/udm_user/api_udm_user.go
View File

@@ -7,20 +7,20 @@ import (
"strings"
"time"
"ems.agt/features/udm_user/model"
"ems.agt/features/udm_user/service"
"ems.agt/lib/core/conf"
mmlclient "ems.agt/lib/core/mml_client"
"ems.agt/lib/core/utils/ctx"
"ems.agt/lib/core/vo/result"
"ems.agt/lib/dborm"
"ems.agt/lib/log"
"ems.agt/lib/midware"
"ems.agt/lib/services"
"ems.agt/restagent/config"
"ems.agt/src/framework/middleware/collectlogs"
"ems.agt/src/framework/utils/file"
"ems.agt/src/framework/utils/ssh"
"be.ems/features/udm_user/model"
"be.ems/features/udm_user/service"
"be.ems/lib/core/conf"
mmlclient "be.ems/lib/core/mml_client"
"be.ems/lib/core/utils/ctx"
"be.ems/lib/core/vo/result"
"be.ems/lib/dborm"
"be.ems/lib/log"
"be.ems/lib/midware"
"be.ems/lib/services"
"be.ems/restagent/config"
"be.ems/src/framework/middleware/collectlogs"
"be.ems/src/framework/utils/file"
"be.ems/src/framework/utils/ssh"
)
// UDM 用户信息接口添加到路由
@@ -516,7 +516,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err := file.WriterCSVFile(data, filePath)
err := file.WriterFileCSV(data, filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -530,7 +530,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err = file.WriterTxtFile(data, filePath)
err = file.WriterFileTXT(data, ",", filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -597,12 +597,12 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
// 命令ok时
if strings.Contains(data, "ok") {
if strings.HasSuffix(fileHeader.Filename, ".csv") {
data := file.ReadCSVFile(localPath)
data := file.ReadFileCSV(localPath)
neId = ""
go s.authUser.InsertCSV(neId, data)
}
if strings.HasSuffix(fileHeader.Filename, ".txt") {
data := file.ReadTxtFile(localPath)
data := file.ReadFileTXT(",", localPath)
neId = ""
go s.authUser.InsertTxt(neId, data)
}
@@ -1116,7 +1116,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
}
// 输出到文件
err = file.WriterCSVFile(data, filePath)
err = file.WriterFileCSV(data, filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -1131,7 +1131,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, epsDat})
}
// 输出到文件
err = file.WriterTxtFile(data, filePath)
err = file.WriterFileTXT(data, ",", filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -1197,12 +1197,12 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
// 命令ok时
if strings.Contains(data, "ok") {
if strings.HasSuffix(fileHeader.Filename, ".csv") {
data := file.ReadCSVFile(localPath)
data := file.ReadFileCSV(localPath)
neId = ""
go s.subUser.InsertCSV(neId, data)
}
if strings.HasSuffix(fileHeader.Filename, ".txt") {
data := file.ReadTxtFile(localPath)
data := file.ReadFileTXT(",", localPath)
neId = ""
go s.subUser.InsertTxt(neId, data)
}