From 7527e90af0920f39a0a5a483a4bca069ee0ffc77 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 12 Sep 2023 17:25:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20UDM=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=A1=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 features/udm_user/api_udm_user.go            |  7 +++++--
 features/udm_user/repo/repo_udm_sub_user.go  | 18 ++++++++++--------
 features/udm_user/service/service_ne_ifno.go | 15 ---------------
 3 files changed, 15 insertions(+), 25 deletions(-)
 delete mode 100644 features/udm_user/service/service_ne_ifno.go

diff --git a/features/udm_user/api_udm_user.go b/features/udm_user/api_udm_user.go
index 4a70b0de..bf48fe3e 100644
--- a/features/udm_user/api_udm_user.go
+++ b/features/udm_user/api_udm_user.go
@@ -187,6 +187,9 @@ func NeInfoByUDM(neId string) (*dborm.NeInfo, error) {
 		log.Error("dborm.XormGetNeInfo is failed:", err)
 		return nil, err
 	}
+	if neInfo.Ip == "" {
+		return nil, fmt.Errorf("ne_info not IP")
+	}
 	return neInfo, nil
 }
 
@@ -963,7 +966,7 @@ func (s *UdmUserApi) UdmSubUserRemoves(w http.ResponseWriter, r *http.Request) {
 
 	// 命令ok时
 	if strings.Contains(data, "ok") {
-		s.authUser.Deletes(neId, imsi, num)
+		s.subUser.Deletes(neId, imsi, num)
 	}
 	ctx.JSON(w, 200, result.OkData(data))
 }
@@ -1041,7 +1044,7 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
 	// 命令ok时
 	if strings.Contains(data, "ok") {
 		data := file.ReadCSVFile(filePath)
-		s.authUser.InsertCSV(neId, data)
+		s.subUser.InsertCSV(neId, data)
 	}
 	// ctx.JSON(w, 200, result.OkData(data))
 	ctx.FileAttachment(w, r, filePath, fileName)
diff --git a/features/udm_user/repo/repo_udm_sub_user.go b/features/udm_user/repo/repo_udm_sub_user.go
index 3e72953a..406c7d97 100644
--- a/features/udm_user/repo/repo_udm_sub_user.go
+++ b/features/udm_user/repo/repo_udm_sub_user.go
@@ -210,14 +210,16 @@ func (r *RepoUdmSubUser) Inserts(neID string, subUser model.UdmSubUser, num stri
 		subUser.Imsi = fmt.Sprint(imsiV + i)
 		subUser.Msisdn = fmt.Sprint(msisdnV + i)
 		// IP会自动递增
-		parts := strings.Split(subUser.StaticIp, ".")
-		lastPart := parts[3]
-		lastNum, _ := strconv.Atoi(lastPart)
-		lastNum += i
-		newLastPart := strconv.Itoa(lastNum)
-		parts[3] = newLastPart
-		newIP := strings.Join(parts, ".")
-		subUser.StaticIp = newIP
+		if subUser.StaticIp != "" {
+			parts := strings.Split(subUser.StaticIp, ".")
+			lastPart := parts[3]
+			lastNum, _ := strconv.Atoi(lastPart)
+			lastNum += i
+			newLastPart := strconv.Itoa(lastNum)
+			parts[3] = newLastPart
+			newIP := strings.Join(parts, ".")
+			subUser.StaticIp = newIP
+		}
 		results, err := datasource.DefaultDB().Table("u_sub_user").Insert(subUser)
 		if err == nil {
 			insertNum += results
diff --git a/features/udm_user/service/service_ne_ifno.go b/features/udm_user/service/service_ne_ifno.go
deleted file mode 100644
index 0299fb6f..00000000
--- a/features/udm_user/service/service_ne_ifno.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package service
-
-import (
-	"ems.agt/lib/dborm"
-	"ems.agt/lib/log"
-)
-
-func UDMNeInfo(neId string) (*dborm.NeInfo, error) {
-	neInfo, err := dborm.XormGetNeInfo("UDM", neId)
-	if err != nil {
-		log.Error("dborm.XormGetNeInfo is failed:", err)
-		return nil, err
-	}
-	return neInfo, nil
-}