fix: UDM签约导入eps_dat原来的第六位不要

This commit is contained in:
TsMask
2023-11-09 10:19:02 +08:00
parent 32c812f2a3
commit 9b23cfed11
4 changed files with 12 additions and 8 deletions

View File

@@ -1104,7 +1104,8 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
data := [][]string{}
data = append(data, []string{"imsi", "msisdn", "ambr", "nssai", "arfb", "sar", "rat", "cn", "smf_sel", "sm_dat", "eps_dat"})
for _, v := range list {
data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
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)
@@ -1118,7 +1119,8 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
// 转换数据
data := [][]string{}
for _, v := range list {
data = append(data, []string{v.Imsi, v.Msisdn, v.Ambr, v.Nssai, v.Arfb, v.Sar, v.Rat, v.Cn, v.SmfSel, v.SmData, v.EpsDat})
epsDat := fmt.Sprintf("%s,%s,%s,%s,%s,%s,%s,%s", v.EpsFlag, v.EpsOdb, v.HplmnOdb, v.Ard, v.Epstpl, v.ContextId, v.ApnContext, v.StaticIp)
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)

View File

@@ -109,6 +109,7 @@ func redisUdmSubUserList() []model.UdmSubUser {
a.Epstpl = arr[4]
a.ContextId = arr[5]
a.ApnContext = arr[7]
// [6] 是不要的,导入和导出不用
a.StaticIp = arr[8]
}

View File

@@ -141,15 +141,15 @@ 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 {
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[7]
subUser.StaticIp = arr[8]
subUser.ApnContext = arr[6]
subUser.StaticIp = arr[7]
}
}
@@ -180,15 +180,15 @@ func (r *ServiceUdmSubUser) InsertTxt(neID string, data [][]string) int64 {
subUser.Cn = v[7]
subUser.SmfSel = v[8]
subUser.SmData = v[9]
if len(v) > 18 {
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[17]
subUser.StaticIp = v[18]
subUser.ApnContext = v[16]
subUser.StaticIp = v[17]
subUser.EpsDat = strings.Join(v[10:], ",")
}

View File

@@ -94,6 +94,7 @@ cors:
- "X-Requested-With"
- "Content-Type"
- "Content-Language"
- "Accept-Language:"
- "Accept"
- "Range"
- "Accesstoken"