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

feat: 更新多个模块以支持新的数据结构和日志格式

Browse Source
This commit is contained in:
TsMask
2025-02-20 10:08:27 +08:00
parent 045a2b6b01
commit f3c33b31ac
272 changed files with 13246 additions and 15885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/modules/trace/service/trace_task_hlr.go
View File

@@ -5,8 +5,8 @@ import (
"fmt"
"path/filepath"
"be.ems/src/framework/ssh"
"be.ems/src/framework/utils/date"
"be.ems/src/framework/utils/ssh"
neFetchlink "be.ems/src/modules/network_element/fetch_link"
neModel "be.ems/src/modules/network_element/model"
neService "be.ems/src/modules/network_element/service"
@@ -26,14 +26,14 @@ type TraceTaskHlr struct {
neInfoService *neService.NeInfo // 网元信息服务
}
// SelectPage 根据条件分页查询
func (r *TraceTaskHlr) SelectPage(querys model.TraceTaskHlrQuery) map[string]any {
return r.traceTaskHlrRepository.SelectPage(querys)
// FindByPage 根据条件分页查询
func (r *TraceTaskHlr) FindByPage(querys model.TraceTaskHlrQuery) ([]model.TraceTaskHlr, int64) {
return r.traceTaskHlrRepository.SelectByPage(querys)
}
// SelectById 通过ID查询
func (r *TraceTaskHlr) SelectById(id string) model.TraceTaskHlr {
tasks := r.traceTaskHlrRepository.SelectByIds([]string{id})
// FindById 通过ID查询
func (r *TraceTaskHlr) FindById(id int64) model.TraceTaskHlr {
tasks := r.traceTaskHlrRepository.SelectByIds([]int64{id})
if len(tasks) > 0 {
return tasks[0]
}
@@ -41,7 +41,7 @@ func (r *TraceTaskHlr) SelectById(id string) model.TraceTaskHlr {
}
// Insert 新增信息
func (r *TraceTaskHlr) Insert(task model.TraceTaskHlr) string {
func (r *TraceTaskHlr) Insert(task model.TraceTaskHlr) int64 {
return r.traceTaskHlrRepository.Insert(task)
}
@@ -51,7 +51,7 @@ func (r *TraceTaskHlr) Update(task model.TraceTaskHlr) int64 {
}
// DeleteByIds 批量删除信息
func (r *TraceTaskHlr) DeleteByIds(ids []string) (int64, error) {
func (r *TraceTaskHlr) DeleteByIds(ids []int64) (int64, error) {
// 检查是否存在
rows := r.traceTaskHlrRepository.SelectByIds(ids)
if len(rows) <= 0 {
@@ -60,7 +60,7 @@ func (r *TraceTaskHlr) DeleteByIds(ids []string) (int64, error) {
if len(rows) == len(ids) {
// 停止任务
neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false)
neInfos := r.neInfoService.Find(neModel.NeInfo{NeType: "HLR"}, false, false)
for _, r := range rows {
if r.Status == "0" {
continue
@@ -79,7 +79,7 @@ func (r *TraceTaskHlr) DeleteByIds(ids []string) (int64, error) {
}
// Start 创建任务
func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) {
func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (int64, error) {
hlrList := []map[string]any{}
traceId := r.traceTaskHlrRepository.LastID() + 1 // 生成任务ID < 65535
data := map[string]any{
@@ -88,7 +88,7 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) {
"msisdn": task.MSISDN,
}
if task.StartTime > task.EndTime {
return "", fmt.Errorf("startTime must less than endTime")
return 0, fmt.Errorf("startTime must less than endTime")
}
if task.StartTime > 0 {
data["startTime"] = date.ParseDateToStr(task.StartTime, date.YYYY_MM_DDTHH_MM_SSZ)
@@ -98,7 +98,7 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) {
}
// 发送创建任务
neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false)
neInfos := r.neInfoService.Find(neModel.NeInfo{NeType: "HLR"}, false, false)
for _, neInfo := range neInfos {
hlrItem := map[string]any{
"neType": neInfo.NeType,
@@ -119,8 +119,8 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) {
task.Status = "1"
task.TraceId = fmt.Sprint(traceId)
id := r.traceTaskHlrRepository.Insert(task)
if id == "" {
return "", fmt.Errorf("start task fail")
if id <= 0 {
return 0, fmt.Errorf("start task fail")
}
return id, nil
}
@@ -129,7 +129,7 @@ func (r *TraceTaskHlr) Start(task model.TraceTaskHlr) (string, error) {
func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error {
hlrList := []map[string]any{}
// 发送停止任务
neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false)
neInfos := r.neInfoService.Find(neModel.NeInfo{NeType: "HLR"}, false, false)
for _, neInfo := range neInfos {
hlrItem := map[string]any{
"neType": neInfo.NeType,
@@ -161,7 +161,7 @@ func (r *TraceTaskHlr) Stop(task model.TraceTaskHlr) error {
func (r *TraceTaskHlr) File(traceId, dirPath string) ([]map[string]any, error) {
hlrList := []map[string]any{}
// 查询所有匹配的网元类型
neInfos := r.neInfoService.SelectList(neModel.NeInfo{NeType: "HLR"}, false, false)
neInfos := r.neInfoService.Find(neModel.NeInfo{NeType: "HLR"}, false, false)
if len(neInfos) == 0 {
return nil, fmt.Errorf("not found network element")
}