From 740800875ea9f2b02674d91d4246bbf070d3a760 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 10:02:15 +0800
Subject: [PATCH] label重大更新
---
ruleserver/ruleToformula.go | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index fccac27..bce9a16 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -121,6 +121,20 @@
args.RuleResult["face"] = []FaceResult{}
//logger.Warn("浼犺繘鍘讳箣鍓嶆槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
+ // 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
+ for _, group := range taskGroup.GroupRules {
+ //logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
+ taskId := taskGroup.TaskId
+ //logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
+ temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
+ label := make(map[string]interface{})
+ if len(temp) > 0 {
+ if group.SetType != "linkTask" {
+ // 鐙珛浠诲姟鐨勫鐞�
+ RunRule(args, group, taskId, message,label)
+ }
+ }
+ }
for _, group := range taskGroup.GroupRules {
//logger.Println("------------------------------浠诲姟瑙勫垯锛�",taskRule)
taskId := taskGroup.TaskId
@@ -131,9 +145,6 @@
if group.SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
LinkTask(args, group, taskId, message,label)
- } else {
- // 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, group, taskId, message,label)
}
}
}
@@ -286,7 +297,7 @@
}
// 杩涜瀹氭椂鍣ㄧ殑澶勭悊鍜屽垽鏂�
timeFlag := TimerAlarm(label, groupRule.GroupId, result.(bool))
- if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 婊¤冻瀹氭椂鍣ㄦ潯浠�
+ if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 娌℃湁瀹氭椂鍣ㄦ垨鑰呮弧瓒冲畾鏃跺櫒鏉′欢
// 鎵撲汉鑴告爣绛惧拰yolo鏍囩
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
@@ -317,13 +328,17 @@
}
}
}
+ nihao := make(map[string]interface{})
+ for k,v := range label{
+ nihao[k] = v
+ }
//logger.Debug("------locations鐨勫唴瀹癸細", locations)
if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,nihao})
//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,label},faces})
+ args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,nihao},faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
}
return true
@@ -412,7 +427,11 @@
for _, va := range timeEle.RuleResults {
if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
- va.CacheData = ResultMsg{message,args.RuleResult}
+ tempMap := make(map[string]interface{})
+ for k,result := range args.RuleResult {
+ tempMap[k] = result
+ }
+ va.CacheData = ResultMsg{message,tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
@@ -440,12 +459,24 @@
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
- label["linkCache"] = []*ResultMsg{}
+ label["linkCache"] = []ResultMsg{}
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
}
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]*ResultMsg)))
- //os.Exit(1)
+ logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
+ //for _,result := range args.RuleResult["yolo"].([]Result) {
+ // if result.RuleGroupId == groupRule.GroupId {
+ // result.Others["linkCache"] = label
+ // }
+ //}
+ for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
+ if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婂師鏉ラ偅涓垹鎺夊啀瀛樹竴浠芥柊鐨�
+ res := args.RuleResult["yolo"].([]Result)[i]
+ res.Others["linkCache"] = label["linkCache"]
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
+ }
+ }
}
}
} else {
--
Gitblit v1.8.0