marge: 合并代码

features/udm_user/service/service_redis_data.go

@@ -37,6 +37,12 @@ func redisUdmAuthUserList() []model.UdmAuthUser {
 			continue
 		}
 
+		// 跳过-号数据
+		imsi := key[5:]
+		if strings.Contains(imsi, "-") {
+			continue
+		}
+
 		status := "0"
 		if _, ok := m["auth_success"]; ok {
 			status = "1"
@@ -46,7 +52,7 @@ func redisUdmAuthUserList() []model.UdmAuthUser {
 			amf = strings.Replace(v, "\r\n", "", 1)
 		}
 		a := model.UdmAuthUser{
-			Imsi:      key[5:],
+			Imsi:      imsi,
 			Amf:       amf,
 			Status:    status,
 			Ki:        m["ki"],
@@ -73,7 +79,7 @@ func redisUdmSubUserList() []model.UdmSubUser {
 
 		a := model.UdmSubUser{
 			Imsi:   key[7:],
-			Msisdn: strings.TrimPrefix(m["gpsi"], "86"),
+			Msisdn: m["gpsi"], // 46003550072 strings.TrimPrefix(m["gpsi"], "86"),
 			SmfSel: m["smf-sel"],
 			SmData: m["sm-dat"], // 1-000001&cmnet&ims&3gnet
 		}
@@ -90,8 +96,12 @@ func redisUdmSubUserList() []model.UdmSubUser {
 		}
 		// 1,64,24,65,def_eps,1,2,010200000000,-
 		if v, ok := m["eps-dat"]; ok {
-			a.EpsDat = v
 			arr := strings.Split(v, ",")
+			// 跳过非常规数据
+			if len(arr) > 9 {
+				continue
+			}
+			a.EpsDat = v
 			a.EpsFlag = arr[0]
 			a.EpsOdb = arr[1]
 			a.HplmnOdb = arr[2]
@@ -99,6 +109,7 @@ func redisUdmSubUserList() []model.UdmSubUser {
 			a.Epstpl = arr[4]
 			a.ContextId = arr[5]
 			a.ApnContext = arr[7]
+			// [6] 是不要的，导入和导出不用
 			a.StaticIp = arr[8]
 		}
 

features/udm_user/service/service_udm_auth_user.go

@@ -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)
 	}
 

features/udm_user/service/service_udm_sub_user.go

@@ -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)
 	}