guzijian / wvp-GB28181-pro · Commits

Commit e19200932531c463d262c02c59ff04e20fb7f58b

Authored by 648540858
1 parent d87ff7bf

优化录像查询接口

Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
  View file @e192009
... ... @@ -257,7 +257,7 @@ public interface ISIPCommander {
257 257 * @param startTime 开始时间,格式要求：yyyy-MM-dd HH:mm:ss
258 258 * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss
259 259 */
260   - boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime);
  260 + boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, SipSubscribe.Event errorEvent);
261 261  
262 262 /**
263 263 * 查询报警信息
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @e192009
... ... @@ -1196,7 +1196,7 @@ public class SIPCommander implements ISIPCommander {
1196 1196 * @param endTime 结束时间,格式要求：yyyy-MM-dd HH:mm:ss
1197 1197 */
1198 1198 @Override
1199   - public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime) {
  1199 + public boolean recordInfoQuery(Device device, String channelId, String startTime, String endTime, SipSubscribe.Event errorEvent) {
1200 1200  
1201 1201 try {
1202 1202 StringBuffer recordInfoXml = new StringBuffer(200);
... ... @@ -1220,7 +1220,7 @@ public class SIPCommander implements ISIPCommander {
1220 1220 Request request = headerProvider.createMessageRequest(device, recordInfoXml.toString(),
1221 1221 "z9hG4bK-ViaRecordInfo-" + tm, "fromRec" + tm, null, callIdHeader);
1222 1222  
1223   - transmitRequest(device, request);
  1223 + transmitRequest(device, request, errorEvent);
1224 1224 } catch (SipException | ParseException | InvalidArgumentException e) {
1225 1225 e.printStackTrace();
1226 1226 return false;
... ... @@ -1609,7 +1609,8 @@ public class SIPCommander implements ISIPCommander {
1609 1609 StringBuffer content = new StringBuffer(200);
1610 1610 content.append("PLAY RTSP/1.0\r\n");
1611 1611 content.append("CSeq: " + InfoCseqCache.CSEQCACHE.get(streamInfo.getStreamId()) + "\r\n");
1612   - content.append("Range: npt=" + seekTime + "-\r\n");
  1612 + content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
  1613 +
1613 1614 Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
1614 1615 logger.info(request.toString());
1615 1616 ClientTransaction clientTransaction = null;
... ...