From 7b20cb1a629526553ed640c42108fe3fba203040 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 27 九月 2019 14:17:28 +0800
Subject: [PATCH] logger改用公共库
---
ruleserver/ruleToformula.go | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ae1e45a..1033825 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,7 +2,7 @@
import (
"ruleprocess/cache"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
"sort"
"strconv"
"strings"
@@ -116,6 +116,11 @@
// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 thisSdkDatas 褰撳墠浼犲叆鐨勮繖甯ф暟鎹紝cacheSdkData 瀹氭椂鍣ㄩ噷缂撳瓨鐨勪竴甯ф暟鎹� 娌℃湁灏辫繑鍥瀗il (thisSdkDatas SdkDatas, cacheSdkDatas SdkDatas)
func Judge(args *SdkDatas, message *protomsg.SdkMessage) {
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("瑙勫垯妯″潡鍎跨殑寮傚父鎹曡幏锛�",err)
+ }
+ }()
if len(args.Sdkdata) > 0 {
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
cameraPolygons := GetPolygons(args.CameraId)
@@ -693,6 +698,12 @@
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
+ } else if rule.SdkArgAlias == "" {
+ if am.targetNum > 0 {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
} else {
return LittleRuleResult{}
}
--
Gitblit v1.8.0