From ad6e500df563825086f99d4349e7c7e0852c1e96 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 24 Aug 2023 16:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=9B=B4=E6=96=B0=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E7=9A=84alarm=20seq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handle/api/req_sync_alarm_msg.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/handle/api/req_sync_alarm_msg.go b/handle/api/req_sync_alarm_msg.go index 77f4b9a..0ec0007 100644 --- a/handle/api/req_sync_alarm_msg.go +++ b/handle/api/req_sync_alarm_msg.go @@ -51,19 +51,21 @@ func (s *ReqSyncAlarmMsg) Handle(request ziface.IRequest) { alarmSeq, err := strconv.Atoi(body.Data["alarmSeq"]) if err != nil || alarmSeq < 1 { - zlog.Ins().ErrorF("invalid parameter of message body") - request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultError(ReqSyncAlarmMsgName, "invalid parameter of message body", reqId)) + zlog.Ins().ErrorF("invalid alarmSeq of message body") + request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultError(ReqSyncAlarmMsgName, "invalid alarmSeq", reqId)) return } //check alarmSeq 是否存在 neBind, _ := parse.ConvertBindFlag(m.BindFlag) - alarms, _ := service.GetRealTimeAlarm(neBind.NeType, neBind.NeId, int32(alarmSeq)) - if len(alarms) == 0 { - request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultError(ReqSyncAlarmMsgName, "alarm seq does not exist", reqId)) + 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)) return } - //更新实时上报的alarm seq - m.UpdateAlarmSeq(int32(alarmSeq)) - request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultSuccess(ReqSyncAlarmMsgName, "ok", reqId)) + + zlog.Ins().ErrorF("not has of alarmSeq %d", alarmSeq) + request.GetConnection().SendMsg(ReqSyncAlarmMsgType, core.ResultError(ReqSyncAlarmMsgName, "alarmSeq does not exist", reqId)) }