From 805fa42a2c010d92b1c8fc29a60d32fd99fb4ea3 Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期四, 14 五月 2020 14:19:42 +0800
Subject: [PATCH] 修复回放、停止预览bug，增加ZLM hook监听，长时间无人观看，停止摄像头推流。需开启ZLM的hook并配置url
---
src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
index 993ddf7..60b48b1 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.vmanager.device;
-import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
@@ -10,10 +9,16 @@
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.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.async.DeferredResult;
+import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+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
@@ -25,16 +30,24 @@
@Autowired
private IVideoManagerStorager storager;
+ @Autowired
+ private SIPCommander cmder;
+
+ @Autowired
+ private DeferredResultHolder resultHolder;
+
+ @Autowired
+ private DeviceOffLineDetector offLineDetector;
+
@GetMapping("/devices/{deviceId}")
- public ResponseEntity<List<Device>> devices(@PathVariable String deviceId){
+ public ResponseEntity<Device> devices(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
logger.debug("鏌ヨ瑙嗛璁惧API璋冪敤锛宒eviceId锛�" + deviceId);
}
- List<Device> deviceList = new ArrayList<>();
- deviceList.add(storager.queryVideoDevice(deviceId));
- return new ResponseEntity<>(deviceList,HttpStatus.OK);
+ Device device = storager.queryVideoDevice(deviceId);
+ return new ResponseEntity<>(device,HttpStatus.OK);
}
@GetMapping("/devices")
@@ -47,4 +60,39 @@
List<Device> deviceList = storager.queryVideoDeviceList(null);
return new ResponseEntity<>(deviceList,HttpStatus.OK);
}
+
+ @PostMapping("/devices/{deviceId}/sync")
+ public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("璁惧淇℃伅鍚屾API璋冪敤锛宒eviceId锛�" + deviceId);
+ }
+
+ Device device = storager.queryVideoDevice(deviceId);
+ cmder.catalogQuery(device);
+ DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>();
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_CATALOG+deviceId, result);
+ return result;
+ }
+
+ @PostMapping("/devices/{deviceId}/delete")
+ public ResponseEntity<String> delete(@PathVariable String deviceId){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("璁惧淇℃伅鍒犻櫎API璋冪敤锛宒eviceId锛�" + deviceId);
+ }
+
+ if (offLineDetector.isOnline(deviceId)) {
+ return new ResponseEntity<String>("涓嶅厑璁稿垹闄ゅ湪绾胯澶囷紒", HttpStatus.NOT_ACCEPTABLE);
+ }
+ boolean isSuccess = storager.delete(deviceId);
+ if (isSuccess) {
+ JSONObject json = new JSONObject();
+ json.put("deviceId", deviceId);
+ return new ResponseEntity<>(json.toString(),HttpStatus.OK);
+ } else {
+ logger.warn("璁惧棰勮API璋冪敤澶辫触锛�");
+ return new ResponseEntity<String>("璁惧棰勮API璋冪敤澶辫触锛�", HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ }
}
--
Gitblit v1.8.0