OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 文件操作csv/txt文件函数名修改

Browse Source
This commit is contained in:
TsMask
2024-03-18 10:56:53 +08:00
parent d20dc98123
commit 17718d5cdd
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
features/udm_user/api_udm_user.go
View File

@@ -516,7 +516,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err := file.WriterCSVFile(data, filePath)
err := file.WriterFileCSV(data, filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -530,7 +530,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err = file.WriterTxtFile(data, filePath)
err = file.WriterFileTXT(data, ",", filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -597,12 +597,12 @@ func (s *UdmUserApi) UdmAuthUserImport(w http.ResponseWriter, r *http.Request) {
// 命令ok时
if strings.Contains(data, "ok") {
if strings.HasSuffix(fileHeader.Filename, ".csv") {
data := file.ReadCSVFile(localPath)
data := file.ReadFileCSV(localPath)
neId = ""
go s.authUser.InsertCSV(neId, data)
}
if strings.HasSuffix(fileHeader.Filename, ".txt") {
data := file.ReadTxtFile(localPath)
data := file.ReadFileTXT(",", localPath)
neId = ""
go s.authUser.InsertTxt(neId, data)
}
@@ -1116,7 +1116,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
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)
err = file.WriterFileCSV(data, filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -1131,7 +1131,7 @@ func (s *UdmUserApi) UdmSubUserExport(w http.ResponseWriter, r *http.Request) {
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)
err = file.WriterFileTXT(data, ",", filePath)
if err != nil {
ctx.JSON(w, 200, result.ErrMsg(err.Error()))
return
@@ -1197,12 +1197,12 @@ func (s *UdmUserApi) UdmSubUserImport(w http.ResponseWriter, r *http.Request) {
// 命令ok时
if strings.Contains(data, "ok") {
if strings.HasSuffix(fileHeader.Filename, ".csv") {
data := file.ReadCSVFile(localPath)
data := file.ReadFileCSV(localPath)
neId = ""
go s.subUser.InsertCSV(neId, data)
}
if strings.HasSuffix(fileHeader.Filename, ".txt") {
data := file.ReadTxtFile(localPath)
data := file.ReadFileTXT(",", localPath)
neId = ""
go s.subUser.InsertTxt(neId, data)
}

4
src/framework/utils/file/csv.go
View File

@@ -15,7 +15,7 @@ import (
// data = append(data, []string{"姓名", "年龄", "城市"})
// data = append(data, []string{"1", "2", "3"})
// err := file.WriterCSVFile(data, filePath)
func WriterCSVFile(data [][]string, filePath string) error {
func WriterFileCSV(data [][]string, filePath string) error {
// 获取文件所在的目录路径
dirPath := filepath.Dir(filePath)
@@ -44,7 +44,7 @@ func WriterCSVFile(data [][]string, filePath string) error {
}
// 读取CSV文件，转换map数据
func ReadCSVFile(filePath string) []map[string]string {
func ReadFileCSV(filePath string) []map[string]string {
// 创建 map 存储 CSV 数据
arr := make([]map[string]string, 0)

21
src/framework/utils/file/txt.go
View File

@@ -10,13 +10,14 @@ import (
"be.ems/src/framework/logger"
)
// 写入Txt文件用,号分割 需要转换数据
// WriterFileTXT 写入txt文件 sep 分割符号 需要转换数据
//
// 例如：
// data := [][]string{}
// data = append(data, []string{"姓名", "年龄", "城市"})
// data = append(data, []string{"1", "2", "3"})
// err := file.WriterCSVFile(data, filePath)
func WriterTxtFile(data [][]string, filePath string) error {
// err := file.WriterFileTXT(data, filePath)
func WriterFileTXT(data [][]string, sep string, filePath string) error {
// 获取文件所在的目录路径
dirPath := filepath.Dir(filePath)
@@ -36,7 +37,7 @@ func WriterTxtFile(data [][]string, filePath string) error {
// 创建一个 Writer 对象，用于将数据写入文件
writer := bufio.NewWriter(file)
for _, row := range data {
line := strings.Join(row, ",")
line := strings.Join(row, sep)
fmt.Fprintln(writer, line)
}
@@ -49,15 +50,15 @@ func WriterTxtFile(data [][]string, filePath string) error {
return nil
}
// 读取Txt文件，用,号分割 转换数组数据
func ReadTxtFile(filePath string) [][]string {
// 创建 map 存储 CSV 数据
// ReadFileTXT 读取Txt文件，sep 分割符号 转换数组数据
func ReadFileTXT(sep string, filePath string) [][]string {
// 创建 map 存储数据
arr := make([][]string, 0)
// 打开文本文件
file, err := os.Open(filePath)
if err != nil {
logger.Errorf("ReadTxtFile Open %v", err)
logger.Errorf("OpenFile Open %v", err)
return arr
}
defer file.Close()
@@ -65,13 +66,13 @@ func ReadTxtFile(filePath string) [][]string {
// 创建一个 Scanner 对象，用于逐行读取文件内容
scanner := bufio.NewScanner(file)
if scanner.Err() != nil {
logger.Errorf("ReadTxtFile NewScanner %v", scanner.Err())
logger.Errorf("OpenFile NewScanner %v", scanner.Err())
return arr
}
for scanner.Scan() {
line := scanner.Text()
fields := strings.Split(line, ",")
fields := strings.Split(line, sep)
arr = append(arr, fields)
}

8
src/modules/network_element/controller/udm_auth.go
View File

@@ -376,7 +376,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err := file.WriterCSVFile(data, filePath)
err := file.WriterFileCSV(data, filePath)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -390,7 +390,7 @@ func (s *UDMAuthController) Export(c *gin.Context) {
data = append(data, []string{v.Imsi, v.Ki, v.AlgoIndex, v.Amf, v.Opc})
}
// 输出到文件
err = file.WriterTxtFile(data, filePath)
err = file.WriterFileTXT(data, ",", filePath)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -457,12 +457,12 @@ func (s *UDMAuthController) Import(c *gin.Context) {
// 命令ok时
if strings.Contains(data, "ok") {
if strings.HasSuffix(fileName, ".csv") {
data := file.ReadCSVFile(localPath)
data := file.ReadFileCSV(localPath)
neId = ""
go s.udmAuthService.InsertCSV(neId, data)
}
if strings.HasSuffix(fileName, ".txt") {
data := file.ReadTxtFile(localPath)
data := file.ReadFileTXT(",", localPath)
neId = ""
go s.udmAuthService.InsertTxt(neId, data)
}

8
src/modules/network_element/controller/udm_sub.go
View File

@@ -453,7 +453,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
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)
err = file.WriterFileCSV(data, filePath)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -468,7 +468,7 @@ func (s *UDMSubController) Export(c *gin.Context) {
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)
err = file.WriterFileTXT(data, ",", filePath)
if err != nil {
c.JSON(200, result.ErrMsg(err.Error()))
return
@@ -535,12 +535,12 @@ func (s *UDMSubController) Import(c *gin.Context) {
// 命令ok时
if strings.Contains(data, "ok") {
if strings.HasSuffix(fileName, ".csv") {
data := file.ReadCSVFile(localPath)
data := file.ReadFileCSV(localPath)
neId = ""
go s.udmSubService.InsertCSV(neId, data)
}
if strings.HasSuffix(fileName, ".txt") {
data := file.ReadTxtFile(localPath)
data := file.ReadFileTXT(",", localPath)
neId = ""
go s.udmSubService.InsertTxt(neId, data)
}