OMC/nbi_alarm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

读取消息大于1000的over

Browse Source
This commit is contained in:
TsMask
2023-08-24 19:10:46 +08:00
parent e73135400d
commit 02a2dd7a7a
5 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
handle/api/req_sync_alarm_file.go
View File

@@ -5,6 +5,8 @@ import (
"omc/core"
"omc/core/manage"
"omc/core/parse"
"omc/handle/service"
"strconv"
"github.com/aceld/zinx/ziface"
"github.com/aceld/zinx/zlog"
@@ -43,8 +45,9 @@ func (s *ReqSyncAlarmFile) Handle(request ziface.IRequest) {
fmt.Println(endTime)
}
alarmSeq, alarmSeqOk := body.Data["alarmSeq"]
if alarmSeqOk {
if !alarmSeqOk {
fmt.Println(alarmSeq)
alarmSeq = "0"
}
syncSource, syncSourceOk := body.Data["syncSource"]
if syncSourceOk {
@@ -67,5 +70,25 @@ func (s *ReqSyncAlarmFile) Handle(request ziface.IRequest) {
return
}
// 同步的消息序号
seq, err := strconv.Atoi(alarmSeq)
if err != nil {
seq = 0
}
//check alarmSeq 是否存在
neBind, _ := parse.ConvertBindFlag(m.BindFlag)
alarmSeqCount := service.AlarmSeqCount(neBind.NeType, neBind.NeId, int64(seq))
if alarmSeqCount > 0 {
request.GetConnection().SendMsg(ReqSyncAlarmFileResultType, core.Result(ReqSyncAlarmFileResultName, map[string]string{
"reqId": reqId,
"result": "succ",
"resDesc": "ok",
"fileName": "/ftproot/GD/WX/HW/JS_OMC2/FM/20150611/ FM-OMC-1A-V1.1.0-20150611011603-001.txt",
}))
return
}
request.GetConnection().SendMsg(ReqSyncAlarmFileType, core.ResultSuccess(ReqSyncAlarmFileName, "ok", reqId))
}

14
handle/api/req_sync_alarm_msg.go
View File

@@ -58,11 +58,15 @@ func (s *ReqSyncAlarmMsg) Handle(request ziface.IRequest) {
//check alarmSeq 是否存在
neBind, _ := parse.ConvertBindFlag(m.BindFlag)
has := service.HasAlarmSeq(neBind.NeType, neBind.NeId, int64(alarmSeq))
if has {
// 发送更新上报的alarm seq
m.UpdateAlarmSeq(int64(alarmSeq))
request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultSuccess(ReqSyncAlarmMsgName, "ok", reqId))
alarmSeqCount := service.AlarmSeqCount(neBind.NeType, neBind.NeId, int64(alarmSeq))
if alarmSeqCount > 0 {
if alarmSeqCount > 1000 {
request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultError(ReqSyncAlarmMsgName, "over 1000 rows", reqId))
} else {
// 发送更新上报的alarm seq
m.UpdateAlarmSeq(int64(alarmSeq))
request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultSuccess(ReqSyncAlarmMsgName, "ok", reqId))
}
return
}