From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index b25f94a..3fe1e83 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -189,12 +189,22 @@
static void uploadServer(devHttpServer_c *t_ptrThis, std::string sendUrl, std::string param);
- void devHttpServer_c::UploadPersonToUserCenter(string &img_url, string &idcard, string &strUUID,
- string &feature_base64);
+ 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, bool &ret_addPerson) const;
+ 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;
};
--
Gitblit v1.8.0