From f946a62d3921e86b44ff8e2973138304b9cd53cd Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 16 四月 2019 16:36:32 +0800
Subject: [PATCH] 解决修改参数和推流画面跳跃问题
---
syncDBTool/ErlangDbTool.h | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/syncDBTool/ErlangDbTool.h b/syncDBTool/ErlangDbTool.h
index 76ce646..f738219 100755
--- a/syncDBTool/ErlangDbTool.h
+++ b/syncDBTool/ErlangDbTool.h
@@ -21,6 +21,7 @@
#include <stdarg.h>
#include <jsoncpp/json/json.h>
#include <arpa/inet.h>
+#include <SqliteToolkit.hpp>
#include "erl_interface.h"
#include "ei.h"
@@ -135,15 +136,18 @@
private:
void initCNode();
- public:
- //#todo setCNodeName
+ // 鍚慹rlang绔洿鎺ュ彂閫乻ql璇彞
+ bool getExecSqlResult(const std::string &strSql);
+ public:
+
+ // 灏哻鑺傜偣鍚嶇О璁剧疆缁檈rlang浣垮叾鍙互鍦ㄦ帴鏀跺埌娑堟伅鏃�,鑳介�氱煡鍒版湰鑺傜偣
bool setCNodeName();
+ // 鍚慹rlang鍙戦�佹秷鎭�, #TODO 鐩墠浠呭疄鐜颁簡淇″彿,寰呭疄鐜版秷鎭綋
bool sendMessage();
- //#todo sendMessage
-
+ // 璁剧疆鍖垮悕c鑺傜偣鎺ュ彈erlang鑺傜偣鍚慶鑺傜偣鍙戦�佺殑娑堟伅
void test(pthread_cond_t *, pthread_mutex_t *);
/***
@@ -171,7 +175,12 @@
*/
bool removeNode();
-
+ /**
+ * 淇敼闆嗙兢鍚嶇О
+ * @param CluId
+ * @param CluName
+ * @return
+ */
bool modifyCluName(std::string CluId, std::string CluName);
@@ -189,10 +198,27 @@
* @param TableName
* @param SyncType true 1||false 0
* @param BwType "Black"1||"White"0
+ * @param StartTime
+ * @param EndTime
* @return 鍒涘缓鐘舵��
*/
bool createDatabase(std::string TableType, std::string TableName, bool SyncType, std::string BwType,
std::string StartTime = "", std::string EndTime = "");
+
+ /***
+ * 鍒涘缓搴曞簱琛�
+ * @param TableType TableType car||person
+ * @param TableName
+ * @param SyncType true 1||false 0
+ * @param BwType "Black"1||"White"0
+ * @param UploadFlag 鏄惁涓婁紶
+ * @param CmpThreshold 瀵规瘮闃堝��
+ * @param Enabled 鏄惁鍚敤
+ * @param StartTime
+ * @param EndTime
+ * @return
+ */
+ bool createDatabase(std::string t_tableName, FieldValues &fieldValues);
/***
* 鏇存柊搴曞簱琛�
@@ -205,6 +231,8 @@
bool updateDatabase(std::string UUID, std::string TableType, std::string TableName, bool SyncType,
std::string BwType, std::string StartTime = "", std::string EndTime = "");
+ bool updateDatabase(std::string t_tableName, FieldValues &fieldValues);
+
/***
* 鍒犻櫎鏁版嵁琛�
* @param TableType car||person
@@ -213,6 +241,8 @@
* @return
*/
bool deleteDatabase(std::string TableType, std::string TableName, bool SyncType);
+
+ bool deleteDatabase(std::string t_tableName);
/***
* 鏌ヨ鎵�鏈夋暟鎹〃
@@ -241,6 +271,11 @@
bool addPerson(std::string &UUID, std::string TableName, std::string Feature, std::string ImgUrl = " ",
std::string IdCard = " ", std::string PersonName = " ", std::string Age = " ",
std::string Sex = " ", std::string PhoneNum = " ");
+
+ bool
+ ErlangTool::ErlangDbTool::addPerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues);
+
+ bool updatePerson(std::string t_tableName, AddFaceData &faceData, FieldValues &fieldValues);
vec_AddDataCache addPersons(std::string TableUuid, std::vector<SyncDB::AddPersonInfo> &tmpPer);
@@ -274,7 +309,7 @@
std::string PerPicUrl, std::string PerFea);
// private:
/***
- * 閲嶆柊杩炴帴鑺傜偣
+ * 涓轰簡闃叉杩囬暱鏃堕棿杩炴帴琚叧闂�,涓诲姩閲嶆柊杩炴帴鑺傜偣
* @return 杩炴帴鐘舵��
*/
bool resetConn();
@@ -290,8 +325,11 @@
private:
//瀛樺偍璺緞
std::string m_path;
+ // erlang 鑺傜偣鍚嶇О
std::string m_nodeName;
+ // 绋嬪簭鍐呯殑c鑺傜偣鍚嶇О 杩涚▼鍚�+pid@127.0.0.1
std::string m_cNodeName;
+ // 杩涚▼鍚�+pid?#TODO
std::string m_pName;
std::string m_cookie;
--
Gitblit v1.8.0