From f1d50675c06b687063c6a3a03599cbcd597dd663 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 24 七月 2019 13:49:16 +0800
Subject: [PATCH] 变更人脸标签结构
---
ruleserver/ruleToformula.go | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 2617389..b8ae4a3 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -117,7 +117,7 @@
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
args.RuleResult = make(map[string]interface{})
args.RuleResult["yolo"] = []Result{}
- args.RuleResult["face"] = []Arg{}
+ args.RuleResult["face"] = []FaceResult{}
if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
for _, group := range taskGroup.GroupRules {
//logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
@@ -280,9 +280,6 @@
}
}
}
- if faceFlag {
- args.RuleResult["face"] = faces
- }
logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
// 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
locations := []Rect{}
@@ -298,7 +295,7 @@
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId})
logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
- if args.RuleResult["face"] != nil {
+ if faceFlag {
args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId},faces})
logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].(FaceResult).Args))
}
--
Gitblit v1.8.0