From d09d8f11f06ee6eeeb4c7f9bd6d35e6fbd49e05f Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期四, 04 八月 2022 17:01:31 +0800
Subject: [PATCH] 修改‘修改pushkey’窗口的标题提示文案
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
index d33dd2a..f0f2eb2 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -2,12 +2,11 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.gb28181.bean.InviteStreamInfo;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
-import com.genersoft.iot.vmp.service.bean.SSRCInfo;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -28,8 +27,9 @@
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import java.time.LocalDate;
import java.util.UUID;
@Api(tags = "鍥芥爣褰曞儚")
@@ -44,7 +44,7 @@
private SIPCommander cmder;
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private DeferredResultHolder resultHolder;
@@ -63,15 +63,32 @@
@ApiImplicitParam(name = "endTime", value = "缁撴潫鏃堕棿", dataTypeClass = String.class),
})
@GetMapping("/query/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId,@PathVariable String channelId, String startTime, String endTime){
+ public DeferredResult<ResponseEntity<WVPResult<RecordInfo>>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
if (logger.isDebugEnabled()) {
- logger.debug(String.format("褰曞儚淇℃伅鏌ヨ API璋冪敤锛宒eviceId锛�%s 锛宻tartTime锛�%s锛� startTime锛�%s",deviceId, startTime, endTime));
+ logger.debug(String.format("褰曞儚淇℃伅鏌ヨ API璋冪敤锛宒eviceId锛�%s 锛宻tartTime锛�%s锛� endTime锛�%s",deviceId, startTime, endTime));
+ }
+ DeferredResult<ResponseEntity<WVPResult<RecordInfo>>> result = new DeferredResult<>();
+ if (!DateUtil.verification(startTime, DateUtil.formatter)){
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("startTime error, format is " + DateUtil.PATTERN);
+
+ ResponseEntity<WVPResult<RecordInfo>> resultResponseEntity = new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ result.setResult(resultResponseEntity);
+ return result;
+ }
+ if (!DateUtil.verification(endTime, DateUtil.formatter)){
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("endTime error, format is " + DateUtil.PATTERN);
+ ResponseEntity<WVPResult<RecordInfo>> resultResponseEntity = new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ result.setResult(resultResponseEntity);
+ return result;
}
Device device = storager.queryVideoDevice(deviceId);
// 鎸囧畾瓒呮椂鏃堕棿 1鍒嗛挓30绉�
- DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<>(90*1000L);
String uuid = UUID.randomUUID().toString();
int sn = (int)((Math.random()*9+1)*100000);
String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
@@ -79,7 +96,10 @@
msg.setId(uuid);
msg.setKey(key);
cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
- msg.setData("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg );
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg);
+ msg.setData(wvpResult);
resultHolder.invokeResult(msg);
}));
@@ -87,6 +107,10 @@
resultHolder.put(key, uuid, result);
result.onTimeout(()->{
msg.setData("timeout");
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("timeout");
+ msg.setData(wvpResult);
resultHolder.invokeResult(msg);
});
return result;
--
Gitblit v1.8.0