diff --git a/Service/AlarmService.cs b/Service/AlarmService.cs index 7df44a2..41fc281 100644 --- a/Service/AlarmService.cs +++ b/Service/AlarmService.cs @@ -316,7 +316,7 @@ namespace LY.App.Service /// public async Task GetPage(AlarmReq input) { - var result = await CreatePage(input); + var result = await CreateHistoryPage(input); return new ApiResult() { code = 0, @@ -417,7 +417,6 @@ namespace LY.App.Service startTime = SqlFunc.AggregateMin(st.CreateTime), endTime = SqlFunc.AggregateMax(st.CreateTime), sn = st.serial_number, - Frequency = 0, duration = (SqlFunc.AggregateMax(st.CreateTime) - SqlFunc.AggregateMin(st.CreateTime)).TotalSeconds, model = st.device_type, IsWhitelist = SqlFunc.AggregateMax(st.IsWhitelist),