From b1b3f47f3eeff8536b1a2851781da0b04f346fef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:04:14 +0800
Subject: [PATCH] Merge branch 'wxr1215' into dev
---
HDL_ON/DAL/Server/HttpServerRequest.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index f6355cb..2cfcd7d 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -2643,12 +2643,14 @@
/// </summary>
/// <param name="deviceId"></param>
/// <returns></returns>
- public ResponsePackNew GetAlarmRecords(string deviceId,string alarmType = "PROWLER_ALARM")
+ public ResponsePackNew GetAlarmRecords(string deviceId, int pageSize, int pageNo, string alarmType = "PROWLER_ALARM")
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
d.Add("deviceId", deviceId);
d.Add("alarmType", alarmType);
+ d.Add("pageSize", pageSize);
+ d.Add("pageNo", pageNo);
var requestJson = HttpUtil.GetSignRequestJson(d);
var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_ALARM_RECORDS, requestJson);
return pack;
--
Gitblit v1.8.0