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

fix: 软件包上传更新替换文件路径不删除旧软件包文件

Browse Source
This commit is contained in:
TsMask
2025-08-29 17:24:13 +08:00
parent 3c7d24cfde
commit a760f8207a
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/network_element/controller/ne_software.go
View File

@@ -101,7 +101,7 @@ func (s NeSoftwareController) Add(c *gin.Context) {
}) })
if len(neSoftwares) > 0 { if len(neSoftwares) > 0 {
neSoftware := neSoftwares[0] neSoftware := neSoftwares[0]
s.neSoftwareService.DeleteByIds([]int64{neSoftware.ID}) s.neSoftwareService.DeleteByIds([]int64{neSoftware.ID}, false)
} }
// 检查属性值唯一 // 检查属性值唯一
@@ -183,7 +183,7 @@ func (s NeSoftwareController) Remove(c *gin.Context) {
ids = append(ids, parse.Number(v)) ids = append(ids, parse.Number(v))
} }
rows, err := s.neSoftwareService.DeleteByIds(ids) rows, err := s.neSoftwareService.DeleteByIds(ids, true)
if err != nil { if err != nil {
c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error()))) c.JSON(200, resp.ErrMsg(i18n.TKey(language, err.Error())))
return return

5
src/modules/network_element/service/ne_software.go
View File

@@ -87,7 +87,7 @@ func (r NeSoftware) Update(neSoftware model.NeSoftware) int64 {
} }
// DeleteByIds 批量删除信息 // DeleteByIds 批量删除信息
func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) { func (r NeSoftware) DeleteByIds(ids []int64, delFile bool) (int64, error) {
// 检查是否存在 // 检查是否存在
rows := r.neSoftwareRepository.SelectByIds(ids) rows := r.neSoftwareRepository.SelectByIds(ids)
if len(rows) <= 0 { if len(rows) <= 0 {
@@ -95,6 +95,7 @@ func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) {
} }
if len(rows) == len(ids) { if len(rows) == len(ids) {
if delFile {
// 遍历软件包列表进行文件删除 // 遍历软件包列表进行文件删除
for _, row := range rows { for _, row := range rows {
// 检查文件是否存在 // 检查文件是否存在
@@ -104,6 +105,8 @@ func (r NeSoftware) DeleteByIds(ids []int64) (int64, error) {
} }
os.Remove(filePath) os.Remove(filePath)
} }
}
rows := r.neSoftwareRepository.DeleteByIds(ids) rows := r.neSoftwareRepository.DeleteByIds(ids)
return rows, nil return rows, nil
} }