From 6eacd6d2904e401f66f2876eb463cef76c833290 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期一, 22 四月 2019 15:58:16 +0800
Subject: [PATCH] 删除一些不必要的文件
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 139 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 128 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 793079d..98399e4 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;
@@ -76,42 +78,153 @@
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);
+ /***
+ * 鏇存柊鏁版嵁 搴曞簱
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string updateDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);
+ /**
+ * 鏌ヨ鎵�鏈夊悓姝ュ簱
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string findAllDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);
+ /**
+ * 鏌ヨ鎵�鏈夋湰鍦板簱
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string findLocalDatabase(std::string ip, unsigned int port, std::string content, PResponse &response);
+ /***
+ * 涓婁紶浜哄憳
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string addPerson(std::string ip, unsigned int port, std::string content, PResponse &response);
+ //#todo 鎵归噺娣诲姞浜哄憳鍊熷彛
+
+ /***
+ * 鍚戝悓姝ュ簱鎵归噺娣诲姞浜哄憳鍙婃洿鏂颁汉鍛�
+ * feature_addPersonTracking 鍒嗘敮涓洿鏂板姛鑳藉垎绂讳负鏂板�熷彛
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string addPersons(std::string ip, unsigned int port, std::string content, PResponse &response);
+ /***
+ * 鍒ゆ柇鍚屾搴撲腑浜哄憳鏄惁瀛樺湪
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string personIsExists(std::string ip, unsigned int port, std::string content, PResponse &response);
+ /**
+ * 鏇存柊鍚屾搴撲腑鐨勪汉鍛�
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string updatePersonByOldId(std::string ip, unsigned int port, std::string content, PResponse &response);
-
+ /**
+ * 鍒犻櫎浜哄憳
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
std::string delPerson(std::string ip, unsigned int port, std::string content, PResponse &response);
+ /**
+ * 鍔犺浇鐗瑰緛
+ * @param ip
+ * @param port
+ * @param content
+ * @param response
+ * @return
+ */
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 +267,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 +298,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 +306,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 +323,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