marge: 合并代码
This commit is contained in:
@@ -44,7 +44,7 @@ func (r *ServiceUdmAuthUser) List(authUser model.UdmAuthUser) []model.UdmAuthUse
|
||||
// imsi长度15,ki长度32,opc长度0或者32
|
||||
func (r *ServiceUdmAuthUser) Insert(neID string, authUser model.UdmAuthUser) int64 {
|
||||
authUser.NeID = neID
|
||||
authUser.Status = "1"
|
||||
authUser.Status = "0"
|
||||
return r.repoAuthUser.Insert(authUser)
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ func (r *ServiceUdmAuthUser) Inserts(neID string, authUser model.UdmAuthUser, nu
|
||||
}
|
||||
|
||||
authUser.NeID = neID
|
||||
authUser.Status = "1"
|
||||
authUser.Status = "0"
|
||||
for i := 0; i < numV; i++ {
|
||||
imsi := fmt.Sprint(imsiV + i)
|
||||
if len(imsi) < imsiVlen {
|
||||
@@ -83,22 +83,26 @@ func (r *ServiceUdmAuthUser) InsertCSV(neID string, data []map[string]string) in
|
||||
for _, v := range data {
|
||||
var authUser model.UdmAuthUser
|
||||
authUser.NeID = neID
|
||||
authUser.Status = "1"
|
||||
authUser.Status = "0"
|
||||
if s, ok := v["imsi"]; ok {
|
||||
authUser.Imsi = s
|
||||
}
|
||||
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
|
||||
}
|
||||
|
||||
if authUser.Imsi == "" {
|
||||
continue
|
||||
}
|
||||
arr = append(arr, authUser)
|
||||
}
|
||||
return r.repoAuthUser.Inserts(arr)
|
||||
@@ -113,7 +117,7 @@ func (r *ServiceUdmAuthUser) InsertTxt(neID string, data [][]string) int64 {
|
||||
}
|
||||
var authUser model.UdmAuthUser
|
||||
authUser.NeID = neID
|
||||
authUser.Status = "1"
|
||||
authUser.Status = "0"
|
||||
authUser.Imsi = v[0]
|
||||
authUser.Ki = v[1]
|
||||
authUser.AlgoIndex = v[2]
|
||||
@@ -121,6 +125,10 @@ func (r *ServiceUdmAuthUser) InsertTxt(neID string, data [][]string) int64 {
|
||||
if len(v) == 5 {
|
||||
authUser.Opc = v[4]
|
||||
}
|
||||
|
||||
if authUser.Imsi == "" {
|
||||
continue
|
||||
}
|
||||
arr = append(arr, authUser)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user