marge: 合并代码，包名变更be.ems

src/modules/network_element/controller/ne_action.go

@@ -5,13 +5,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"ems.agt/src/framework/config"
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/file"
-	"ems.agt/src/framework/utils/ssh"
-	"ems.agt/src/framework/vo/result"
-	neService "ems.agt/src/modules/network_element/service"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/file"
+	"be.ems/src/framework/utils/ssh"
+	"be.ems/src/framework/vo/result"
+	neService "be.ems/src/modules/network_element/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 )
@@ -23,7 +22,7 @@ var NewNeAction = &NeActionController{
 
 // 网元处理请求
 //
-// PATH /
+// PATH /action
 type NeActionController struct {
 	// 网元信息服务
 	neInfoService neService.INeInfo
@@ -53,7 +52,7 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 
 	// 本地文件
 	localPath := file.ParseUploadFilePath(body.UploadPath)
-	nePath := config.Get("mml.upload").(string)
+	nePath := "/tmp" //config.Get("mml.upload").(string)
 	// 复制到远程
 	err := ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
 	if err != nil {
@@ -67,7 +66,7 @@ func (s *NeActionController) PushFile(c *gin.Context) {
 	c.JSON(200, result.OkData(filepath.ToSlash(neFilePath)))
 }
 
-// 从网元端获取文件
+// 获取文件从网元到本地
 //
 // GET /pullFile
 func (s *NeActionController) PullFile(c *gin.Context) {

src/modules/network_element/controller/ne_host.go

@@ -0,0 +1,356 @@
+package controller
+
+import (
+	"strings"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/ssh"
+	"be.ems/src/framework/utils/telnet"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+)
+
+// 实例化控制层 NeHostController 结构体
+var NewNeHost = &NeHostController{
+	neHostService: neService.NewNeHostImpl,
+}
+
+// 网元主机连接请求
+//
+// PATH /host
+type NeHostController struct {
+	// 网元主机连接服务
+	neHostService neService.INeHost
+}
+
+// 网元主机列表
+//
+// GET /list
+func (s *NeHostController) List(c *gin.Context) {
+	querys := ctx.QueryMap(c)
+	data := s.neHostService.SelectPage(querys)
+
+	rows := data["rows"].([]model.NeHost)
+	arr := &rows
+	for i := range *arr {
+		(*arr)[i].Password = "-"
+		(*arr)[i].PrivateKey = "-"
+		(*arr)[i].PassPhrase = "-"
+	}
+
+	c.JSON(200, result.Ok(data))
+}
+
+// 网元主机信息
+//
+// GET /:hostId
+func (s *NeHostController) Info(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	hostId := c.Param("hostId")
+	if hostId == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	neHost := s.neHostService.SelectById(hostId)
+	if neHost.HostID != hostId {
+		// 没有可访问主机信息数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.noData")))
+		return
+	}
+
+	c.JSON(200, result.OkData(neHost))
+}
+
+// 网元主机新增
+//
+// POST /
+func (s *NeHostController) Add(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeHost
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.HostID != "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueHost := s.neHostService.CheckUniqueHostTitle(body.GroupID, body.Title, body.HostType, "")
+	if !uniqueHost {
+		// 主机信息操作【%s】失败，同组内名称已存在
+		msg := i18n.TTemplate(language, "neHost.errKeyExists", map[string]any{"name": body.Title})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	body.CreateBy = ctx.LoginUserToUserName(c)
+	insertId := s.neHostService.Insert(body)
+	if insertId != "" {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元主机修改
+//
+// PUT /
+func (s *NeHostController) Edit(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeHost
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.HostID == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueHost := s.neHostService.CheckUniqueHostTitle(body.GroupID, body.Title, body.HostType, body.HostID)
+	if !uniqueHost {
+		// 主机信息操作【%s】失败，同组内名称已存在
+		msg := i18n.TTemplate(language, "neHost.errKeyExists", map[string]any{"name": body.Title})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	// 检查是否存在
+	neHost := s.neHostService.SelectById(body.HostID)
+	if neHost.HostID != body.HostID {
+		// 没有可访问主机信息数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.noData")))
+		return
+	}
+
+	body.UpdateBy = ctx.LoginUserToUserName(c)
+	rows := s.neHostService.Update(body)
+	if rows > 0 {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元主机删除
+//
+// DELETE /:hostIds
+func (s *NeHostController) Remove(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	hostIds := c.Param("hostIds")
+	if hostIds == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 处理字符转id数组后去重
+	ids := strings.Split(hostIds, ",")
+	uniqueIDs := parse.RemoveDuplicates(ids)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, result.Err(nil))
+		return
+	}
+	rows, err := s.neHostService.DeleteByIds(uniqueIDs)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, result.OkMsg(msg))
+}
+
+// 网元主机测试连接
+//
+// POST /test
+func (s *NeHostController) Test(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeHost
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	if body.HostType == "ssh" {
+		var connSSH ssh.ConnSSH
+		body.CopyTo(&connSSH)
+
+		client, err := connSSH.NewClient()
+		if err != nil {
+			// 连接主机失败，请检查连接参数后重试
+			c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
+			return
+		}
+		defer client.Close()
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+
+	if body.HostType == "telnet" {
+		var connTelnet telnet.ConnTelnet
+		body.CopyTo(&connTelnet)
+
+		client, err := connTelnet.NewClient()
+		if err != nil {
+			// 连接主机失败，请检查连接参数后重试
+			c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
+			return
+		}
+		defer client.Close()
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+}
+
+// 网元主机发送命令
+//
+// POST /cmd
+func (s *NeHostController) Cmd(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body struct {
+		HostID string `json:"hostId" binding:"required"` // 主机ID
+		Cmd    string `json:"cmd" binding:"required"`    // 执行命令
+	}
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查是否存在
+	neHost := s.neHostService.SelectById(body.HostID)
+	if neHost.HostID != body.HostID {
+		// 没有可访问主机信息数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.noData")))
+		return
+	}
+
+	if neHost.HostType == "ssh" {
+		var connSSH ssh.ConnSSH
+		neHost.CopyTo(&connSSH)
+
+		client, err := connSSH.NewClient()
+		if err != nil {
+			// 连接主机失败，请检查连接参数后重试
+			c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
+			return
+		}
+		defer client.Close()
+
+		// 执行命令
+		output, err := client.RunCMD(body.Cmd)
+		if err != nil {
+			c.JSON(200, result.ErrMsg(err.Error()))
+			return
+		}
+		c.JSON(200, result.OkData(output))
+		return
+	}
+
+	if neHost.HostType == "telnet" {
+		var connTelnet telnet.ConnTelnet
+		neHost.CopyTo(&connTelnet)
+
+		client, err := connTelnet.NewClient()
+		if err != nil {
+			// 连接主机失败，请检查连接参数后重试
+			c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
+			return
+		}
+		defer client.Close()
+
+		// 执行命令
+		output, err := client.RunCMD(body.Cmd)
+		if err != nil {
+			c.JSON(200, result.ErrMsg(err.Error()))
+			return
+		}
+		c.JSON(200, result.OkData(output))
+		return
+	}
+}
+
+// 网元主机SSH方式检查服务器环境
+//
+// POST /checkBySSH
+func (s *NeHostController) CheckBySSH(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeHost
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	var connSSH ssh.ConnSSH
+	body.CopyTo(&connSSH)
+
+	// 创建链接SSH客户端
+	client, err := connSSH.NewClient()
+	if err != nil {
+		// 连接主机失败，请检查连接参数后重试
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHost.errByHostInfo")))
+		return
+	}
+	defer client.Close()
+
+	// 结果信息数据
+	data := map[string]any{
+		"addr":          body.Addr, // 服务器地址
+		"kernelName":    "-",       // 内核名称 -s
+		"nodename":      "-",       // 网络节点主机名 -n
+		"kernelRelease": "-",       // 内核发布版本 -r
+		"machine":       "-",       // 机器硬件名称 -m
+		"prettyName":    "-",       // 系统发行版本
+		"sudo":          false,     // 可提权
+		"sshLink":       false,     // 可直连
+	}
+
+	// 执行命令 检查系统环境
+	output, err := client.RunCMD("uname -snrm && cat /etc/os-release | grep PRETTY_NAME")
+	if err != nil {
+		c.JSON(200, result.OkData(data))
+		return
+	}
+	output = strings.TrimSuffix(output, "\n")
+	sysInfoArr := strings.SplitN(output, "\n", 2)
+	if len(sysInfoArr) == 2 {
+		// uname -snrm
+		baseInfoArr := strings.SplitN(sysInfoArr[0], " ", 4)
+		data["kernelName"] = baseInfoArr[0]
+		data["nodename"] = baseInfoArr[1]
+		data["kernelRelease"] = baseInfoArr[2]
+		data["machine"] = baseInfoArr[3]
+		// cat /etc/os-release | grep PRETTY_NAME
+		prettyName := sysInfoArr[1]
+		index := strings.Index(prettyName, `"`)
+		if index != -1 {
+			data["prettyName"] = prettyName[index+1 : len(prettyName)-1]
+		}
+	}
+	// 执行命令 检查sudo权限
+	_, err = client.RunCMD("sudo -n uname")
+	if err == nil {
+		data["sudo"] = true
+	} else {
+		data["sudo"] = false
+	}
+
+	// 本地免密创建链接直连
+	lcoalConnSSH := ssh.ConnSSH{
+		User: body.User,
+		Addr: body.Addr,
+		Port: body.Port,
+	}
+	lcoalClient, err := lcoalConnSSH.NewClientByLocalPrivate()
+	if err == nil {
+		data["sshLink"] = true
+	} else {
+		data["sshLink"] = false
+	}
+	defer lcoalClient.Close()
+
+	c.JSON(200, result.OkData(data))
+}

src/modules/network_element/controller/ne_host_cmd.go

@@ -0,0 +1,152 @@
+package controller
+
+import (
+	"strings"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+)
+
+// 实例化控制层 NeHostCmdController 结构体
+var NewNeHostCmd = &NeHostCmdController{
+	neHostCmdService: neService.NewNeHostCmdImpl,
+}
+
+// 网元主机命令请求
+//
+// PATH /hostCmd
+type NeHostCmdController struct {
+	// 网元主机命令服务
+	neHostCmdService neService.INeHostCmd
+}
+
+// 网元主机命令列表
+//
+// GET /list
+func (s *NeHostCmdController) List(c *gin.Context) {
+	querys := ctx.QueryMap(c)
+	data := s.neHostCmdService.SelectPage(querys)
+
+	c.JSON(200, result.Ok(data))
+}
+
+// 网元主机命令信息
+//
+// GET /:cmdId
+func (s *NeHostCmdController) Info(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	cmdId := c.Param("cmdId")
+	if cmdId == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	neHost := s.neHostCmdService.SelectById(cmdId)
+	if neHost.CmdID != cmdId {
+		// 没有可访问主机命令数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHostCmd.noData")))
+		return
+	}
+
+	c.JSON(200, result.OkData(neHost))
+}
+
+// 网元主机命令新增
+//
+// POST /
+func (s *NeHostCmdController) Add(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeHostCmd
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.CmdID != "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueHostCmd := s.neHostCmdService.CheckUniqueGroupTitle(body.GroupID, body.Title, body.CmdType, "")
+	if !uniqueHostCmd {
+		// 主机命令操作【%s】失败，同组内名称已存在
+		msg := i18n.TTemplate(language, "neHostCmd.errKeyExists", map[string]any{"name": body.Title})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	body.CreateBy = ctx.LoginUserToUserName(c)
+	insertId := s.neHostCmdService.Insert(body)
+	if insertId != "" {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元主机命令修改
+//
+// PUT /
+func (s *NeHostCmdController) Edit(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeHostCmd
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.CmdID == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueHostCmd := s.neHostCmdService.CheckUniqueGroupTitle(body.GroupID, body.Title, body.CmdType, body.CmdID)
+	if !uniqueHostCmd {
+		// 主机命令操作【%s】失败，同组内名称已存在
+		msg := i18n.TTemplate(language, "neHostCmd.errKeyExists", map[string]any{"name": body.Title})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	// 检查是否存在
+	neHost := s.neHostCmdService.SelectById(body.CmdID)
+	if neHost.CmdID != body.CmdID {
+		// 没有可访问主机命令数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neHostCmd.noData")))
+		return
+	}
+
+	body.UpdateBy = ctx.LoginUserToUserName(c)
+	rows := s.neHostCmdService.Update(body)
+	if rows > 0 {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元主机命令删除
+//
+// DELETE /:cmdIds
+func (s *NeHostCmdController) Remove(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	cmdIds := c.Param("cmdIds")
+	if cmdIds == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 处理字符转id数组后去重
+	ids := strings.Split(cmdIds, ",")
+	uniqueIDs := parse.RemoveDuplicates(ids)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, result.Err(nil))
+		return
+	}
+	rows, err := s.neHostCmdService.DeleteByIds(uniqueIDs)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, result.OkMsg(msg))
+}

src/modules/network_element/controller/ne_info.go

@@ -2,15 +2,17 @@ package controller
 
 import (
 	"fmt"
+	"strings"
 	"sync"
 
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/parse"
-	"ems.agt/src/framework/vo/result"
-	"ems.agt/src/modules/network_element/model"
-	neService "ems.agt/src/modules/network_element/service"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
 	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 NeInfoController 结构体
@@ -30,10 +32,10 @@ type NeInfoController struct {
 var neStateCacheMap sync.Map
 var mutex sync.Mutex
 
-// 网元状态
+// 网元信息状态
 //
 // GET /state
-func (s *NeInfoController) NeState(c *gin.Context) {
+func (s *NeInfoController) State(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var querys struct {
 		NeType string `form:"neType" binding:"required"`
@@ -82,32 +84,23 @@ func (s *NeInfoController) NeState(c *gin.Context) {
 	c.JSON(200, result.OkData(resData))
 }
 
-// 网元neType和neID查询
-//
-// GET /info
-func (s *NeInfoController) NeTypeAndID(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	var querys struct {
-		NeType string `form:"neType" binding:"required"`
-		NeID   string `form:"neId" binding:"required"`
-	}
-	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-		return
-	}
-
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	c.JSON(200, result.OkData(neInfo))
-}
-
-// 网元列表
+// 网元信息列表
 //
 // GET /list
-func (s *NeInfoController) NeList(c *gin.Context) {
+func (s *NeInfoController) List(c *gin.Context) {
+	querys := ctx.QueryMap(c)
+	bandStatus := false
+	if v, ok := querys["bandStatus"]; ok && v != nil {
+		bandStatus = parse.Boolean(v)
+	}
+	data := s.neInfoService.SelectPage(querys, bandStatus)
+	c.JSON(200, result.Ok(data))
+}
+
+// 网元信息列表全部无分页
+//
+// GET /listAll
+func (s *NeInfoController) ListAll(c *gin.Context) {
 	language := ctx.AcceptLanguage(c)
 	var querys struct {
 		NeType     string `form:"neType"`
@@ -128,10 +121,173 @@ func (s *NeInfoController) NeList(c *gin.Context) {
 		ne.NeId = querys.NeId
 	}
 	bandStatus := parse.Boolean(querys.BandStatus)
-	neList := s.neInfoService.SelectNeList(ne, bandStatus)
+	neList := s.neInfoService.SelectList(ne, bandStatus)
 	if len(neList) == 0 {
 		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
 		return
 	}
 	c.JSON(200, result.OkData(neList))
 }
+
+// 网元信息
+//
+// GET /:infoId
+func (s *NeInfoController) Info(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	infoId := c.Param("infoId")
+	if infoId == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	neHost := s.neInfoService.SelectById(infoId, true)
+	if neHost.ID != infoId {
+		// 没有可访问网元信息数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neInfo.noData")))
+		return
+	}
+
+	c.JSON(200, result.OkData(neHost))
+}
+
+// 网元neType和neID查询
+//
+// GET /
+func (s *NeInfoController) NeTypeAndID(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var querys struct {
+		NeType string `form:"neType" binding:"required"`
+		NeID   string `form:"neId" binding:"required"`
+	}
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
+	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
+		return
+	}
+	c.JSON(200, result.OkData(neInfo))
+}
+
+// 网元信息新增
+//
+// POST /
+func (s *NeInfoController) Add(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeInfo
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.ID != "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueInfo := s.neInfoService.CheckUniqueNeTypeAndNeId(body.NeType, body.NeId, "")
+	if !uniqueInfo {
+		// 网元信息操作【%s】失败，同类型下标识已存在
+		msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeId})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	// 获取网元状态是否正常
+	_, err = neService.NeState(body)
+	if err != nil {
+		body.Status = "1"
+	} else {
+		// 下发网管配置信息给网元
+		_, err = neService.NeConfigOMC(body)
+		if err == nil {
+			body.Status = "0"
+		} else {
+			body.Status = "3"
+		}
+	}
+
+	insertId := s.neInfoService.Insert(body)
+	if insertId != "" {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元信息修改
+//
+// PUT /
+func (s *NeInfoController) Edit(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeInfo
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.ID == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueHostCmd := s.neInfoService.CheckUniqueNeTypeAndNeId(body.NeType, body.NeId, body.ID)
+	if !uniqueHostCmd {
+		// 网元信息操作【%s】失败，同类型下标识已存在
+		msg := i18n.TTemplate(language, "neInfo.errKeyExists", map[string]any{"key": body.NeId})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	// 检查是否存在
+	neInfo := s.neInfoService.SelectById(body.ID, false)
+	if neInfo.ID != body.ID {
+		// 没有可访问网元信息数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neInfo.noData")))
+		return
+	}
+
+	// 获取网元状态是否正常
+	_, err = neService.NeState(body)
+	if err != nil {
+		body.Status = "1"
+	} else {
+		// 下发网管配置信息给网元
+		_, err = neService.NeConfigOMC(body)
+		if err == nil {
+			body.Status = "0"
+		} else {
+			body.Status = "3"
+		}
+	}
+
+	rows := s.neInfoService.Update(body)
+	if rows > 0 {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元信息删除
+//
+// DELETE /:infoIds
+func (s *NeInfoController) Remove(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	infoIds := c.Param("infoIds")
+	if infoIds == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 处理字符转id数组后去重
+	ids := strings.Split(infoIds, ",")
+	uniqueIDs := parse.RemoveDuplicates(ids)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, result.Err(nil))
+		return
+	}
+	rows, err := s.neInfoService.DeleteByIds(uniqueIDs)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, result.OkMsg(msg))
+}

src/modules/network_element/controller/ne_software.go

@@ -0,0 +1,180 @@
+package controller
+
+import (
+	"strings"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+)
+
+// 实例化控制层 NeSoftwareController 结构体
+var NewNeSoftware = &NeSoftwareController{
+	neSoftwareService: neService.NewNeSoftwareImpl,
+}
+
+// 网元软件包信息请求
+//
+// PATH /software
+type NeSoftwareController struct {
+	// 网元软件包信息服务
+	neSoftwareService neService.INeSoftware
+}
+
+// 网元软件包信息列表
+//
+// GET /list
+func (s *NeSoftwareController) List(c *gin.Context) {
+	querys := ctx.QueryMap(c)
+	data := s.neSoftwareService.SelectPage(querys)
+
+	c.JSON(200, result.Ok(data))
+}
+
+// 网元软件包信息信息
+//
+// GET /:softwareId
+func (s *NeSoftwareController) Info(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	softwareId := c.Param("softwareId")
+	if softwareId == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	neSoftware := s.neSoftwareService.SelectById(softwareId)
+	if neSoftware.ID != softwareId {
+		// 没有可访问网元版本数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neSoftware.noData")))
+		return
+	}
+
+	c.JSON(200, result.OkData(neSoftware))
+}
+
+// 网元软件包信息新增
+//
+// POST /
+func (s *NeSoftwareController) Add(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeSoftware
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.ID != "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueSoftware := s.neSoftwareService.CheckUniqueTypeAndFileNameAndVersion(body.NeType, body.FileName, body.Version, "")
+	if !uniqueSoftware {
+		// 网元软件包操作【%s】失败，网元类型与文件名版本已存在
+		msg := i18n.TTemplate(language, "neSoftware.errKeyExists", map[string]any{"name": body.FileName})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	insertId := s.neSoftwareService.Insert(body)
+	if insertId != "" {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元软件包信息修改
+//
+// PUT /
+func (s *NeSoftwareController) Edit(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeSoftware
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.ID == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueSoftware := s.neSoftwareService.CheckUniqueTypeAndFileNameAndVersion(body.NeType, body.FileName, body.Version, body.ID)
+	if !uniqueSoftware {
+		// 网元软件包操作【%s】失败，网元类型与文件名版本已存在
+		msg := i18n.TTemplate(language, "neSoftware.errKeyExists", map[string]any{"name": body.FileName})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	// 检查是否存在
+	neSoftware := s.neSoftwareService.SelectById(body.ID)
+	if neSoftware.ID != body.ID {
+		// 没有可访问网元版本数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neSoftware.noData")))
+		return
+	}
+
+	rows := s.neSoftwareService.Update(body)
+	if rows > 0 {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元软件包信息删除
+//
+// DELETE /:softwareIds
+func (s *NeSoftwareController) Remove(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	softwareIds := c.Param("softwareIds")
+	if softwareIds == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 处理字符转id数组后去重
+	ids := strings.Split(softwareIds, ",")
+	uniqueIDs := parse.RemoveDuplicates(ids)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, result.Err(nil))
+		return
+	}
+	rows, err := s.neSoftwareService.DeleteByIds(uniqueIDs)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, result.OkMsg(msg))
+}
+
+// 网元软件包安装
+//
+// POST /install
+func (s *NeSoftwareController) Install(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeSoftware
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查是否存在
+	neSoftwares := s.neSoftwareService.SelectList(body)
+	if len(neSoftwares) == 0 {
+		// 没有可访问网元版本数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neSoftware.noData")))
+		return
+	}
+	neSoftware := neSoftwares[0]
+
+	// 进行安装
+	output, err := s.neSoftwareService.Install(neSoftware)
+	if err != nil {
+		c.JSON(200, result.OkData(output))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}

src/modules/network_element/controller/ne_version.go

@@ -0,0 +1,150 @@
+package controller
+
+import (
+	"strings"
+
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
+	"github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin/binding"
+)
+
+// 实例化控制层 NeVersionController 结构体
+var NewNeVersion = &NeVersionController{
+	neVersionService: neService.NewNeVersionImpl,
+}
+
+// 网元版本信息请求
+//
+// PATH /version
+type NeVersionController struct {
+	// 网元版本信息服务
+	neVersionService neService.INeVersion
+}
+
+// 网元版本信息列表
+//
+// GET /list
+func (s *NeVersionController) List(c *gin.Context) {
+	querys := ctx.QueryMap(c)
+	data := s.neVersionService.SelectPage(querys)
+
+	c.JSON(200, result.Ok(data))
+}
+
+// 网元版本信息信息
+//
+// GET /:versionId
+func (s *NeVersionController) Info(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	versionId := c.Param("versionId")
+	if versionId == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	neVersion := s.neVersionService.SelectById(versionId)
+	if neVersion.ID != versionId {
+		// 没有可访问网元版本数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neVersion.noData")))
+		return
+	}
+
+	c.JSON(200, result.OkData(neVersion))
+}
+
+// 网元版本信息新增
+//
+// POST /
+func (s *NeVersionController) Add(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeVersion
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.ID != "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueInfo := s.neVersionService.CheckUniqueTypeAndID(body.NeType, body.NeId, "")
+	if !uniqueInfo {
+		// 网元版本操作【%s】失败，网元类型信息已存在
+		msg := i18n.TTemplate(language, "neVersion.errKeyExists", map[string]any{"name": body.NeType})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	insertId := s.neVersionService.Insert(body)
+	if insertId != "" {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元版本信息修改
+//
+// PUT /
+func (s *NeVersionController) Edit(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	var body model.NeVersion
+	err := c.ShouldBindBodyWith(&body, binding.JSON)
+	if err != nil || body.ID == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+
+	// 检查属性值唯一
+	uniqueInfo := s.neVersionService.CheckUniqueTypeAndID(body.NeType, body.NeId, body.ID)
+	if !uniqueInfo {
+		// 网元版本操作【%s】失败，网元类型信息已存在
+		msg := i18n.TTemplate(language, "neVersion.errKeyExists", map[string]any{"name": body.NeType})
+		c.JSON(200, result.ErrMsg(msg))
+		return
+	}
+
+	// 检查是否存在
+	neVersion := s.neVersionService.SelectById(body.ID)
+	if neVersion.ID != body.ID {
+		// 没有可访问网元版本数据！
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, "neVersion.noData")))
+		return
+	}
+
+	rows := s.neVersionService.Update(body)
+	if rows > 0 {
+		c.JSON(200, result.Ok(nil))
+		return
+	}
+	c.JSON(200, result.Err(nil))
+}
+
+// 网元版本信息删除
+//
+// DELETE /:versionIds
+func (s *NeVersionController) Remove(c *gin.Context) {
+	language := ctx.AcceptLanguage(c)
+	versionIds := c.Param("versionIds")
+	if versionIds == "" {
+		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
+		return
+	}
+	// 处理字符转id数组后去重
+	ids := strings.Split(versionIds, ",")
+	uniqueIDs := parse.RemoveDuplicates(ids)
+	if len(uniqueIDs) <= 0 {
+		c.JSON(200, result.Err(nil))
+		return
+	}
+	rows, err := s.neVersionService.DeleteByIds(uniqueIDs)
+	if err != nil {
+		c.JSON(200, result.ErrMsg(i18n.TKey(language, err.Error())))
+		return
+	}
+	msg := i18n.TTemplate(language, "app.common.deleteSuccess", map[string]any{"num": rows})
+	c.JSON(200, result.OkMsg(msg))
+}

src/modules/network_element/controller/perf_kpi.go

@@ -1,77 +0,0 @@
-package controller
-
-import (
-	"ems.agt/lib/core/utils/date"
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/vo/result"
-	"ems.agt/src/modules/network_element/model"
-	neService "ems.agt/src/modules/network_element/service"
-	"github.com/gin-gonic/gin"
-)
-
-// 实例化控制层 PerfKPIController 结构体
-var NewPerfKPI = &PerfKPIController{
-	neInfoService:  neService.NewNeInfoImpl,
-	perfKPIService: neService.NewPerfKPIImpl,
-}
-
-// 性能统计
-//
-// PATH /kpi
-type PerfKPIController struct {
-	// 网元信息服务
-	neInfoService neService.INeInfo
-	// 统计信息服务
-	perfKPIService neService.IPerfKPI
-}
-
-// 获取统计数据
-//
-// GET /data
-func (s *PerfKPIController) GoldKPI(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	var querys model.GoldKPIQuery
-	if err := c.ShouldBindQuery(&querys); err != nil {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-		return
-	}
-
-	// 时间格式校验
-	startTime := date.ParseStrToDate(querys.StartTime, date.YYYY_MM_DD_HH_MM_SS)
-	if startTime.IsZero() {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-	}
-	endTime := date.ParseStrToDate(querys.EndTime, date.YYYY_MM_DD_HH_MM_SS)
-	if endTime.IsZero() {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-	}
-
-	// 查询网元获取IP
-	neInfo := s.neInfoService.SelectNeInfoByNeTypeAndNeID(querys.NeType, querys.NeID)
-	if neInfo.NeId != querys.NeID || neInfo.IP == "" {
-		c.JSON(200, result.ErrMsg(i18n.TKey(language, "app.common.noNEInfo")))
-		return
-	}
-	querys.RmUID = neInfo.RmUID
-
-	// 查询数据
-	kpiData := s.perfKPIService.SelectGoldKPI(querys)
-	c.JSON(200, result.OkData(kpiData))
-}
-
-// 获取统计标题
-//
-// GET /title
-func (s *PerfKPIController) Title(c *gin.Context) {
-	language := ctx.AcceptLanguage(c)
-	neType := c.Query("neType")
-	if neType == "" {
-		c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400")))
-		return
-	}
-
-	kpiTitles := s.perfKPIService.SelectGoldKPITitle(neType)
-
-	c.JSON(200, result.OkData(kpiTitles))
-}

src/modules/network_element/controller/udm_auth.go

@@ -5,17 +5,16 @@ import (
 	"strings"
 	"time"
 
-	mmlclient "ems.agt/lib/core/mml_client"
-	"ems.agt/src/framework/config"
-	"ems.agt/src/framework/constants/uploadsubpath"
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/file"
-	"ems.agt/src/framework/utils/parse"
-	"ems.agt/src/framework/utils/ssh"
-	"ems.agt/src/framework/vo/result"
-	"ems.agt/src/modules/network_element/model"
-	neService "ems.agt/src/modules/network_element/service"
+	mmlclient "be.ems/lib/core/mml_client"
+	"be.ems/src/framework/constants/uploadsubpath"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/file"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/ssh"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 )
@@ -377,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
@@ -391,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
@@ -437,7 +436,7 @@ func (s *UDMAuthController) Import(c *gin.Context) {
 
 	// 本地文件
 	localPath := file.ParseUploadFilePath(upFilePath)
-	nePath := config.Get("mml.upload").(string)
+	nePath := "/tmp" //config.Get("mml.upload").(string)
 	// 复制到远程
 	err = ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
 	if err != nil {
@@ -458,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)
 		}

src/modules/network_element/controller/udm_sub.go

@@ -6,17 +6,16 @@ import (
 	"strings"
 	"time"
 
-	mmlclient "ems.agt/lib/core/mml_client"
-	"ems.agt/src/framework/config"
-	"ems.agt/src/framework/constants/uploadsubpath"
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/file"
-	"ems.agt/src/framework/utils/parse"
-	"ems.agt/src/framework/utils/ssh"
-	"ems.agt/src/framework/vo/result"
-	"ems.agt/src/modules/network_element/model"
-	neService "ems.agt/src/modules/network_element/service"
+	mmlclient "be.ems/lib/core/mml_client"
+	"be.ems/src/framework/constants/uploadsubpath"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/file"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/utils/ssh"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 )
@@ -454,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
@@ -469,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
@@ -515,7 +514,7 @@ func (s *UDMSubController) Import(c *gin.Context) {
 
 	// 本地文件
 	localPath := file.ParseUploadFilePath(upFilePath)
-	nePath := config.Get("mml.upload").(string)
+	nePath := "/tmp" //config.Get("mml.upload").(string)
 	// 复制到远程
 	err = ssh.FileSCPLocalToNe(neInfo.IP, localPath, nePath)
 	if err != nil {
@@ -536,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)
 		}