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 |   82 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 5d67869..00fff1c 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,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,7 +149,9 @@
 
     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);
 
@@ -116,6 +160,12 @@
     std::string editDevName(std::string ip, unsigned int port, std::string content, PResponse &response);
 
     std::string editDevId(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+    std::string findSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+    std::string editSdkRule(std::string ip, unsigned int port, std::string content, PResponse &response);
+
+    std::string getSnapshot(std::string ip, unsigned int port, std::string content, PResponse &response);
 
 private:
     void init(void);
@@ -143,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;
 
@@ -168,13 +222,35 @@
 
     bool getHKDevSerialNumber(const char *ip, const int port, const char *username, const char *passwd,
                               unsigned char *serialNumber = NULL) const;
-    bool createDevId(const  int& dev_batch, const  int& dev_sequence) ;
 
-    std::string getVideoPathByTime(const std::string& time,const std::string& camId,qint64& sub);
+    bool createDevId(const int &dev_batch, const int &dev_sequence);
+
 
     std::vector<std::string> forEachFile(const std::string &dir_name);
 
-    qint64 getVideoTime(/*const std::string& videoPath,*/std::string& str_tmpTime);
+    qint64 getVideoTime(/*const std::string& videoPath*/std::string &str_tmpTime);
+
+
+    //鏍规嵁PicDate鑾峰彇鎶ヨ鍥�
+    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);
+
+    //鏍规嵁PicData鑾峰彇瑙嗛璺緞
+    std::string getVideoPathByPicDate(const std::string &picDate, const std::string &camId, qint64 &sub);
+
+    //鏍规嵁ImgKey鑾峰彇瑙嗛鐨勮矾寰�
+    std::string getVideoPathByImgKey(const std::string &imgKey, const std::string &camId);
+
+    //鑾峰彇dir_name涓嬬殑鎵�鏈夋枃浠�,甯︽墿灞曞悕
+    std::vector<std::string> forEachFileByImgKey(const std::string &dir_name);
+
+    //鏍规嵁ImgKey鑾峰彇瑙嗛鍚�
+    std::string GetVideoNameByImgKey(const std::string &imgKey, const std::string &strPath);
+
 };
 
 #endif

--
Gitblit v1.8.0