From 4ba0e3c13e7d40199d611d220f894e3164839259 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 九月 2023 09:14:48 +0800
Subject: [PATCH] Merge pull request #1077 from binban/fix-use-source-ip-as-stream-ip
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java
old mode 100644
new mode 100755
index 0567b55..8c55986
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java
@@ -17,7 +17,6 @@
@Autowired
private DeviceAlarmMapper deviceAlarmMapper;
-
@Override
public PageInfo<DeviceAlarm> getAllAlarm(int page, int count, String deviceId, String alarmPriority, String alarmMethod, String alarmType, String startTime, String endTime) {
PageHelper.startPage(page, count);
@@ -31,7 +30,7 @@
}
@Override
- public void clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time) {
- deviceAlarmMapper.clearAlarmBeforeTime(id, deviceIdList, time);
+ public int clearAlarmBeforeTime(Integer id, List<String> deviceIdList, String time) {
+ return deviceAlarmMapper.clearAlarmBeforeTime(id, deviceIdList, time);
}
}
--
Gitblit v1.8.0