old mode 100644
new mode 100755
| | |
|---|
| | | @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); |
|---|
| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @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); |
|---|
| | | } |
|---|
| | | } |
|---|
