From 5bf0020b189b2bc8c64737c2af4ea77c3e8f5612 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 22:24:27 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 2c8e5ed..793079d 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -182,33 +182,31 @@
bool createDevId(const int &dev_batch, const int &dev_sequence);
-
- //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,
+ //鏍规嵁PicDate鑾峰彇鎶ヨ鍥�
+ std::string getAlarmImageByPicDateAndDevId(const std::string& picDate,const std::string& devId,
PResponse &response);
- std::string getAlarmImageFromVideoFileByImageKey(const std::string& devId,const std::string& imgKey,
+ //鏍规嵁ImgKey鑾峰彇鎶ヨ鍥�
+ std::string getAlarmImageByImageKeyAndDevId(const std::string& imgKey,const std::string& devId,
PResponse &response);
- std::string getRecordVideoPathNew(std::string ip, unsigned int port, std::string content, PResponse &response);
+ //鏍规嵁PicData鑾峰彇瑙嗛璺緞
+ std::string getVideoPathByPicDate(const std::string &picDate, const std::string &camId, qint64 &sub);
- std::string getAlarmImageFromVideoFile2(std::string ip, unsigned int port, std::string content, PResponse &response);
+ //鏍规嵁ImgKey鑾峰彇瑙嗛鐨勮矾寰�
+ std::string getVideoPathByImgKey(const std::string &imgKey, const std::string &camId);
- 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);
+ //鑾峰彇dir_name涓嬬殑鎵�鏈夋枃浠�,甯︽墿灞曞悕
std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);
- std::string GetVideoByImgKey(const std::string strImageName,const std::string& strPath);
+ //鏍规嵁ImgKey鑾峰彇瑙嗛鍚�
+ std::string GetVideoNameByImgKey(const std::string& imgKey,const std::string& strPath);
};
--
Gitblit v1.8.0