From 65b4c5cec92e4c024fc868f1ae668d08eb354170 Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: Wed, 3 Feb 2021 11:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=A7=8D=E4=BF=A1?= =?UTF-8?q?=E4=BB=A4=E7=9A=84API=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/vmanager/device/DeviceConfig.java | 121 +++++++++ .../vmp/vmanager/device/DeviceControl.java | 238 ++++++++++++++++++ ...DeviceController.java => DeviceQuery.java} | 87 ++++++- .../iot/vmp/vmanager/ptz/PtzController.java | 70 ++++-- 4 files changed, 492 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java create mode 100644 src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java rename src/main/java/com/genersoft/iot/vmp/vmanager/device/{DeviceController.java => DeviceQuery.java} (65%) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java new file mode 100644 index 00000000..6c4f7a31 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceConfig.java @@ -0,0 +1,121 @@ +/** + * 设备设置命令API接口 + * + * @author lawrencehj + * @date 2021年2月2日 + */ + +package com.genersoft.iot.vmp.vmanager.device; + +import javax.sip.message.Response; + +import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; +import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; +import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.async.DeferredResult; + +@CrossOrigin +@RestController +@RequestMapping("/api") +public class DeviceConfig { + + private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class); + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + private SIPCommander cmder; + + @Autowired + private DeferredResultHolder resultHolder; + + /** + * 看守位控制命令API接口 + * + * @param deviceId + * @param enabled 看守位使能1:开启,0:关闭 + * @param resetTime 自动归位时间间隔（可选） + * @param presetIndex 调用预置位编号（可选） + * @param channelId 通道编码（可选） + */ + @GetMapping("/config/{deviceId}/basicParam") + public DeferredResult> homePositionApi(@PathVariable String deviceId, + @RequestParam(required = false) String channelId, + @RequestParam(required = false) String name, + @RequestParam(required = false) String expiration, + @RequestParam(required = false) String heartBeatInterval, + @RequestParam(required = false) String heartBeatCount) { + if (logger.isDebugEnabled()) { + logger.debug("报警复位API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.deviceBasicConfigCmd(device, channelId, name, expiration, heartBeatInterval, heartBeatCount, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData(String.format("设备配置操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult>(3 * 1000L); + result.onTimeout(() -> { + logger.warn(String.format("设备配置操作超时, 设备未返回应答指令")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + JSONObject json = new JSONObject(); + json.put("DeviceID", deviceId); + json.put("Status", "Timeout"); + json.put("Description", "设备配置操作超时, 设备未返回应答指令"); + msg.setData(json); //("看守位控制操作超时, 设备未返回应答指令"); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONFIG + (XmlUtil.isEmpty(channelId) ? deviceId : channelId), result); + return result; + } + + /** + * 设备配置查询请求API接口 + * + * @param deviceId + */ + @GetMapping("/config/{deviceId}/query/{configType}") + public DeferredResult> configDownloadApi(@PathVariable String deviceId, + @PathVariable String configType, + @RequestParam(required = false) String channelId) { + if (logger.isDebugEnabled()) { + logger.debug("设备状态查询API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.deviceConfigQuery(device, channelId, configType, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData(String.format("获取设备配置失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult> (3 * 1000L); + result.onTimeout(()->{ + logger.warn(String.format("获取设备配置超时")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData("Timeout. Device did not response to this command."); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_CONFIGDOWNLOAD + (XmlUtil.isEmpty(channelId) ? deviceId : channelId), result); + return result; + } + +} diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java new file mode 100644 index 00000000..72213594 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java @@ -0,0 +1,238 @@ +/** + * 设备控制命令API接口 + * + * @author lawrencehj + * @date 2021年2月1日 + */ + +package com.genersoft.iot.vmp.vmanager.device; + +import javax.sip.message.Response; + +import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; +import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; +import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.async.DeferredResult; + +@CrossOrigin +@RestController +@RequestMapping("/api") +public class DeviceControl { + + private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class); + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + private SIPCommander cmder; + + @Autowired + private DeferredResultHolder resultHolder; + + /** + * 远程启动控制命令API接口 + * + * @param deviceId + */ + @GetMapping("/control/{deviceId}/teleboot") + @PostMapping("/control/{deviceId}/teleboot") + public ResponseEntity teleBootApi(@PathVariable String deviceId) { + if (logger.isDebugEnabled()) { + logger.debug("设备远程启动API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + boolean sucsess = cmder.teleBootCmd(device); + if (sucsess) { + JSONObject json = new JSONObject(); + json.put("DeviceID", deviceId); + json.put("Result", "OK"); + return new ResponseEntity<>(json.toJSONString(), HttpStatus.OK); + } else { + logger.warn("设备远程启动API调用失败！"); + return new ResponseEntity("设备远程启动API调用失败！", HttpStatus.INTERNAL_SERVER_ERROR); + } + } + + /** + * 录像控制命令API接口 + * + * @param deviceId + * @param recordCmdStr Record：手动录像，StopRecord：停止手动录像 + * @param channelId 通道编码（可选） + */ + @GetMapping("/control/{deviceId}/record/{recordCmdStr}") + public DeferredResult> recordApi(@PathVariable String deviceId, + @PathVariable String recordCmdStr, @RequestParam(required = false) String channelId) { + if (logger.isDebugEnabled()) { + logger.debug("开始/停止录像API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.recordCmd(device, channelId, recordCmdStr, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData(String.format("开始/停止录像操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult>(3 * 1000L); + result.onTimeout(() -> { + logger.warn(String.format("开始/停止录像操作超时, 设备未返回应答指令")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData("Timeout. Device did not response to this command."); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (XmlUtil.isEmpty(channelId) ? deviceId : channelId), result); + return result; + } + + /** + * 报警布防/撤防命令API接口 + * + * @param deviceId + * @param guardCmdStr SetGuard：布防，ResetGuard：撤防 + */ + @GetMapping("/control/{deviceId}/guard/{guardCmdStr}") + public DeferredResult> guardApi(@PathVariable String deviceId, @PathVariable String guardCmdStr) { + if (logger.isDebugEnabled()) { + logger.debug("布防/撤防API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.guardCmd(device, guardCmdStr, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId); + msg.setData(String.format("布防/撤防操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult>(3 * 1000L); + result.onTimeout(() -> { + logger.warn(String.format("布防/撤防操作超时, 设备未返回应答指令")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId); + msg.setData("Timeout. Device did not response to this command."); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId, result); + return result; + } + + /** + * 报警复位API接口 + * + * @param deviceId + * @param alarmMethod 报警方式（可选） + * @param alarmType 报警类型（可选） + */ + @GetMapping("/control/{deviceId}/resetAlarm") + public DeferredResult> resetAlarmApi(@PathVariable String deviceId, + @RequestParam(required = false) String alarmMethod, + @RequestParam(required = false) String alarmType) { + if (logger.isDebugEnabled()) { + logger.debug("报警复位API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.alarmCmd(device, alarmMethod, alarmType, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId); + msg.setData(String.format("报警复位操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult>(3 * 1000L); + result.onTimeout(() -> { + logger.warn(String.format("报警复位操作超时, 设备未返回应答指令")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId); + msg.setData("Timeout. Device did not response to this command."); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + deviceId, result); + return result; + } + + /** + * 强制关键帧API接口 + * + * @param deviceId + * @param channelId + */ + @GetMapping("/control/{deviceId}/iFrame") + @PostMapping("/control/{deviceId}/iFrame") + public ResponseEntity iFrame(@PathVariable String deviceId, + @RequestParam(required = false) String channelId) { + if (logger.isDebugEnabled()) { + logger.debug("强制关键帧API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + boolean sucsess = cmder.iFrameCmd(device, channelId); + if (sucsess) { + JSONObject json = new JSONObject(); + json.put("DeviceID", deviceId); + json.put("ChannelID", channelId); + json.put("Result", "OK"); + return new ResponseEntity<>(json.toJSONString(), HttpStatus.OK); + } else { + logger.warn("强制关键帧API调用失败！"); + return new ResponseEntity("强制关键帧API调用失败！", HttpStatus.INTERNAL_SERVER_ERROR); + } + } + + /** + * 看守位控制命令API接口 + * + * @param deviceId + * @param enabled 看守位使能1:开启,0:关闭 + * @param resetTime 自动归位时间间隔（可选） + * @param presetIndex 调用预置位编号（可选） + * @param channelId 通道编码（可选） + */ + @GetMapping("/control/{deviceId}/homePosition/{enabled}") + public DeferredResult> homePositionApi(@PathVariable String deviceId, + @PathVariable String enabled, + @RequestParam(required = false) String resetTime, + @RequestParam(required = false) String presetIndex, + @RequestParam(required = false) String channelId) { + if (logger.isDebugEnabled()) { + logger.debug("报警复位API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.homePositionCmd(device, channelId, enabled, resetTime, presetIndex, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData(String.format("看守位控制操作失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult>(3 * 1000L); + result.onTimeout(() -> { + logger.warn(String.format("看守位控制操作超时, 设备未返回应答指令")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + JSONObject json = new JSONObject(); + json.put("DeviceID", deviceId); + json.put("Status", "Timeout"); + json.put("Description", "看守位控制操作超时, 设备未返回应答指令"); + msg.setData(json); //("看守位控制操作超时, 设备未返回应答指令"); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + (XmlUtil.isEmpty(channelId) ? deviceId : channelId), result); + return result; + } +} diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceQuery.java similarity index 65% rename from src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java rename to src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceQuery.java index 17d1e7d0..350adaa3 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceQuery.java @@ -17,6 +17,7 @@ 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.gb28181.utils.XmlUtil; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import javax.sip.message.Response; @@ -24,9 +25,9 @@ import javax.sip.message.Response; @CrossOrigin @RestController @RequestMapping("/api") -public class DeviceController { +public class DeviceQuery { - private final static Logger logger = LoggerFactory.getLogger(DeviceController.class); + private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class); @Autowired private IVideoManagerStorager storager; @@ -77,11 +78,9 @@ public class DeviceController { int page, int count, @RequestParam(required = false) String query, @RequestParam(required = false) Boolean online, - @RequestParam(required = false) Boolean channelType - ){ - + @RequestParam(required = false) Boolean channelType) { if (logger.isDebugEnabled()) { - logger.debug("查询所有视频设备API调用"); + logger.debug("查询视频设备通道API调用"); } if (StringUtils.isEmpty(query)) { query = null; @@ -135,8 +134,8 @@ public class DeviceController { json.put("deviceId", deviceId); return new ResponseEntity<>(json.toString(),HttpStatus.OK); } else { - logger.warn("设备预览API调用失败！"); - return new ResponseEntity("设备预览API调用失败！", HttpStatus.INTERNAL_SERVER_ERROR); + logger.warn("设备信息删除API调用失败！"); + return new ResponseEntity("设备信息删除API调用失败！", HttpStatus.INTERNAL_SERVER_ERROR); } } @@ -157,7 +156,7 @@ public class DeviceController { @RequestParam(required = false) Boolean channelType){ if (logger.isDebugEnabled()) { - logger.debug("查询所有视频设备API调用"); + logger.debug("查询所有视频通道API调用"); } DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId); if (deviceChannel == null) { @@ -183,4 +182,74 @@ public class DeviceController { storager.updateDevice(device); return new ResponseEntity<>(null,HttpStatus.OK); } + + /** + * 设备状态查询请求API接口 + * + * @param deviceId + */ + @GetMapping("/devices/{deviceId}/status") + public DeferredResult> deviceStatusApi(@PathVariable String deviceId) { + if (logger.isDebugEnabled()) { + logger.debug("设备状态查询API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.deviceStatusQuery(device, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId); + msg.setData(String.format("获取设备状态失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult>(2*1000L); + result.onTimeout(()->{ + logger.warn(String.format("获取设备状态超时")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId); + msg.setData("Timeout. Device did not response to this command."); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId, result); + return result; + } + + /** + * 设备报警查询请求API接口 + * + * @param deviceId + */ + @GetMapping("/alarm/{deviceId}") + public DeferredResult> alarmApi(@PathVariable String deviceId, + @RequestParam(required = false) String startPriority, + @RequestParam(required = false) String endPriority, + @RequestParam(required = false) String alarmMethod, + @RequestParam(required = false) String alarmType, + @RequestParam(required = false) String startTime, + @RequestParam(required = false) String endTime) { + if (logger.isDebugEnabled()) { + logger.debug("设备报警查询API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId); + msg.setData(String.format("设备报警查询失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult> (3 * 1000L); + result.onTimeout(()->{ + logger.warn(String.format("设备报警查询超时")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId); + msg.setData("设备报警查询超时"); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId, result); + return result; + } + + } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/ptz/PtzController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/ptz/PtzController.java index 4c41e16f..1efdd3d1 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/ptz/PtzController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/ptz/PtzController.java @@ -5,14 +5,16 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; -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.bind.annotation.*; +import org.springframework.web.context.request.async.DeferredResult; + +import javax.sip.message.Response; import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; +import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; +import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; @CrossOrigin @@ -28,6 +30,9 @@ public class PtzController { @Autowired private IVideoManagerStorager storager; + @Autowired + private DeferredResultHolder resultHolder; + /*** * 云台控制 * @param deviceId 设备id @@ -49,16 +54,18 @@ public class PtzController { cmder.frontEndCmd(device, channelId, cmdCode, horizonSpeed, verticalSpeed, zoomSpeed); return new ResponseEntity("success",HttpStatus.OK); } - // public ResponseEntity ptz(@PathVariable String deviceId,@PathVariable String channelId,int leftRight, int upDown, int inOut, int moveSpeed, int zoomSpeed){ - - // if (logger.isDebugEnabled()) { - // logger.debug(String.format("设备云台控制 API调用，deviceId：%s ，channelId：%s ，leftRight：%d ，upDown：%d ，inOut：%d ，moveSpeed：%d ，zoomSpeed：%d",deviceId, channelId, leftRight, upDown, inOut, moveSpeed, zoomSpeed)); - // } - // Device device = storager.queryVideoDevice(deviceId); - - // cmder.ptzCmd(device, channelId, leftRight, upDown, inOut, moveSpeed, zoomSpeed); - // return new ResponseEntity("success",HttpStatus.OK); - // } + + /** + * 通用前端控制命令API接口 + * + * @param deviceId + * @param channelId + * @param cmdCode + * @param parameter1 + * @param parameter2 + * @param combindCode2 + * @return + */ @PostMapping("/frontEndCommand/{deviceId}/{channelId}") public ResponseEntity frontEndCommand(@PathVariable String deviceId,@PathVariable String channelId,int cmdCode, int parameter1, int parameter2, int combindCode2){ @@ -70,4 +77,37 @@ public class PtzController { cmder.frontEndCmd(device, channelId, cmdCode, parameter1, parameter2, combindCode2); return new ResponseEntity("success",HttpStatus.OK); } + + /** + * 预置位查询命令API接口 + * + * @param deviceId + * @param channelId + * @return + */ + @GetMapping("/presetQuery/{deviceId}/{channelId}") + public DeferredResult> presetQueryApi(@PathVariable String deviceId, @PathVariable String channelId) { + if (logger.isDebugEnabled()) { + logger.debug("设备预置位查询API调用"); + } + Device device = storager.queryVideoDevice(deviceId); + cmder.presetQuery(device, channelId, event -> { + Response response = event.getResponse(); + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData(String.format("获取设备预置位失败，错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + resultHolder.invokeResult(msg); + }); + DeferredResult> result = new DeferredResult> (3 * 1000L); + result.onTimeout(()->{ + logger.warn(String.format("获取设备预置位超时")); + // 释放rtpserver + RequestMessage msg = new RequestMessage(); + msg.setId(DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + (XmlUtil.isEmpty(channelId) ? deviceId : channelId)); + msg.setData("获取设备预置位超时"); + resultHolder.invokeResult(msg); + }); + resultHolder.put(DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + (XmlUtil.isEmpty(channelId) ? deviceId : channelId), result); + return result; + } }