~chenshijun/c++.git

			@@ -20,6 +20,8 @@
			#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
			#include "AppPipeController.h"

			#include <NsqMsgTool.hpp>

			typedef std::shared_ptr<HttpServer::Response> PResponse;


			@@ -76,16 +78,56 @@
			std::string netconfig_show(std::string ip, unsigned int port, std::string content, PResponse &response);


			/***
			* 创建集群节点
			* @param ip
			* @param port
			* @param content
			* @param response
			* @return
			*/
			std::string addNode(std::string ip, unsigned int port, std::string content, PResponse &response);

			/***
			* 查询在线节点
			* @param ip
			* @param port
			* @param content
			* @param response
			* @return
			*/
			std::string searchNode(std::string ip, unsigned int port, std::string content, PResponse &response);

			std::string modifyCluName(std::string ip, unsigned int port, std::string content, PResponse &response);

			/***
			* 退出集群
			* @param ip
			* @param port
			* @param content
			* @param response
			* @return
			*/
			std::string removeNode(std::string ip, unsigned int port, std::string content, PResponse &response);

			/**
			*创建数据底库
			* @param ip
			* @param port
			* @param content
			* @param response
			* @return
			*/
			std::string createDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);

			/**
			*
			* @param ip
			* @param port
			* @param content
			* @param response
			* @return
			*/
			std::string deleteDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);

			std::string updateDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);
			@@ -107,11 +149,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 +193,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,7 +224,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);

			@@ -189,12 +232,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);
			@@ -206,7 +249,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);

			};