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

style: 错误信息英文返回-featues包

Browse Source
This commit is contained in:
TsMask
2023-11-08 15:01:57 +08:00
parent c53cd9ce16
commit 546c6f165b
10 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
features/udm_user/api_udm_user.go
View File

@@ -511,9 +511,9 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
if body.Type == "csv" {
// 转换数据
data := [][]string{}
data = append(data, []string{"imsi", "ki", "amf", "algo", "opc"})
data = append(data, []string{"imsi", "ki", "algo", "amf", "opc"})
for _, v := range list {
data = append(data, []string{v.Imsi, v.Ki, v.Amf, v.AlgoIndex, v.Opc})
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err := file.WriterCSVFile(data, filePath)
@@ -527,7 +527,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
// 转换数据
data := [][]string{}
for _, v := range list {
data = append(data, []string{v.Imsi, v.Ki, v.Amf, v.AlgoIndex, v.Opc})
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err = file.WriterTxtFile(data, filePath)
@@ -1168,7 +1168,9 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
}
data2 := file.ReadCSVFile(localPath)
neId = ""
go s.subUser.InsertCSV(neId, data2)
// 复制到远程
err = ssh.FileSCPLocalToNe(neInfo.Ip, localPath, nePath)
if err != nil {

1
features/udm_user/repo/repo_udm_auth_user.go
View File

@@ -210,6 +210,7 @@ func (r *RepoUdmAuthUser) Inserts(authUsers []model.UdmAuthUser) int64 {
// 调用 InsertMulti 函数将批量数据插入数据库
results, err := datasource.DefaultDB().Table("u_auth_user").InsertMulti(batch)
if err != nil {
log.Errorf("Insert err => %v", err)
continue
}
num += results

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

@@ -220,6 +220,7 @@ func (r *RepoUdmSubUser) ClearAndInsert(neID string, subArr []model.UdmSubUser)
func (r *RepoUdmSubUser) Insert(subUser model.UdmSubUser) int64 {
results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
if err != nil {
log.Errorf("Insert err => %v", err)
return results
}
return results
@@ -240,6 +241,7 @@ func (r *RepoUdmSubUser) Inserts(subUser []model.UdmSubUser) int64 {
// 调用 InsertMulti 函数将批量数据插入数据库
results, err := datasource.DefaultDB().Table("u_sub_user").InsertMulti(batch)
if err != nil {
log.Errorf("Insert err => %v", err)
continue
}
num += results
@@ -266,6 +268,7 @@ func (r *RepoUdmSubUser) Insert4G(neID string, subUser model.UdmSubUser) int64 {
results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
if err == nil {
log.Errorf("Insert err => %v", err)
insertNum += results
}
}
@@ -336,6 +339,7 @@ func (r *RepoUdmSubUser) Update(neID string, authUser model.UdmSubUser) int64 {
results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", user.Imsi, user.NeID).Update(user)
if err != nil {
log.Errorf("Update err => %v", err)
return 0
}
return results
@@ -373,6 +377,7 @@ func (r *RepoUdmSubUser) Update4GIP(neID string, subUser model.UdmSubUser) int64
// 更新
results, err := datasource.DefaultDB().Table("u_sub_user").Update(user)
if err == nil {
log.Errorf("Update err => %v", err)
insertNum += results
}
}
@@ -406,6 +411,7 @@ func (r *RepoUdmSubUser) UpdateSmData(neID string, subUser model.UdmSubUser) int
// 更新
results, err := datasource.DefaultDB().Table("u_sub_user").Update(user)
if err == nil {
log.Errorf("Update err => %v", err)
insertNum += results
}
}
@@ -417,6 +423,7 @@ func (r *RepoUdmSubUser) UpdateSmData(neID string, subUser model.UdmSubUser) int
func (r *RepoUdmSubUser) Delete(neID, imsi string) int64 {
results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi = ? and ne_id = ?", imsi, neID).Delete()
if err != nil {
log.Errorf("Delete err => %v", err)
return results
}
return results
@@ -436,6 +443,7 @@ func (r *RepoUdmSubUser) Deletes(neID, imsi, num string) int64 {
results, err := datasource.DefaultDB().Table("u_sub_user").Where("imsi >= ? and imsi < ? and ne_id = ?", imsiV, imsiV+numV, neID).Delete()
if err != nil {
log.Errorf("Delete err => %v", err)
return results
}
return results

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

@@ -90,12 +90,12 @@ func (r *ServiceUdmAuthUser) InsertCSV(neID string, data []map[string]string) in
if s, ok := v["ki"]; ok {
authUser.Ki = s
}
if s, ok := v["amf"]; ok {
authUser.Amf = s
}
if s, ok := v["algo"]; ok {
authUser.AlgoIndex = s
}
if s, ok := v["amf"]; ok {
authUser.Amf = s
}
if s, ok := v["opc"]; ok {
authUser.Opc = s
}

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

@@ -137,6 +137,17 @@ func (r *ServiceUdmSubUser) InsertCSV(neID string, data []map[string]string) int
}
if s, ok := v["eps_dat"]; ok {
subUser.EpsDat = s
arr := strings.Split(s, ",")
if len(arr) == 9 {
subUser.EpsFlag = arr[0]
subUser.EpsOdb = arr[1]
subUser.HplmnOdb = arr[2]
subUser.Ard = arr[3]
subUser.Epstpl = arr[4]
subUser.ContextId = arr[5]
subUser.ApnContext = arr[7]
subUser.StaticIp = arr[8]
}
}
arr = append(arr, subUser)
}