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

fix: 网元版本信息变更属性注释等

Browse Source
This commit is contained in:
TsMask
2024-04-01 17:01:35 +08:00
parent 91f4db75f1
commit 1d1c58475c
3 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/network_element/controller/ne_version.go
View File

@@ -78,6 +78,7 @@ func (s *NeVersionController) Add(c *gin.Context) {
return return
} }
body.CreateBy = ctx.LoginUserToUserName(c)
insertId := s.neVersionService.Insert(body) insertId := s.neVersionService.Insert(body)
if insertId != "" { if insertId != "" {
c.JSON(200, result.Ok(nil)) c.JSON(200, result.Ok(nil))
@@ -115,6 +116,7 @@ func (s *NeVersionController) Edit(c *gin.Context) {
return return
} }
body.UpdateBy = ctx.LoginUserToUserName(c)
rows := s.neVersionService.Update(body) rows := s.neVersionService.Update(body)
if rows > 0 { if rows > 0 {
c.JSON(200, result.Ok(nil)) c.JSON(200, result.Ok(nil))

27
src/modules/network_element/model/ne_version.go
View File

@@ -1,20 +1,21 @@
package model package model
import "time"
// NeVersion 网元版本信息 ne_version // NeVersion 网元版本信息 ne_version
type NeVersion struct { type NeVersion struct {
ID string `json:"id" gorm:"id"` ID string `json:"id" gorm:"id"`
NeType string `json:"neType" gorm:"ne_type" binding:"required"` // 网元类型 NeType string `json:"neType" gorm:"ne_type" binding:"required"` // 网元类型
NeId string `json:"neId" gorm:"ne_id" binding:"required"` // 网元ID NeId string `json:"neId" gorm:"ne_id" binding:"required"` // 网元ID
Version string `json:"version" gorm:"version"` // 当前版本 Version string `json:"version" gorm:"version" binding:"required"` // 当前版本
FilePath string `json:"filePath" gorm:"file_path"` // 当前软件包 Path string `json:"path" gorm:"path" binding:"required"` // 当前软件包
PreVersion string `json:"preVersion" gorm:"pre_version"` // 上一版本 PreVersion string `json:"preVersion" gorm:"pre_version"` // 上一版本
PreFile string `json:"preFile" gorm:"pre_file"` // 上一版本软件包 PrePath string `json:"prePath" gorm:"pre_path"` // 上一版本软件包
NewVersion string `json:"newVersion" gorm:"new_version"` // 下一版本 NewVersion string `json:"newVersion" gorm:"new_version"` // 下一版本
NewFile string `json:"newFile" gorm:"new_file"` // 下一版本软件包 NewPath string `json:"newPath" gorm:"new_path"` // 下一版本软件包
Status string `json:"status" gorm:"status" binding:"oneof=Uploaded Inactive Active"` // 当前状态 (Uploaded下一版本上传 Inactive下一版本待激活 Active当前已激活) Status string `json:"status" gorm:"status"` // 当前状态 (Uploaded下一版本上传 Inactive下一版本待激活 Active当前已激活)
UpdateTime time.Time `json:"updateTime" gorm:"update_time"` // 更新时间 CreateBy string `json:"createBy" gorm:"column:create_by"` // 创建者
CreateTime int64 `json:"createTime" gorm:"column:create_time"` // 创建时间
UpdateBy string `json:"updateBy" gorm:"column:update_by"` // 更新者
UpdateTime int64 `json:"updateTime" gorm:"column:update_time"` // 更新时间
} }
// TableName 表名称 // TableName 表名称

53
src/modules/network_element/repository/ne_version.impl.go
View File

@@ -15,7 +15,7 @@ import (
// 实例化数据层 NewNeVersion 结构体 // 实例化数据层 NewNeVersion 结构体
var NewNeVersionImpl = &NeVersionImpl{ var NewNeVersionImpl = &NeVersionImpl{
selectSql: `select selectSql: `select
id, ne_type, ne_id, version, file_path, pre_version, pre_file, new_version, new_file, status, update_time id, ne_type, ne_id, version, path, pre_version, pre_path, new_version, new_path, status, create_by, create_time, update_by, update_time
from ne_version`, from ne_version`,
resultMap: map[string]string{ resultMap: map[string]string{
@@ -23,12 +23,15 @@ var NewNeVersionImpl = &NeVersionImpl{
"ne_type": "NeType", "ne_type": "NeType",
"ne_id": "NeId", "ne_id": "NeId",
"version": "Version", "version": "Version",
"file_path": "FilePath", "path": "Path",
"pre_version": "PreVersion", "pre_version": "PreVersion",
"pre_file": "PreFile", "pre_path": "PrePath",
"new_version": "NewVersion", "new_version": "NewVersion",
"new_file": "NewFile", "new_path": "NewPath",
"status": "Status", "status": "Status",
"create_by": "CreateBy",
"create_time": "CreateTime",
"update_by": "UpdateBy",
"update_time": "UpdateTime", "update_time": "UpdateTime",
}, },
} }
@@ -139,9 +142,9 @@ func (r *NeVersionImpl) SelectList(neVersion model.NeVersion) []model.NeVersion
conditions = append(conditions, "version like concat(?, '%')") conditions = append(conditions, "version like concat(?, '%')")
params = append(params, neVersion.Version) params = append(params, neVersion.Version)
} }
if neVersion.FilePath != "" { if neVersion.Path != "" {
conditions = append(conditions, "file_path like concat(?, '%')") conditions = append(conditions, "path like concat(?, '%')")
params = append(params, neVersion.FilePath) params = append(params, neVersion.Path)
} }
// 构建查询条件语句 // 构建查询条件语句
@@ -151,7 +154,7 @@ func (r *NeVersionImpl) SelectList(neVersion model.NeVersion) []model.NeVersion
} }
// 查询数据 // 查询数据
querySql := r.selectSql + whereSql + " order by update_time asc " querySql := r.selectSql + whereSql + " order by id asc "
results, err := datasource.RawDB("", querySql, params) results, err := datasource.RawDB("", querySql, params)
if err != nil { if err != nil {
logger.Errorf("query err => %v", err) logger.Errorf("query err => %v", err)
@@ -223,25 +226,28 @@ func (r *NeVersionImpl) Insert(neVersion model.NeVersion) string {
if neVersion.Version != "" { if neVersion.Version != "" {
params["version"] = neVersion.Version params["version"] = neVersion.Version
} }
if neVersion.FilePath != "" { if neVersion.Path != "" {
params["file_path"] = neVersion.FilePath params["path"] = neVersion.Path
} }
if neVersion.PreVersion != "" { if neVersion.PreVersion != "" {
params["pre_version"] = neVersion.PreVersion params["pre_version"] = neVersion.PreVersion
} }
if neVersion.PreFile != "" { if neVersion.PrePath != "" {
params["pre_file"] = neVersion.PreFile params["pre_path"] = neVersion.PrePath
} }
if neVersion.NewVersion != "" { if neVersion.NewVersion != "" {
params["new_version"] = neVersion.NewVersion params["new_version"] = neVersion.NewVersion
} }
if neVersion.NewFile != "" { if neVersion.NewPath != "" {
params["new_file"] = neVersion.NewFile params["new_path"] = neVersion.NewPath
} }
if neVersion.Status != "" { if neVersion.Status != "" {
params["status"] = neVersion.Status params["status"] = neVersion.Status
} }
params["update_time"] = time.Now() if neVersion.CreateBy != "" {
params["create_by"] = neVersion.CreateBy
params["create_time"] = time.Now().UnixMilli()
}
// 构建执行语句 // 构建执行语句
keys, placeholder, values := repo.KeyPlaceholderValueByInsert(params) keys, placeholder, values := repo.KeyPlaceholderValueByInsert(params)
@@ -283,25 +289,28 @@ func (r *NeVersionImpl) Update(neVersion model.NeVersion) int64 {
if neVersion.Version != "" { if neVersion.Version != "" {
params["version"] = neVersion.Version params["version"] = neVersion.Version
} }
if neVersion.FilePath != "" { if neVersion.Path != "" {
params["file_path"] = neVersion.FilePath params["path"] = neVersion.Path
} }
if neVersion.PreVersion != "" { if neVersion.PreVersion != "" {
params["pre_version"] = neVersion.PreVersion params["pre_version"] = neVersion.PreVersion
} }
if neVersion.PreFile != "" { if neVersion.PrePath != "" {
params["pre_file"] = neVersion.PreFile params["pre_path"] = neVersion.PrePath
} }
if neVersion.NewVersion != "" { if neVersion.NewVersion != "" {
params["new_version"] = neVersion.NewVersion params["new_version"] = neVersion.NewVersion
} }
if neVersion.NewFile != "" { if neVersion.NewPath != "" {
params["new_file"] = neVersion.NewFile params["new_path"] = neVersion.NewPath
} }
if neVersion.Status != "" { if neVersion.Status != "" {
params["status"] = neVersion.Status params["status"] = neVersion.Status
} }
params["update_time"] = time.Now() if neVersion.UpdateBy != "" {
params["update_by"] = neVersion.UpdateBy
params["update_time"] = time.Now().UnixMilli()
}
// 构建执行语句 // 构建执行语句
keys, values := repo.KeyValueByUpdate(params) keys, values := repo.KeyValueByUpdate(params)