From a45fab423bab8e0ce6f1d2a270dfa19a6130193f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 05 六月 2023 15:01:20 +0800
Subject: [PATCH] 修复国标级联语音对讲
---
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecordController.java | 99 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 48 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 4cee200..6e2aca3 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
@@ -1,48 +1,51 @@
-package com.genersoft.iot.vmp.vmanager.record;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.async.DeferredResult;
-
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-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;
-
-@RestController
-@RequestMapping("/api")
-public class RecordController {
-
- private final static Logger logger = LoggerFactory.getLogger(RecordController.class);
-
- @Autowired
- private SIPCommander cmder;
-
- @Autowired
- private IVideoManagerStorager storager;
-
- @Autowired
- private DeferredResultHolder resultHolder;
-
- @GetMapping("/record/{deviceId}/{channelId}")
- public DeferredResult<ResponseEntity<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));
- }
-
- Device device = storager.queryVideoDevice(deviceId);
- cmder.recordInfoQuery(device, channelId, startTime, endTime);
- DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<ResponseEntity<RecordInfo>>();
- // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_RECORDINFO+channelId, result);
- return result;
- }
-}
+//package com.genersoft.iot.vmp.vmanager.record;
+//
+//import com.alibaba.fastjson2.JSONObject;
+//import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+//import com.genersoft.iot.vmp.service.IRecordInfoServer;
+//import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
+//import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+//import com.github.pagehelper.PageInfo;
+//import io.swagger.annotations.Api;
+//import io.swagger.annotations.ApiImplicitParam;
+//import io.swagger.annotations.ApiImplicitParams;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//@Tag(name = "浜戠褰曞儚")
+//
+//@RestController
+//@RequestMapping("/api/record")
+//public class RecordController {
+//
+// @Autowired
+// private IRecordInfoServer recordInfoServer;
+//
+// //@ApiOperation("褰曞儚鍒楄〃鏌ヨ")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
+// @ApiImplicitParam(name="count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
+// @ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
+// })
+// @GetMapping(value = "/app/list")
+// @ResponseBody
+// public Object list(@RequestParam(required = false)Integer page,
+// @RequestParam(required = false)Integer count ){
+//
+// PageInfo<RecordInfo> recordList = recordInfoServer.getRecordList(page - 1, page - 1 + count);
+// return recordList;
+// }
+//
+// //@ApiOperation("鑾峰彇褰曞儚璇︽儏")
+// @ApiImplicitParams({
+// @ApiImplicitParam(name="recordInfo", value = "褰曞儚璁板綍", required = true, dataTypeClass = RecordInfo.class)
+// })
+// @GetMapping(value = "/detail")
+// @ResponseBody
+// public JSONObject list(RecordInfo recordInfo, String time ){
+//
+//
+// return null;
+// }
+//}
--
Gitblit v1.8.0