From f946a62d3921e86b44ff8e2973138304b9cd53cd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 16:36:32 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 559119b..00fff1c 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;
@@ -77,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);
@@ -108,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);
@@ -186,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);
@@ -194,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);
@@ -211,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);
};
--
Gitblit v1.8.0