From efafab5273ba3ff13a19f07088c320a5180188b6 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期四, 31 一月 2019 10:49:56 +0800
Subject: [PATCH] 1.2_布控feature: Auto stash before merge of "ywv1.2_布控feature" and "origin/ywv1.2_布控feature"
---
QiaoJiaSystem/DataManagerServer/http_configserver.h | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/http_configserver.h b/QiaoJiaSystem/DataManagerServer/http_configserver.h
index 41625ab..3fe1e83 100644
--- a/QiaoJiaSystem/DataManagerServer/http_configserver.h
+++ b/QiaoJiaSystem/DataManagerServer/http_configserver.h
@@ -189,15 +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 devHttpServer_c::UploadPersonToMonitorCenter(string &img_url, string &idcard, string &strUUID,
- string &feature_base64, string &strTableId, string &strControl);
+ 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