From e1695ed29b0d36aff365fa4337e67f098f00b5f4 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 12 九月 2019 15:43:14 +0800
Subject: [PATCH] ---联动任务
---
ruleserver/ruleToformula.go | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index a236fbd..4f8151d 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -161,7 +161,7 @@
}
}
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) bool {
+func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) (bool,[]int) {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
@@ -357,27 +357,30 @@
} else {
islink = false
}
+ var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
if sdkNames != "" {
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId, islink,label,})
+ labelTypes = append(labelTypes,0)
//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
if faceFlag {
args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId, islink,label,}, faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+ labelTypes = append(labelTypes,1)
}
- return true
+ return true,labelTypes
} else {
- return false
+ return false,[]int{}
}
} else {
// 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
TimerAlarm(&label, groupRule.GroupId, result.(bool))
//fmt.Println(timeFlag)
- return false
+ return false,[]int{}
}
} else {
- return false
+ return false,[]int{}
}
}
@@ -432,6 +435,7 @@
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
if groupRule.Rules[j].CameraId == ruleRes.CameraId {
flag1 = false
}
@@ -442,7 +446,7 @@
}
}
// 寰�鏁扮粍閲岃祴鍊�
- isOk := RunRule(args, groupRule, taskId, message, label)
+ isOk,labelTypes := RunRule(args, groupRule, taskId, message, label)
if isOk {
logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
@@ -471,8 +475,10 @@
}
// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
var isPerfect = true
+ logger.Info("鑱斿姩浠诲姟鏁扮粍锛�")
for _, va := range timeEle.RuleResults {
//logger.Info("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�", *va)
+ logger.Info("鑱斿姩瀛愬厓绱狅細",va.Sort,va.RuleWithPre,va.Result,va.CameraId)
if va.Result == "" && va.RuleWithPre != "||" {
isPerfect = false
}
@@ -515,8 +521,22 @@
} else {
logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
- lens := len(args.RuleResult["yolo"].([]Result))-1
- args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
+ for _,val := range labelTypes {
+ if val == 0 {
+ if len(args.RuleResult["yolo"].([]Result)) >= 1 {
+ lens := len(args.RuleResult["yolo"].([]Result))-1
+ args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
+ }
+ }
+ if val == 1 {
+ if len(args.RuleResult["face"].([]FaceResult)) >= 1 {
+ lens := len(args.RuleResult["face"].([]FaceResult))-1
+ args.RuleResult["face"] = args.RuleResult["face"].([]FaceResult)[0:lens]
+ }
+ }
+ }
+
+
}
} else { // 娌℃湁鎶ヨ锛�
//logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
@@ -577,14 +597,14 @@
var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
- // 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
- am.filterData = am.filterData[0:0]
//logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
} else {
args = am.args
//涓嶆竻绌轰箣鍓嶇殑杩囨护鏁版嵁锛岀户缁
//logger.Info("娌¤繃婊ょ殑args鐨勯暱搴︿负锛�",len(args))
}
+ // 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
+ am.filterData = am.filterData[0:0]
//logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
for _, arg := range args {
var formula string
--
Gitblit v1.8.0