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 | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 69ee27b..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,7 +109,9 @@
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);
@@ -116,6 +120,12 @@
std::string editDevName(std::string ip, unsigned int port, std::string content, PResponse &response);
std::string editDevId(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string findSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string editSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+ std::string getSnapshot(std::string ip, unsigned int port, std::string content, PResponse &response);
private:
void init(void);
@@ -143,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;
@@ -168,13 +182,35 @@
bool getHKDevSerialNumber(const char *ip, const int port, const char *username, const char *passwd,
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);
+ bool createDevId(const int &dev_batch, const int &dev_sequence);
+
std::vector<std::string> forEachFile(const std::string &dir_name);
- qint64 getVideoTime(const std::string& videoPath);
+ 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