From a89689b92b07cf1830ad8b46521eda92e7f927c0 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 30 一月 2019 16:37:45 +0800
Subject: [PATCH] 修改bug
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 69ee27b..3fe1e83 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -17,6 +17,7 @@
#include <CurlDownloadImg.hpp>
#include <basic/util/fastdfs/FastFds.hpp>
#include <atomic>
+#include <basic/util/curl/HttpRequestWithCrul.hpp>
#include "../FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.h"
#include "AppPipeController.h"
@@ -96,6 +97,8 @@
std::string addPerson(std::string ip, unsigned int port, std::string content, PResponse &response);
+ std::string updatePerson(std::string ip, unsigned int port, std::string content, PResponse &response);
+
std::string addPersons(std::string ip, unsigned int port, std::string content, PResponse &response);
std::string personIsExists(std::string ip, unsigned int port, std::string content, PResponse &response);
@@ -117,6 +120,12 @@
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);
@@ -127,7 +136,7 @@
std::string m_cluster_id;
std::string m_cluster_name;
std::map<std::string, srsPipeController_s> m_rtmp;
-
+ HttpRequestWithCrul m_requestWithCrul;
ErlangTool::ErlangDbTool *erlangDbTool;
SqliteFaceEncap m_SqliteFaceEncap;
@@ -168,13 +177,36 @@
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::string getVideoPathByTime(const std::string &time, const std::string &camId, qint64 &sub);
std::vector<std::string> forEachFile(const std::string &dir_name);
- qint64 getVideoTime(const std::string& videoPath);
+ qint64 getVideoTime(/*const std::string& videoPath*/std::string &str_tmpTime);
+
+
+ static void uploadServer(devHttpServer_c *t_ptrThis, std::string sendUrl, std::string param);
+
+ void UploadPersonToUserCenter(string &img_url, string &idcard, string &strUUID, string &feature_base64);
+
+ void UploadPersonToMonitorCenter(string &img_url, string &idcard, string &strUUID, string &feature_base64,
+ string &strTableId, string &strControl);
+
+ void UpdatePersonToMonitorCenter(string &img_url, string &idcard, string &strUUID, string &strTableId,
+ string &strControl);
+
+ void
+ UploadTaskToMonitorCenter(string &Uuid, string &TableName, string &SyncType, string &StartTime, string &EndTime,
+ string &UploadFlag, string &CmpThreshold, string &Enabled);
+
+ void
+ addPersonMToDB(const string &TableName, const string &img_url, const string &SyncType, const string &feature_base64,
+ const Features &faceResults, string &idcard, string &strUUID, string &monLevel, string &Enabled,
+ bool &ret_addPerson);
+
+ void getMat(string &img_url, const string &img_base64, cv::Mat &image) const;
};
#endif
--
Gitblit v1.8.0