From b9d95191e0326a1a75f3809d75b94638c47c3d43 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 16:58:51 +0800
Subject: [PATCH] ---
---
algorithm/middleware/middleware.go | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index a9c4ea7..52973c2 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -18,6 +18,7 @@
resultSplice := []*structure.LittleRuleResult{}
sdkNames := ""
polygonId := ""
+
// 杩欐杩囩殑鏄椂闂存瑙勫垯锛堟椂闂存绛夛級
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
@@ -32,7 +33,7 @@
ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
if strings.Contains(ruleResult.Result, "false") {
- return false,"","" // 涓嶇鍚堟椂闂磋鍒欑殑璇濈洿鎺ヨ繑鍥烇紝涓嶅啀娴垂鏃堕棿
+ return false,"","" // 涓嶇鍚堟椂闂磋鍒欑殑璇濈洿鎺ヨ繑鍥烇紝涓嶅啀娴垂绋嬪簭鎵ц
}
if strings.Contains(ruleResult.Result, "true") {
areaMap.IsEffective = true
@@ -72,6 +73,12 @@
//logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
ruleResult := CallSo(sdk.Id, groupRule.Rules[j], areaMap,lable,args,message)
+ logger.Info("鍓嶇疆杩炴帴绗︼細",groupRule.Rules[j])
+ if groupRule.Rules[j].RuleWithPre == "鈯�" && len(ruleResult.Target) > 0 {
+ assembleDta(resultSplice[len(resultSplice)-1].Target,ruleResult.Target,)
+ // 鎶婂綋鍓嶅皬瑙勫垯缁撴灉缃┖
+ ruleResult = structure.LittleRuleResult{}
+ }
if ruleResult.Result != "" {
//logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
// 濡傛灉缁撴灉涓虹湡锛屾妸杩欐潯瑙勫垯涓殑鍖哄煙缃负鏈夋晥
@@ -202,16 +209,14 @@
}
// 璺ㄦ憚鍍忔満璺熻釜
for j := 0; j < len(groupRule.Rules); j++ {
- if groupRule.Rules[j].SdkId == "浜轰綋璺熻釜" && groupRule.Rules[j].SdkArgAlias != "鐏甸瓊鍙傛暟"{
+ if groupRule.Rules[j].SdkId == "520af340-f257-4fe2-ac3c-695c390e53dc" && groupRule.Rules[j].SdkArgAlias == "cmpThreshold"{
for _, sdkData := range args.Sdkdata {
// 鏍规嵁瑙勫垯鐨剆dkId鏌ュ嚭鍏跺搴旂殑ipcId锛岀敤ipcId鍘绘壘璇ユ瘮瀵圭殑鏁版嵁
sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
if err != nil {
- _ = logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
+ logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
}
ipcId := sdk.IpcId
- sdkName := sdk.SdkName
- //logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
if ipcId == sdkData.IpcId {
//logger.Info("褰撳墠璧扮殑瑙勫垯鏄�--锛�", groupRule.Rules[j],sdkName,groupRule.Rules[j].SdkArgAlias, "---","")
for _, areaMap := range sdkData.AreaMapList {
@@ -222,13 +227,7 @@
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 + " "
- }
- 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)
}
}
@@ -331,7 +330,7 @@
break
}
}
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + flag, Sort:rule.Sort}
}
if rule.Operator == "unsatisfy" || rule.Operator == "!=" { // 涓嶆弧瓒虫墍閫夌殑鏃堕棿瑙勫垯
@@ -351,7 +350,7 @@
break
}
}
- return structure.LittleRuleResult{am.SdkName, rule.RuleWithPre + "" + flag, rule.Sort}
+ return structure.LittleRuleResult{SdkName:am.SdkName, Result:rule.RuleWithPre + "" + flag, Sort:rule.Sort}
}
}
@@ -378,7 +377,7 @@
soName = "static.so"
case "812b674b-2375-4589-919a-5c1c3278a978":
soName = "plate.so"
- case "浜轰綋璺熻釜":
+ case "520af340-f257-4fe2-ac3c-695c390e53dc":
soName = "personTrack.so"
}
//soInfo,err := cache.GetSoInfoById(sdkId)
@@ -425,4 +424,71 @@
}
}
return 0
-}
\ No newline at end of file
+}
+
+//// 鏃堕棿娈佃皟搴�
+//func timeDispatch(args *structure.SdkDatas,groupRule protomsg.GroupRule,resultSplice []*structure.LittleRuleResult,sdkNames,polygonId string) (bool,string,string){
+// // 杩欐杩囩殑鏄椂闂存瑙勫垯锛堟椂闂存绛夛級
+// for j := 0; j < len(groupRule.Rules); j++ {
+// for _, sdkData := range args.Sdkdata {
+// sdk, err := cache.GetSdkById(groupRule.Rules[j].SdkId)
+// if err != nil {
+// logger.Error("娌℃煡鍒皊dk鐨勪俊鎭�---", err)
+// }
+// ipcId := sdk.IpcId
+// sdkName := sdk.SdkName
+// if ipcId == sdkData.IpcId {
+// for _, areaMap := range sdkData.AreaMapList {
+// ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
+// if ruleResult.Result != "" {
+// if strings.Contains(ruleResult.Result, "false") {
+// return false,"","" // 涓嶇鍚堟椂闂磋鍒欑殑璇濈洿鎺ヨ繑鍥烇紝涓嶅啀娴垂绋嬪簭鎵ц
+// }
+// if strings.Contains(ruleResult.Result, "true") {
+// areaMap.IsEffective = true
+// }
+// //logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
+// if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
+// sdkNames = sdkName + " "
+// }
+// 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)
+// }
+// }
+// }
+// }
+// }
+//}
+
+//func assembleData(args *structure.SdkDatas,resultSplice []*structure.LittleRuleResult,groupRule protomsg.GroupRule) {
+// for index,result := range resultSplice {
+// if strings.Contains(result.Result,"contain") {
+// assembleDta(args,groupRule.Rules[index-1],groupRule.Rules[index])
+// // 鍒犻櫎甯︽湁contain鐨勮鍒欑粨鏋�
+// resultSplice = append(resultSplice[:index],resultSplice[index+1:]...)
+// }
+// }
+//}
+// 濡傛灉瑙勫垯缁勪腑鏈夊寘鍚鍙凤紝鎶婅鍒欑粍涔嬪悗鐨勮鍒欏搴旂殑绠楁硶鍜屽尯鍩熸彁鍙栫殑鏁版嵁瑁呴厤鍒板墠闈㈠幓
+func assembleDta(targets1,targets2 []*structure.Arg) {
+ if len(targets1) > 0 {
+ logger.Info("鏈変汉浣擄細",len(targets1))
+ for _,target := range targets1 {
+ mergeArg(target,targets2)
+ targets2 = nil
+ return // 瑁呴厤涓�娆″氨鍙互
+ }
+ }
+}
+
+func mergeArg(arg *structure.Arg,targets2 []*structure.Arg) {
+ for _,arg1 := range targets2 {
+ logger.Info("浜鸿劯锛�",arg1.Location,arg1.Score)
+ precent := ruleserver.PgsInterPercent(Rect2Point(arg.Location),arg1.Location,1,1)
+ if precent > 99 {
+ arg.AttachArg = arg1.SourceArg
+ }
+ }
+}
--
Gitblit v1.8.0