From c38107509ab41692f30c014d7f7c785f2416f873 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 24 七月 2019 18:20:57 +0800
Subject: [PATCH] 添加人脸报警等级
---
insertdata/insertDataToEs.go | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 23557b6..554645b 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -55,6 +55,7 @@
TaskName string `json:"taskName"`
SdkName string `json:"sdkName"`
Content string `json:"content"`
+ AlarmRules []AlarmRule `json:"alarmRules"`
LikeDate string `json:"likeDate"`
Sex string `json:"sex"`
Age int32 `json:"age"`
@@ -142,6 +143,11 @@
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
+ alarmRules := []AlarmRule{}
+ for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+ alarm := ChangeToString(faceResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText})
+ }
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
@@ -183,6 +189,7 @@
msg.Tasklab.Taskname,
"浜鸿劯",
"",
+ alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
sex,
face.ThftRes.Age,
@@ -257,6 +264,7 @@
msg.Tasklab.Taskname,
"浜鸿劯",
"鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
+ []AlarmRule{},
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
"",
0,
--
Gitblit v1.8.0