From 17ae0cd78c16f55d38dc3f9ad6b27688f445aee3 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:57:19 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' into 1.3nsq
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 2c8e5ed..cec426b 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -20,6 +20,8 @@
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
+#include <NsqMsgTool.hpp>
+
typedef std::shared_ptr<HttpServer::Response> PResponse;
@@ -107,11 +109,8 @@
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);
@@ -154,6 +153,10 @@
FastFdsWithLock fdfsClient;
+ //nsq
+ BasicMsg::Nsq::NsqMsgProducer *nsqMsgProducer;
+
+
bool getDevSerialNumber(const char *ip, const int port, const char *username, \
const char *passwd, const char *brand, unsigned char *serialNumber) const;
@@ -181,34 +184,32 @@
unsigned char *serialNumber = NULL) const;
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,
- PResponse &response);
+ //鏍规嵁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,
- PResponse &response);
+ //鏍规嵁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