From b7c16fe6ed13a3ddc3f35a8caf2736f1536bad61 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 17 一月 2022 09:38:26 +0800 Subject: [PATCH] Merge pull request #311 from szy833/wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 28 +++++++ src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java | 34 ++++++-- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java | 9 ++ src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java | 138 ++++++++++++++++++++++++++++++++++ 4 files changed, 199 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java index 6e96dac..8be07ca 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java @@ -328,4 +328,13 @@ * @return true = 鍛戒护鍙戦�佹垚鍔� */ boolean catalogSubscribe(Device device, SipSubscribe.Event okEvent ,SipSubscribe.Event errorEvent); + + /** + * 鎷夋鎺у埗鍛戒护 + * + * @param device 鎺у埗璁惧 + * @param channelId 閫氶亾id + * @param cmdString 鍓嶇鎺у埗鎸囦护涓� + */ + boolean dragZoomCmd(Device device, String channelId, String cmdString); } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java index 59e2192..285a817 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java @@ -1509,6 +1509,34 @@ } } + @Override + public boolean dragZoomCmd(Device device, String channelId, String cmdString) { + try { + StringBuffer dragXml = new StringBuffer(200); + dragXml.append("<?xml version=\"1.0\" ?>\r\n"); + dragXml.append("<Control>\r\n"); + dragXml.append("<CmdType>DeviceControl</CmdType>\r\n"); + dragXml.append("<SN>" + (int) ((Math.random() * 9 + 1) * 100000) + "</SN>\r\n"); + if (StringUtils.isEmpty(channelId)) { + dragXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>\r\n"); + } else { + dragXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n"); + } + dragXml.append(cmdString); + dragXml.append("</Control>\r\n"); + String tm = Long.toString(System.currentTimeMillis()); + CallIdHeader callIdHeader = device.getTransport().equals("TCP") ? tcpSipProvider.getNewCallId() + : udpSipProvider.getNewCallId(); + Request request = headerProvider.createMessageRequest(device, dragXml.toString(), "z9hG4bK-ViaPtz-" + tm, "FromPtz" + tm, null, callIdHeader); + logger.debug("鎷夋淇′护锛� " + request.toString()); + transmitRequest(device, request); + return true; + } catch (SipException | ParseException | InvalidArgumentException e) { + e.printStackTrace(); + } + return false; + } + private ClientTransaction transmitRequest(Device device, Request request) throws SipException { return transmitRequest(device, request, null, null); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java index 69f664b..0c9b835 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/DeviceControlResponseMessageHandler.java @@ -16,7 +16,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import javax.sip.InvalidArgumentException; import javax.sip.RequestEvent; +import javax.sip.SipException; +import javax.sip.message.Response; + +import java.text.ParseException; import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText; @@ -40,17 +45,26 @@ @Override public void handForDevice(RequestEvent evt, Device device, Element element) { // 姝ゅ鏄鏈钩鍙板彂鍑篋eviceControl鎸囦护鐨勫簲绛� - JSONObject json = new JSONObject(); - String channelId = getText(element, "DeviceID"); - XmlUtil.node2Json(element, json); - if (logger.isDebugEnabled()) { - logger.debug(json.toJSONString()); + try { + responseAck(evt, Response.OK); + JSONObject json = new JSONObject(); + String channelId = getText(element, "DeviceID"); + XmlUtil.node2Json(element, json); + if (logger.isDebugEnabled()) { + logger.debug(json.toJSONString()); + } + RequestMessage msg = new RequestMessage(); + String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + device.getDeviceId() + channelId; + msg.setKey(key); + msg.setData(json); + deferredResultHolder.invokeAllResult(msg); + } catch (SipException e) { + e.printStackTrace(); + } catch (InvalidArgumentException e) { + e.printStackTrace(); + } catch (ParseException e) { + e.printStackTrace(); } - RequestMessage msg = new RequestMessage(); - String key = DeferredResultHolder.CALLBACK_CMD_DEVICECONTROL + device.getDeviceId() + channelId; - msg.setKey(key); - msg.setData(json); - deferredResultHolder.invokeAllResult(msg); } @Override diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java new file mode 100644 index 0000000..fb1970e --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/dragZoom/DragZoomControl.java @@ -0,0 +1,138 @@ +package com.genersoft.iot.vmp.vmanager.gb28181.dragZoom; + +import com.genersoft.iot.vmp.gb28181.bean.Device; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +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.*; + +/** + * @author szy + * @date 21:55 2022/1/15 + */ +@Api(tags = "鎷夋鎺у埗") +@CrossOrigin +@RestController +@RequestMapping("/api/dragZoom") +public class DragZoomControl { + + private final static Logger logger = LoggerFactory.getLogger(DragZoomControl.class); + + @Autowired + private SIPCommander cmder; + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + private DeferredResultHolder resultHolder; + + /** + * 鎷夋鏀惧ぇ + * @param deviceId 璁惧id + * @param channelId 閫氶亾id + * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊� + * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊� + * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲�� + * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲�� + * @param lengthx 鎷夋闀垮害鍍忕礌鍊� + * @param lengthy 鎷夋瀹藉害鍍忕礌鍊� + * @return + */ + @ApiOperation("鎷夋鏀惧ぇ") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class), + @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class), + @ApiImplicitParam(name = "length", value = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "width", value = "鎾斁绐楀彛瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "midpointx", value = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "midpointy", value = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "lengthx", value = "鎷夋闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "lengthy", value = "鎷夋瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + }) + @GetMapping("/dragzoomin") + public ResponseEntity<String> dragZoomIn(@RequestParam String deviceId, + @RequestParam(required = false) String channelId, + @RequestParam int length, + @RequestParam int width, + @RequestParam int midpointx, + @RequestParam int midpointy, + @RequestParam int lengthx, + @RequestParam int lengthy){ + if (logger.isDebugEnabled()) { + logger.debug(String.format("璁惧鎷夋鏀惧ぇ API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy)); + } + Device device = storager.queryVideoDevice(deviceId); + StringBuffer cmdXml = new StringBuffer(200); + cmdXml.append("<DragZoomIn>\r\n"); + cmdXml.append("<Length>" + length+ "</Length>\r\n"); + cmdXml.append("<Width>" + width+ "</Width>\r\n"); + cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n"); + cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n"); + cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n"); + cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n"); + cmdXml.append("</DragZoomIn>\r\n"); + cmder.dragZoomCmd(device, channelId, cmdXml.toString()); + return new ResponseEntity<String>("success", HttpStatus.OK); + } + + /** + * 鎷夋缂╁皬 + * @param deviceId 璁惧id + * @param channelId 閫氶亾id + * @param length 鎾斁绐楀彛闀垮害鍍忕礌鍊� + * @param width 鎾斁绐楀彛瀹藉害鍍忕礌鍊� + * @param midpointx 鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲�� + * @param midpointy 鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲�� + * @param lengthx 鎷夋闀垮害鍍忕礌鍊� + * @param lengthy 鎷夋瀹藉害鍍忕礌鍊� + * @return + */ + @ApiOperation("鎷夋缂╁皬") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class), + @ApiImplicitParam(name = "channelId", value = "閫氶亾ID", dataTypeClass = String.class), + @ApiImplicitParam(name = "length", value = "鎾斁绐楀彛闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "width", value = "鎾斁绐楀彛瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "midpointx", value = "鎷夋涓績鐨勬í杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "midpointy", value = "鎷夋涓績鐨勭旱杞村潗鏍囧儚绱犲��", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "lengthx", value = "鎷夋闀垮害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + @ApiImplicitParam(name = "lengthy", value = "鎷夋瀹藉害鍍忕礌鍊�", required = true, dataTypeClass = Integer.class), + }) + @GetMapping("/dragzoomout") + public ResponseEntity<String> dragZoomOut(@RequestParam String deviceId, + @RequestParam(required = false) String channelId, + @RequestParam int length, + @RequestParam int width, + @RequestParam int midpointx, + @RequestParam int midpointy, + @RequestParam int lengthx, + @RequestParam int lengthy){ + + if (logger.isDebugEnabled()) { + logger.debug(String.format("璁惧鎷夋缂╁皬 API璋冪敤锛宒eviceId锛�%s 锛宑hannelId锛�%s 锛宭ength锛�%d 锛寃idth锛�%d 锛宮idpointx锛�%d 锛宮idpointy锛�%d 锛宭engthx锛�%d 锛宭engthy锛�%d",deviceId, channelId, length, width, midpointx, midpointy,lengthx, lengthy)); + } + Device device = storager.queryVideoDevice(deviceId); + StringBuffer cmdXml = new StringBuffer(200); + cmdXml.append("<DragZoomOut>\r\n"); + cmdXml.append("<Length>" + length+ "</Length>\r\n"); + cmdXml.append("<Width>" + width+ "</Width>\r\n"); + cmdXml.append("<MidPointX>" + midpointx+ "</MidPointX>\r\n"); + cmdXml.append("<MidPointY>" + midpointy+ "</MidPointY>\r\n"); + cmdXml.append("<LengthX>" + lengthx+ "</LengthX>\r\n"); + cmdXml.append("<LengthY>" + lengthy+ "</LengthY>\r\n"); + cmdXml.append("</DragZoomOut>\r\n"); + cmder.dragZoomCmd(device, channelId, cmdXml.toString()); + return new ResponseEntity<String>("success",HttpStatus.OK); + } + +} -- Gitblit v1.8.0