Merge branch 'wvp-28181-2.0' into feature/record

648540858

2023-12-26 07b182da98ac54fffa8f36b8db27d6212e1e0bf7

 src/main/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImpl.java

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