From b5c7ce578bcc535779b2f4b61f190c71cc77320c Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 15 一月 2019 17:15:42 +0800
Subject: [PATCH] # Type(<scope>): <subject>

---
 QiaoJiaSystem/StructureApp/FaceExtractElement.cpp |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
index c1519f2..df00857 100644
--- a/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
+++ b/QiaoJiaSystem/StructureApp/FaceExtractElement.cpp
@@ -4,6 +4,7 @@
 #include <QtCore/QString>
 #include <basic/util/app/AppUtil.h>
 #include <basic/util/opencv/CvUtil.h>
+#include <basic/util/app/AppPreference.hpp>
 //diao鐢ㄥ搴攅s鏁版嵁灏佽鐨勭被
 //#include <basic/db/ES/es/ManagerEsDB.h>
 #include <basic/db/Elasticsearch/EsDBTool.h>
@@ -11,6 +12,7 @@
 #include <QtCore/QJsonObject>
 #include <uuid/uuid.h>
 #include <jsoncpp/json/json.h>
+#include <basic/util/app/AppConfig.h>
 
 #define state "state"
 
@@ -182,6 +184,9 @@
                 t_json["Race"] = "";//妫�娴嬬殑绉嶆棌  搴旇涓虹┖ 鏃犳娴嬬粨鏋�
                 t_json["videoIp"] = getProperty("local_ip");//褰撳墠鏈嶅姟鍣↖P鍦板潃
 
+                t_json["cluster_id"] = appConfig.getStringProperty("clusterID");//闆嗙兢id
+                t_json["ack_alarm"] = "0";//ack_alarm鏄惁鎶ヨ
+
                 //#todo 浼樺寲 get vector<string> from json
                 switch (atoi(faceExtractQueueTmp[i].scoredRects[j].properties["race"].c_str())) {
                     case 1:

--
Gitblit v1.8.0