feat: 更新多个模块以支持新的数据结构和日志格式
This commit is contained in:
1 parent
045a2b6b01
commit
f3c33b31ac
272 files changed
+13153
-15792
No files matched your search
@@ -176,14 +176,14 @@ func (r *TraceTask) CloseUDP() {
|
||||
r.udpService.Close()
|
||||
}
|
||||
|
||||
// SelectPage 根据条件分页查询
|
||||
func (r *TraceTask) SelectPage(query map[string]any) map[string]any {
|
||||
return r.traceTaskRepository.SelectPage(query)
|
||||
// FindByPage 根据条件分页查询
|
||||
func (r *TraceTask) FindByPage(query map[string]string) ([]model.TraceTask, int64) {
|
||||
return r.traceTaskRepository.SelectByPage(query)
|
||||
}
|
||||
|
||||
// SelectById 通过ID查询
|
||||
func (r *TraceTask) SelectById(id string) model.TraceTask {
|
||||
tasks := r.traceTaskRepository.SelectByIds([]string{id})
|
||||
// FindById 通过ID查询
|
||||
func (r *TraceTask) FindById(id int64) model.TraceTask {
|
||||
tasks := r.traceTaskRepository.SelectByIds([]int64{id})
|
||||
if len(tasks) > 0 {
|
||||
return tasks[0]
|
||||
}
|
||||
@@ -209,7 +209,7 @@ func (r *TraceTask) Insert(task model.TraceTask) error {
|
||||
task.NotifyUrl = fmt.Sprintf("udp:%s:%d", host, port)
|
||||
|
||||
// 查询网元获取IP
|
||||
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(task.NeType, task.NeId)
|
||||
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(task.NeType, task.NeId)
|
||||
if neInfo.NeId != task.NeId || neInfo.IP == "" {
|
||||
return fmt.Errorf("app.common.noNEInfo")
|
||||
}
|
||||
@@ -274,7 +274,7 @@ func (r *TraceTask) Update(task model.TraceTask) error {
|
||||
task.NotifyUrl = fmt.Sprintf("udp:%s:%d", host, port)
|
||||
|
||||
// 查询网元获取IP
|
||||
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(task.NeType, task.NeId)
|
||||
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(task.NeType, task.NeId)
|
||||
if neInfo.NeId != task.NeId || neInfo.IP == "" {
|
||||
return fmt.Errorf("app.common.noNEInfo")
|
||||
}
|
||||
@@ -319,7 +319,7 @@ func (r *TraceTask) Update(task model.TraceTask) error {
|
||||
}
|
||||
|
||||
// DeleteByIds 批量删除信息
|
||||
func (r *TraceTask) DeleteByIds(ids []string) (int64, error) {
|
||||
func (r *TraceTask) DeleteByIds(ids []int64) (int64, error) {
|
||||
// 检查是否存在
|
||||
rows := r.traceTaskRepository.SelectByIds(ids)
|
||||
if len(rows) <= 0 {
|
||||
@@ -329,7 +329,7 @@ func (r *TraceTask) DeleteByIds(ids []string) (int64, error) {
|
||||
if len(rows) == len(ids) {
|
||||
// 停止任务
|
||||
for _, v := range rows {
|
||||
neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(v.NeType, v.NeId)
|
||||
neInfo := neService.NewNeInfo.FindByNeTypeAndNeID(v.NeType, v.NeId)
|
||||
if neInfo.NeId != v.NeId || neInfo.IP == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user