From 6151028a8e0e63ed6967faa7c23ff56b076879df Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期五, 05 四月 2019 11:22:03 +0800
Subject: [PATCH] 解决GB28181推多路流问题
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index a8b8aa6..793079d 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -107,7 +107,12 @@
std::string loadFaceFeaData(std::string ip, unsigned int port, std::string content, PResponse &response);
+
std::string getAlarmImageFromVideoFile(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+
+
+
std::string getRecordVideoPath(std::string ip, unsigned int port, std::string content, PResponse &response);
@@ -176,12 +181,33 @@
unsigned char *serialNumber = NULL) const;
bool createDevId(const int &dev_batch, const int &dev_sequence);
-
- std::string getVideoPathByTime(const std::string &time, const std::string &camId, qint64 &sub);
+
std::vector<std::string> forEachFile(const std::string &dir_name);
qint64 getVideoTime(/*const std::string& videoPath*/std::string &str_tmpTime);
+
+
+ //鏍规嵁PicDate鑾峰彇鎶ヨ鍥�
+ std::string getAlarmImageByPicDateAndDevId(const std::string& picDate,const std::string& devId,
+ PResponse &response);
+
+ //鏍规嵁ImgKey鑾峰彇鎶ヨ鍥�
+ std::string getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
+ PResponse &response);
+
+ //鏍规嵁PicData鑾峰彇瑙嗛璺緞
+ std::string getVideoPathByPicDate(const std::string &picDate, const std::string &camId, qint64 &sub);
+
+ //鏍规嵁ImgKey鑾峰彇瑙嗛鐨勮矾寰�
+ std::string getVideoPathByImgKey(const std::string &imgKey, const std::string &camId);
+
+ //鑾峰彇dir_name涓嬬殑鎵�鏈夋枃浠�,甯︽墿灞曞悕
+ std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);
+
+ //鏍规嵁ImgKey鑾峰彇瑙嗛鍚�
+ std::string GetVideoNameByImgKey(const std::string& imgKey,const std::string& strPath);
+
};
#endif
--
Gitblit v1.8.0