From bf7ab3fe2ba246208d729901c33a9402209ee26a Mon Sep 17 00:00:00 2001
From: songww <songww@inspur.com>
Date: 星期五, 08 五月 2020 21:57:07 +0800
Subject: [PATCH] 优化代码结构，提供NVR录像检索接口
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 126 +++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 56 deletions(-)
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 09f0934..630d44c 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
@@ -8,6 +8,7 @@
import javax.sip.message.Request;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.conf.SipConfig;
@@ -15,7 +16,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
/**
* @Description:璁惧鑳藉姏鎺ュ彛锛岀敤浜庡畾涔夎澶囩殑鎺у埗銆佹煡璇㈣兘鍔�
@@ -34,66 +35,63 @@
@Autowired
private SipLayer sipLayer;
- @Autowired
- private IVideoManagerStorager storager;
-
/**
* 浜戝彴鏂瑰悜鏀炬帶鍒讹紝浣跨敤閰嶇疆鏂囦欢涓殑榛樿闀滃ご绉诲姩閫熷害
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
* @param moveSpeed 闀滃ご绉诲姩閫熷害
*/
@Override
- public boolean ptzdirectCmd(String deviceId, String channelId, int leftRight, int upDown) {
- return ptzCmd(deviceId, channelId, leftRight, upDown, 0, config.getSpeed(), 0);
+ public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown) {
+ return ptzCmd(device, channelId, leftRight, upDown, 0, config.getSpeed(), 0);
}
/**
* 浜戝彴鏂瑰悜鏀炬帶鍒�
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
* @param moveSpeed 闀滃ご绉诲姩閫熷害
*/
@Override
- public boolean ptzdirectCmd(String deviceId, String channelId, int leftRight, int upDown, int moveSpeed) {
- return ptzCmd(deviceId, channelId, leftRight, upDown, 0, moveSpeed, 0);
+ public boolean ptzdirectCmd(Device device, String channelId, int leftRight, int upDown, int moveSpeed) {
+ return ptzCmd(device, channelId, leftRight, upDown, 0, moveSpeed, 0);
}
/**
* 浜戝彴缂╂斁鎺у埗锛屼娇鐢ㄩ厤缃枃浠朵腑鐨勯粯璁ら暅澶寸缉鏀鹃�熷害
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param inOut 闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
*/
@Override
- public boolean ptzZoomCmd(String deviceId, String channelId, int inOut) {
- return ptzCmd(deviceId, channelId, 0, 0, inOut, 0, config.getSpeed());
+ public boolean ptzZoomCmd(Device device, String channelId, int inOut) {
+ return ptzCmd(device, channelId, 0, 0, inOut, 0, config.getSpeed());
}
/**
* 浜戝彴缂╂斁鎺у埗
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param inOut 闀滃ご鏀惧ぇ缂╁皬 0:鍋滄 1:缂╁皬 2:鏀惧ぇ
* @param zoomSpeed 闀滃ご缂╂斁閫熷害
*/
@Override
- public boolean ptzZoomCmd(String deviceId, String channelId, int inOut, int zoomSpeed) {
- return ptzCmd(deviceId, channelId, 0, 0, inOut, 0, zoomSpeed);
+ public boolean ptzZoomCmd(Device device, String channelId, int inOut, int zoomSpeed) {
+ return ptzCmd(device, channelId, 0, 0, inOut, 0, zoomSpeed);
}
/**
* 浜戝彴鎺у埗锛屾敮鎸佹柟鍚戜笌缂╂斁鎺у埗
*
- * @param deviceId 鎺у埗璁惧
+ * @param device 鎺у埗璁惧
* @param channelId 棰勮閫氶亾
* @param leftRight 闀滃ご宸︾Щ鍙崇Щ 0:鍋滄 1:宸︾Щ 2:鍙崇Щ
* @param upDown 闀滃ご涓婄Щ涓嬬Щ 0:鍋滄 1:涓婄Щ 2:涓嬬Щ
@@ -102,10 +100,9 @@
* @param zoomSpeed 闀滃ご缂╂斁閫熷害
*/
@Override
- public boolean ptzCmd(String deviceId, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,
+ public boolean ptzCmd(Device device, String channelId, int leftRight, int upDown, int inOut, int moveSpeed,
int zoomSpeed) {
try {
- Device device = storager.queryVideoDevice(deviceId);
StringBuffer ptzXml = new StringBuffer(200);
ptzXml.append("<?xml version=\"1.0\" ?>");
ptzXml.append("<Control>");
@@ -119,7 +116,7 @@
Request request = headerProvider.createMessageRequest(device, ptzXml.toString(), "ViaPtzBranch", "FromPtzTag", "ToPtzTag");
- transmitRequest(device.getTransport(), request);
+ transmitRequest(device, request);
return true;
} catch (SipException | ParseException | InvalidArgumentException e) {
@@ -131,14 +128,12 @@
/**
* 璇锋眰棰勮瑙嗛娴�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
@Override
- public String playStreamCmd(String deviceId, String channelId) {
+ public String playStreamCmd(Device device, String channelId) {
try {
-
- Device device = storager.queryVideoDevice(deviceId);
//鐢熸垚ssrc鏍囪瘑鏁版嵁娴� 10浣嶆暟瀛�
String ssrc = "";
@@ -170,7 +165,7 @@
Request request = headerProvider.createInviteRequest(device, content.toString(), null, "live", null);
- transmitRequest(device.getTransport(), request);
+ transmitRequest(device, request);
return ssrc;
} catch ( SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
@@ -181,81 +176,81 @@
/**
* 璇煶骞挎挱
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
@Override
- public String audioBroadcastCmd(String deviceId, String channelId) {
+ public boolean audioBroadcastCmd(Device device, String channelId) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
* 闊宠棰戝綍鍍忔帶鍒�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
@Override
- public String recordCmd(String deviceId, String channelId) {
+ public boolean recordCmd(Device device, String channelId) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
* 鎶ヨ甯冮槻/鎾ら槻鍛戒护
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
@Override
- public String guardCmd(String deviceId) {
+ public boolean guardCmd(Device device) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
* 鎶ヨ澶嶄綅鍛戒护
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
@Override
- public String alarmCmd(String deviceId) {
+ public boolean alarmCmd(Device device) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
* 寮哄埗鍏抽敭甯у懡浠�,璁惧鏀跺埌姝ゅ懡浠ゅ簲绔嬪埢鍙戦�佷竴涓狪DR甯�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
* @param channelId 棰勮閫氶亾
*/
@Override
- public String iFameCmd(String deviceId, String channelId) {
+ public boolean iFameCmd(Device device, String channelId) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
* 鐪嬪畧浣嶆帶鍒跺懡浠�
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
@Override
- public String homePositionCmd(String deviceId) {
+ public boolean homePositionCmd(Device device) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
* 璁惧閰嶇疆鍛戒护
*
- * @param deviceId 瑙嗛璁惧
+ * @param device 瑙嗛璁惧
*/
@Override
- public String deviceConfigCmd(String deviceId) {
+ public boolean deviceConfigCmd(Device device) {
// TODO Auto-generated method stub
- return null;
+ return false;
}
/**
@@ -286,8 +281,8 @@
catalogXml.append("</Query>");
Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaDeviceInfoBranch", "FromDeviceInfoTag", "ToDeviceInfoTag");
+ transmitRequest(device, request);
- transmitRequest(device.getTransport(), request);
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
return false;
@@ -312,9 +307,7 @@
catalogXml.append("</Query>");
Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaCatalogBranch", "FromCatalogTag", "ToCatalogTag");
-
- transmitRequest(device.getTransport(), request);
-
+ transmitRequest(device, request);
} catch (SipException | ParseException | InvalidArgumentException e) {
e.printStackTrace();
return false;
@@ -326,11 +319,32 @@
* 鏌ヨ褰曞儚淇℃伅
*
* @param device 瑙嗛璁惧
+ * @param startTime 寮�濮嬫椂闂�,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
+ * @param endTime 缁撴潫鏃堕棿,鏍煎紡瑕佹眰锛歽yyy-MM-dd HH:mm:ss
*/
@Override
- public boolean recordInfoQuery(Device device) {
- // TODO Auto-generated method stub
- return false;
+ public boolean recordInfoQuery(Device device, String startTime, String endTime) {
+
+ try {
+ StringBuffer catalogXml = new StringBuffer(200);
+ catalogXml.append("<?xml version=\"1.0\" encoding=\"GB2312\"?>");
+ catalogXml.append("<Query>");
+ catalogXml.append("<CmdType>RecordInfo</CmdType>");
+ catalogXml.append("<SN>" + (int)((Math.random()*9+1)*100000) + "</SN>");
+ catalogXml.append("<DeviceID>" + device.getDeviceId() + "</DeviceID>");
+ catalogXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>");
+ catalogXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>");
+ // 澶у崕NVR瑕佹眰蹇呴』澧炲姞涓�涓�间负all鐨勬枃鏈厓绱犺妭鐐筎ype
+ catalogXml.append("<Type>all</Type>");
+ catalogXml.append("</Query>");
+
+ Request request = headerProvider.createMessageRequest(device, catalogXml.toString(), "ViaRecordInfoBranch", "FromRecordInfoTag", "ToRecordInfoTag");
+ transmitRequest(device, request);
+ } catch (SipException | ParseException | InvalidArgumentException e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
}
/**
@@ -377,10 +391,10 @@
return false;
}
- private void transmitRequest(String transport, Request request) throws SipException {
- if(transport.equals("TCP")) {
+ private void transmitRequest(Device device, Request request) throws SipException {
+ if(device.getTransport().equals("TCP")) {
sipLayer.getTcpSipProvider().sendRequest(request);
- } else if(transport.equals("UDP")) {
+ } else if(device.getTransport().equals("UDP")) {
sipLayer.getUdpSipProvider().sendRequest(request);
}
}
--
Gitblit v1.8.0