From 3a502b36a8cfcdd455edb22e5771115559873731 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期日, 10 五月 2020 22:33:21 +0800
Subject: [PATCH] 完善ssrc符合国标，并完善很多小问题
---
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
index c115dd0..5b947c9 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java
@@ -31,17 +31,18 @@
@Autowired
private DeferredResultHolder resultHolder;
- @GetMapping("/recordinfo/{deviceId}")
- public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId, String startTime, String endTime){
+ @GetMapping("/record/{deviceId}")
+ public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId, String channelId, String startTime, String endTime){
if (logger.isDebugEnabled()) {
logger.debug(String.format("褰曞儚淇℃伅 API璋冪敤锛宒eviceId锛�%s 锛宻tartTime锛�%s锛� startTime锛�%s",deviceId, startTime, endTime));
}
Device device = storager.queryVideoDevice(deviceId);
- cmder.recordInfoQuery(device, startTime, endTime);
+ cmder.recordInfoQuery(device, channelId, startTime, endTime);
DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<ResponseEntity<RecordInfo>>();
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_CATALOG+deviceId, result);
+ // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_RECORDINFO+channelId, result);
return result;
}
}
--
Gitblit v1.8.0