From a2673edc68a502f9a88ddf8e42f4aded9a8d94ef Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 02 四月 2019 18:48:31 +0800
Subject: [PATCH] 修改信息结构
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 559119b..cec426b 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -19,7 +19,8 @@
#include <atomic>
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
-#include "NsqMsgTool.hpp"
+
+#include <NsqMsgTool.hpp>
typedef std::shared_ptr<HttpServer::Response> PResponse;
@@ -108,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);
@@ -186,7 +184,7 @@
unsigned char *serialNumber = NULL) const;
bool createDevId(const int &dev_batch, const int &dev_sequence);
-
+
std::vector<std::string> forEachFile(const std::string &dir_name);
@@ -194,12 +192,12 @@
//鏍规嵁PicDate鑾峰彇鎶ヨ鍥�
- std::string getAlarmImageByPicDateAndDevId(const std::string& picDate,const std::string& devId,
- PResponse &response);
+ 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);
+ 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);
@@ -211,7 +209,7 @@
std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);
//鏍规嵁ImgKey鑾峰彇瑙嗛鍚�
- std::string GetVideoNameByImgKey(const std::string& imgKey,const std::string& strPath);
+ std::string GetVideoNameByImgKey(const std::string &imgKey, const std::string &strPath);
};
--
Gitblit v1.8.0