From 5e1582005a9350d08e95f3174cdb29e2fe6f1a91 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 11 九月 2019 11:07:45 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 68 ++++-----------------------------
1 files changed, 9 insertions(+), 59 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index b07e33d..0b6b606 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -64,57 +64,6 @@
}
}
-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)
- }
- }()
- logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠澶ц鍒�--锛�", (*groupRule).GroupText)
- //logger.Warn("浼犺繘鍘讳箣鍚庢槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
- Compare(args, groupRule)
- resultSplice := []*structure.LittleRuleResult{}
- sdkNames := ""
- polygonId := ""
- // 鍏堣繃瀹屾潯浠惰鍒�
- for j := 0; j < len(groupRule.Rules); j++ {
- for _, sdkData := range args.Sdkdata {
- // 鏍规嵁瑙勫垯鐨剆dkId鏌ュ嚭鍏跺搴旂殑ipcId锛岀敤ipcId鍘绘壘璇ユ瘮瀵圭殑鏁版嵁
- sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
- if err != nil {
- logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
- }
- ipcId := sdk.IpcId
- sdkName := sdk.SdkName
- //logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
- if ipcId == sdkData.IpcId {
- //logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", sdkName, "---","")
- for _, areaMap := range sdkData.AreaMapList {
- ruleResult := CallSo(sdk.Id,groupRule.Rules[j],areaMap)
- //ruleResult := filterRule(groupRule.Rules[j], areaMap)
- if ruleResult.Result != "" {
- logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
- // 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
- if strings.Contains(ruleResult.Result, "true") {
- areaMap.IsEffective = true
- }
- // 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽olo绠楁硶锛屽簲璁颁笅姝よ鍒欐墍瀵瑰簲鐨剆dkName,鍙﹀锛岃繕瑕佸幓閲� (鍚庡姞锛氭妸姝ゆ潯瑙︾鐨勫尯鍩焛d涔熻褰曚笅鏉�)
- if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- sdkNames = sdkName + ","
- polygonId = groupRule.Rules[j].PolygonId + ","
- }
- if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
- polygonId = groupRule.Rules[j].PolygonId + ","
- }
- resultSplice = append(resultSplice, &ruleResult)
- }
- }
- }
- }
- }
- return false
-}
-
func CallSo(sdkId string,rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult{
// 鏍规嵁sdkId鏌ュ嚭鍏跺搴旂殑sdk鐨剆oName锛岃皟鐢ㄧ浉搴攕o鐨凟ntrance鏂规硶
var soName = ""
@@ -151,7 +100,7 @@
a,b,c := f.(func(args *structure.SdkDatas,rule protomsg.GroupRule)([]*structure.LittleRuleResult, string, string))(args,rule)
return a,b,c
}
-func RunRule(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) bool {
+func RunRule(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) (bool,[]int) {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err)
@@ -254,7 +203,7 @@
}
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,})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]structure.Result), structure.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)))
}
@@ -415,15 +364,15 @@
// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
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 len(args.RuleResult["yolo"].([]structure.Result)) >= 1 {
+ lens := len(args.RuleResult["yolo"].([]structure.Result))-1
+ args.RuleResult["yolo"] = args.RuleResult["yolo"].([]structure.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]
+ if len(args.RuleResult["face"].([]structure.FaceResult)) >= 1 {
+ lens := len(args.RuleResult["face"].([]structure.FaceResult))-1
+ args.RuleResult["face"] = args.RuleResult["face"].([]structure.FaceResult)[0:lens]
}
}
}
@@ -446,6 +395,7 @@
}
}
+
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) {
if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
--
Gitblit v1.8.0