From eca1e05aeed3c51cce36bbce80c71bc3cbcea87d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 12 十一月 2021 14:40:39 +0800
Subject: [PATCH] 维护目录订阅消息与接口
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
index b1b62b1..434bbd4 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/alarm/AlarmController.java
@@ -60,7 +60,8 @@
@ApiImplicitParam(name="endTime", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
})
public ResponseEntity<PageInfo<DeviceAlarm>> getAll(
- int page, int count,
+ @RequestParam int page,
+ @RequestParam int count,
@RequestParam(required = false) String deviceId,
@RequestParam(required = false) String alarmPriority,
@RequestParam(required = false) String alarmMethod,
@@ -76,8 +77,8 @@
try {
- format.parse(startTime);
- format.parse(endTime);
+ if (startTime != null) format.parse(startTime);
+ if (endTime != null) format.parse(endTime);
} catch (ParseException e) {
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
}
@@ -96,7 +97,7 @@
* @param time 缁撴潫鏃堕棿(杩欎釜鏃堕棿涔嬪墠鐨勬姤璀︿細琚垹闄�)
* @return
*/
- @ApiOperation("鍒嗛〉鏌ヨ鎶ヨ")
+ @ApiOperation("鍒犻櫎鎶ヨ")
@DeleteMapping("/delete")
@ApiImplicitParams({
@ApiImplicitParam(name="id", value = "ID", required = false ,dataTypeClass = Integer.class),
@@ -118,12 +119,17 @@
} catch (ParseException e) {
return new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
}
- String[] deviceIdArray = deviceIds.split(",");
- List<String> deviceIdList = Arrays.asList(deviceIdArray);
- deviceAlarmService.clearAlarmBeforeTime(id, deviceIdList, time);
+ List<String> deviceIdList = null;
+ if (deviceIds != null) {
+ String[] deviceIdArray = deviceIds.split(",");
+ deviceIdList = Arrays.asList(deviceIdArray);
+ }
+
+ int count = deviceAlarmService.clearAlarmBeforeTime(id, deviceIdList, time);
WVPResult wvpResult = new WVPResult();
wvpResult.setCode(0);
wvpResult.setMsg("success");
+ wvpResult.setData(count);
return new ResponseEntity<WVPResult<String>>(wvpResult, HttpStatus.OK);
}
--
Gitblit v1.8.0