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

feat: 网元信令跟踪代码同步，解决开关切换异常错误问题

Browse Source
This commit is contained in:
TsMask
2025-06-10 18:55:13 +08:00
parent 9dad7d43e6
commit 5ccd1fd267
14 changed files with 370 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,22 +22,25 @@ import (
// 实例化数据层 TraceTask 结构体
var NewTraceTask = &TraceTask{
udpService: socket.SocketUDP{},
tcpService: socket.SocketTCP{},
traceTaskRepository: repository.NewTraceTask,
traceDataRepository: repository.NewTraceData,
}
// TraceTask 跟踪任务 服务层处理
type TraceTask struct {
// UDP服务对象
udpService socket.SocketUDP
// 跟踪_任务数据信息
traceTaskRepository *repository.TraceTask
// 跟踪_数据信息
traceDataRepository *repository.TraceData
udpService socket.SocketUDP // UDP服务对象
tcpService socket.SocketTCP // 测试用，后续调整TODO
traceTaskRepository *repository.TraceTask // 跟踪_任务数据信息
traceDataRepository *repository.TraceData // 跟踪_数据信息
}
// CreateUDP 创建UDP数据通道
func (r TraceTask) CreateUDP() error {
func (r *TraceTask) CreateUDP(reload bool) error {
if reload {
r.CloseUDP() // 关闭之前的UDP服务
}
// 跟踪配置是否开启
host, port, err := r.traceNotify()
if err != nil {
@@ -84,12 +87,12 @@ func (r TraceTask) CreateUDP() error {
// ============ 本地测试接收网元UDP发过来的数据 后续调整TODO
if config.Env() == "local" {
// 初始化TCP服务
tcpService := socket.SocketTCP{Addr: host, Port: port + 1}
if _, err := tcpService.New(); err != nil {
r.tcpService = socket.SocketTCP{Addr: host, Port: port + 1}
if _, err := r.tcpService.New(); err != nil {
return err
}
// 接收处理TCP数据
go tcpService.Resolve(func(conn *net.Conn, err error) {
go r.tcpService.Resolve(func(conn *net.Conn, err error) {
if err != nil {
logger.Errorf("TCP Resolve %s", err.Error())
return
@@ -125,7 +128,7 @@ func (r TraceTask) CreateUDP() error {
}
// pasreUDPData 解析数据
func (r TraceTask) pasreUDPData(buf []byte) error {
func (r *TraceTask) pasreUDPData(buf []byte) error {
data, err := traceHandler(buf)
if err != nil {
logger.Errorf("UDP Resolve UDPDataHandler Error: %s", err.Error())
@@ -157,8 +160,9 @@ func (r TraceTask) pasreUDPData(buf []byte) error {
}
// CloseUDP 关闭UDP数据通道
func (r TraceTask) CloseUDP() {
func (r *TraceTask) CloseUDP() {
r.udpService.Close()
r.tcpService.Close()
}
// FindByPage 根据条件分页查询
@@ -202,8 +206,9 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error {
return fmt.Errorf("ne list is empty")
}
// 生成任务ID
traceId := r.traceTaskRepository.LastID() + 1 // 生成任务ID < 65535
task.TraceId = fmt.Sprint(traceId)
if task.TraceId == "" {
task.TraceId = fmt.Sprint(r.traceTaskRepository.LastID() + 1) // 生成任务ID < 65535
}
// 发送任务给网元
errNe := []string{}
@@ -213,7 +218,7 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error {
logger.Warnf("ne type id is error")
continue
}
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" {
logger.Warnf("ne type id is not exist")
continue
@@ -233,7 +238,7 @@ func (r TraceTask) createTaskToNe(task *model.TraceTask, ignoreErr bool) error {
if len(neTypeIDArr) != 2 {
continue
}
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" {
continue
}
@@ -315,7 +320,7 @@ func (r TraceTask) DeleteByIds(ids []int64) (int64, error) {
if len(neTypeIDArr) != 2 {
continue
}
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(neTypeIDArr[0], neTypeIDArr[1])
if neInfo.NeType != neTypeIDArr[0] || neInfo.IP == "" {
continue
}
@@ -331,8 +336,9 @@ func (r TraceTask) DeleteByIds(ids []int64) (int64, error) {
}
// RunUnstopped 启动跟踪未停止的任务
func (r TraceTask) RunUnstopped() {
tasks := r.traceTaskRepository.SelectByUnstopped()
func (r TraceTask) RunUnstopped(neType string, neId string) {
neStr := fmt.Sprintf("%s_%s", neType, neId)
tasks := r.traceTaskRepository.SelectByUnstopped(neStr)
for _, task := range tasks {
r.createTaskToNe(&task, true)
}