From 5433ad847a4eb284658dc7543fa3d94680e5e5bd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 23 七月 2019 18:34:14 +0800
Subject: [PATCH] 追踪添加容错
---
ruleserver/ruleToformula.go | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index fab9874..3e248c9 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -89,6 +89,12 @@
Location []Rect // 鐩爣鐨勫潗鏍�
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
}
+
+// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
+type FaceResult struct {
+ Result
+ Args []*Arg
+}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
Result string // 宸插寘鍚簡鍓嶇疆杩炴帴绗�
@@ -518,7 +524,6 @@
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
if rule.PolygonId == am.areaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
@@ -591,8 +596,8 @@
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
- logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
if rule.SdkArgAlias == "objCount" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
+ logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
//logger.Info("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
if rule.Operator == "" {
return LittleRuleResult{am.sdkName, strconv.Itoa(am.targetNum) + "" + rule.RuleWithPre, rule.Sort} // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
@@ -627,8 +632,7 @@
}
func timeRuleResult(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
- logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
- if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙勫垯
+ if rule.SdkArgAlias == "time_rule" { // 鍒ゆ柇鏄惁绗﹀悎鏃堕棿瑙�
logger.Info("----------褰撳墠鏃堕棿瑙勫垯锛�---------", rule)
// 鏍规嵁鏀惧�煎瓧娈甸噷瀛樼殑鏃堕棿瑙勫垯鐨刬d鍘诲彟涓�涓〃閲屾煡闇�瑕佹瘮瀵圭殑鏃堕棿娈碉紙姣斿褰撳墠鏃堕棿鏄懆涓夛紝搴旀牴鎹尯鍩焛d鏌ュ嚭鍏跺懆涓夌殑鍑犱釜甯冮槻鏃堕棿娈碉紝鏁扮粍锛�
//logger.Info("鏃堕棿瑙勫垯鐨勬祴璇�")
--
Gitblit v1.8.0