From 381af8e92a424deb9a8ce4c316cabcb9f1b4ffe4 Mon Sep 17 00:00:00 2001
From: miyanhui <dennismi1024@gmail.com>
Date: 星期二, 12 二月 2019 14:17:32 +0800
Subject: [PATCH] 大图新方案合并
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index a8b8aa6..2c8e5ed 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,35 @@
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::string getVideoPathByTime(const std::string &strImageName, const std::string &camId, qint64 &sub);
+ //std::string getVideoPathByTime2(const std::string &strImageName, 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 getAlarmImageFromVideoFileByPicDate(const std::string& devId,const std::string& picDate,
+ PResponse &response);
+
+ std::string getAlarmImageFromVideoFileByImageKey(const std::string& devId,const std::string& imgKey,
+ PResponse &response);
+
+ std::string getRecordVideoPathNew(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string getAlarmImageFromVideoFile2(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string getVideoPathByPicDate(const std::string &time, const std::string &camId, qint64 &sub);
+ //鏍规嵁ImageKey鑾峰彇瑙嗛鐨勮矾寰�
+ std::string getVideoPathByImgKey(const std::string &strImageName, const std::string &camId);
+
+ //std::string getVideoPathByTimeByPicDate(const std::string &time, const std::string &camId, qint64 &sub);
+ std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);
+
+ std::string GetVideoByImgKey(const std::string strImageName,const std::string& strPath);
+
};
#endif
--
Gitblit v1.8.0