1
0

marge: 合并代码

This commit is contained in:
TsMask
2023-11-13 18:28:13 +08:00
parent 6caf373ab5
commit 21a5e210eb
77 changed files with 1001 additions and 664 deletions

View File

@@ -83,7 +83,7 @@ func (r *ServiceUdmSubUser) Inserts(neID string, subUser model.UdmSubUser, num s
subUser.Imsi = imsi
// IP会自动递增
if subUser.StaticIp != "" {
if len(subUser.StaticIp) > 5 {
parts := strings.Split(subUser.StaticIp, ".")
lastPart := parts[3]
lastNum, _ := strconv.Atoi(lastPart)
@@ -93,6 +93,9 @@ func (r *ServiceUdmSubUser) Inserts(neID string, subUser model.UdmSubUser, num s
newIP := strings.Join(parts, ".")
subUser.StaticIp = newIP
}
subUser.EpsDat = fmt.Sprintf("%s,%s,%s,%s,%s,%s,2,%s,%s", subUser.EpsFlag, subUser.EpsOdb, subUser.HplmnOdb, subUser.Ard, subUser.Epstpl, subUser.ContextId, subUser.ApnContext, subUser.StaticIp)
arr = append(arr, subUser)
}
@@ -132,11 +135,26 @@ func (r *ServiceUdmSubUser) InsertCSV(neID string, data []map[string]string) int
if s, ok := v["smf_sel"]; ok {
subUser.SmfSel = s
}
if s, ok := v["sm_data"]; ok {
if s, ok := v["sm_dat"]; ok {
subUser.SmData = s
}
if s, ok := v["eps_dat"]; ok {
subUser.EpsDat = s
arr := strings.Split(s, ",")
if len(arr) == 8 {
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[6]
subUser.StaticIp = arr[7]
}
}
if subUser.Imsi == "" {
continue
}
arr = append(arr, subUser)
}
@@ -162,8 +180,20 @@ func (r *ServiceUdmSubUser) InsertTxt(neID string, data [][]string) int64 {
subUser.Cn = v[7]
subUser.SmfSel = v[8]
subUser.SmData = v[9]
if len(v) == 11 {
subUser.EpsDat = v[10]
if len(v) > 17 {
subUser.EpsFlag = v[10]
subUser.EpsOdb = v[11]
subUser.HplmnOdb = v[12]
subUser.Ard = v[13]
subUser.Epstpl = v[14]
subUser.ContextId = v[15]
subUser.ApnContext = v[16]
subUser.StaticIp = v[17]
subUser.EpsDat = strings.Join(v[10:], ",")
}
if subUser.Imsi == "" {
continue
}
arr = append(arr, subUser)
}