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

ref: v3变更,，同步v2.2508.4

Browse Source
This commit is contained in:
TsMask
2025-09-01 11:15:32 +08:00
parent 86dd22c274
commit 382bc311e6
198 changed files with 3768 additions and 3257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/modules/trace/service/trace_task.go
View File

@@ -216,14 +216,14 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error {
logger.Warnf("ne type id is error")
continue
}
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" {
logger.Warnf("ne type id is not exist")
neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(task.CoreUID, neTypeIDArr[1])
if neInfo.CoreUID != task.CoreUID || neInfo.NeUID != neTypeIDArr[1] {
logger.Warnf("ne uid is not exist")
continue
}
if err := r.traceNeTask(neInfo, *task); err != nil {
logger.Errorf("ne type id is %s to %s error: %s", task.TraceId, neTypeID, err.Error())
errNe = append(errNe, neTypeID)
logger.Errorf("ne uid is %s to %s error: %s", task.TraceId, neTypeIDArr[1], err.Error())
errNe = append(errNe, neTypeIDArr[1])
continue
}
}
@@ -234,10 +234,11 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error {
for _, neTypeID := range neList {
neTypeIDArr := strings.Split(neTypeID, "_")
if len(neTypeIDArr) != 2 {
logger.Warnf("ne type id is error")
continue
}
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" {
neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(task.CoreUID, neTypeIDArr[1])
if neInfo.CoreUID != task.CoreUID || neInfo.NeUID != neTypeIDArr[1] {
continue
}
neFetchlink.NeTraceDelete(neInfo, task.TraceId)
@@ -294,49 +295,51 @@ func (r TraceTask) traceNeTask(neInfo neModel.NeInfo, task model.TraceTask) erro
}
// DeleteByIds 批量删除信息
func (r TraceTask) DeleteByIds(ids []int64) (int64, error) {
func (r TraceTask) DeleteByIds(id int64, coreUid string) (int64, error) {
// 检查是否存在
rows := r.traceTaskRepository.SelectByIds(ids)
if len(rows) <= 0 {
rows := r.traceTaskRepository.SelectByIds([]int64{id})
if len(rows) != 1 {
return 0, fmt.Errorf("not data")
}
if len(rows) == len(ids) {
// 删除数据同时给网元发送停止任务
for _, v := range rows {
// 删除数据
r.traceDataRepository.DeleteByTraceId(v.TraceId)
for _, v := range rows {
if v.CoreUID != coreUid {
return 0, fmt.Errorf("data not match, id: %d", v.ID)
}
}
// 删除数据同时给网元发送停止任务
for _, v := range rows {
// 删除数据
r.traceDataRepository.DeleteByTraceId(v.TraceId)
// 网元列表
neList := strings.Split(v.NeList, ",")
if len(neList) <= 0 {
// 网元列表
neList := strings.Split(v.NeList, ",")
if len(neList) <= 0 {
continue
}
// 停止任务
for _, neTypeID := range neList {
neTypeIDArr := strings.Split(neTypeID, "_")
if len(neTypeIDArr) != 2 {
logger.Warnf("ne type id is error")
continue
}
// 停止任务
for _, neTypeID := range neList {
neTypeIDArr := strings.Split(neTypeID, "_")
if len(neTypeIDArr) != 2 {
continue
}
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" {
continue
}
neFetchlink.NeTraceDelete(neInfo, v.TraceId)
neInfo := neService.NewNeInfo.FindByCoreUidAndNeUid(v.CoreUID, neTypeIDArr[1])
if neInfo.CoreUID != v.CoreUID || neInfo.NeUID != neTypeIDArr[1] {
continue
}
neFetchlink.NeTraceDelete(neInfo, v.TraceId)
}
num := r.traceTaskRepository.DeleteByIds(ids)
return num, nil
}
// 删除信息失败！
return 0, fmt.Errorf("delete fail")
num := r.traceTaskRepository.DeleteByIds([]int64{id})
return num, nil
}
// RunUnstopped 启动跟踪未停止的任务
func (r TraceTask) RunUnstopped(neType string, neId string) {
neStr := fmt.Sprintf("%s_%s", neType, neId)
tasks := r.traceTaskRepository.SelectByUnstopped(neStr)
func (r TraceTask) RunUnstopped(coreUid, neUid string) {
tasks := r.traceTaskRepository.SelectByUnstopped(coreUid, neUid)
for _, task := range tasks {
r.createTaskToNe(&task, true)
}