From 50c2a5a72810add4fb9d6000802dcf36399a3b68 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 04 三月 2022 15:36:16 +0800
Subject: [PATCH] Revert "修复回放失败出现脏数据的问题以及添加拉流代理判断错误的问题"
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
index c48f841..08a5d77 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
@@ -4,11 +4,14 @@
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
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.transmit.cmd.impl.SIPCommanderFroPlatform;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.QueryMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.DateUtil;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import org.dom4j.Element;
import org.slf4j.Logger;
@@ -41,6 +44,9 @@
private SIPCommanderFroPlatform cmderFroPlatform;
@Autowired
+ private SIPCommander commander;
+
+ @Autowired
private SipConfig config;
@Autowired
@@ -65,19 +71,36 @@
// 鍥炲200 OK
responseAck(evt, Response.OK);
Element snElement = rootElement.element("SN");
- String sn = snElement.getText();
+ int sn = Integer.parseInt(snElement.getText());
Element deviceIDElement = rootElement.element("DeviceID");
String channelId = deviceIDElement.getText();
Element startTimeElement = rootElement.element("StartTime");
String startTime = startTimeElement.getText();
Element endTimeElement = rootElement.element("EndTime");
String endTime = endTimeElement.getText();
-// Element secrecyElement = rootElement.element("Secrecy");
-// int secrecy = Integer.parseInt(secrecyElement.getText());
-// Element typeElement = rootElement.element("Type");
-// String type = typeElement.getText();
+ Element secrecyElement = rootElement.element("Secrecy");
+ int secrecy = Integer.parseInt(secrecyElement.getText());
+ Element typeElement = rootElement.element("Type");
+ String type = typeElement.getText();
// 纭鏄洿鎾繕鏄浗鏍囷紝 鍥芥爣鐩存帴璇锋眰涓嬬骇锛岀洿鎾姹傚綍鍍忕鐞嗘湇鍔�
+ List<ChannelSourceInfo> channelSources = storager.getChannelSource(parentPlatform.getServerGBId(), channelId);
+ if (channelSources.get(0).getCount() > 0) { // 鍥芥爣
+ // 鍚戝浗鏍囪澶囪姹傚綍鍍忔暟鎹�
+ Device device = storager.queryVideoDeviceByPlatformIdAndChannelId(parentPlatform.getServerGBId(), channelId);
+ commander.recordInfoQuery(device, channelId, DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
+ DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
+ // 鏌ヨ鎴愬姛
+ }),(eventResult -> {
+ // 鏌ヨ澶辫触
+
+ }));
+
+ }else if (channelSources.get(0).getCount() > 0) { // 鐩存挱娴�
+ // TODO
+ }else { // 閿欒鐨勮姹�
+
+ }
} catch (SipException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
--
Gitblit v1.8.0