~chenshijun/c++.git

			@@ -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);

			};