From 0e28dd6942c8a7207146f6a6b542bc45f75462b0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 16 十二月 2019 13:35:26 +0800
Subject: [PATCH] ---
---
algorithm/middleware/middleware.go | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index ff98ea8..507f864 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -73,6 +73,7 @@
//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 == "鈯�" {
assembleDta(args,groupRule.Rules[j-1],groupRule.Rules[j])
// 鎶婂綋鍓嶅皬瑙勫垯缁撴灉缃┖
@@ -99,41 +100,41 @@
}
}
// 浜鸿劯
- //for j := 0; j < len(groupRule.Rules); j++ {
- // if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && groupRule.Rules[j].SdkArgAlias != "time_rule"{
- // 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,lable,args,message)
- // 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 + " "
- // }
- // 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)
- // }
- // }
- // }
- // }
- // }
- //}
+ for j := 0; j < len(groupRule.Rules); j++ {
+ if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && groupRule.Rules[j].SdkArgAlias != "time_rule"{
+ 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,lable,args,message)
+ 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 + " "
+ }
+ 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)
+ }
+ }
+ }
+ }
+ }
+ }
// 涓綋闈欐
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a977" && groupRule.Rules[j].SdkArgAlias == "duration"{
@@ -376,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)
@@ -473,7 +474,7 @@
// 濡傛灉瑙勫垯缁勪腑鏈夊寘鍚鍙凤紝鎶婅鍒欑粍涔嬪悗鐨勮鍒欏搴旂殑绠楁硶鍜屽尯鍩熸彁鍙栫殑鏁版嵁瑁呴厤鍒板墠闈㈠幓
func assembleDta(args *structure.SdkDatas,rule1,rule2 *protomsg.Rule) {
// 鎷垮埌鍚庨潰鐨勯偅涓尯鍩熺殑鏁版嵁
- logger.Info("瑙﹀彂浜嗗寘鍚簨浠讹紝鎶婂悗鑰呯殑鏁版嵁缁欏埌鍓嶈��")
+ logger.Info("瑙﹀彂浜嗗寘鍚簨浠讹紝鎶婂悗鑰呯殑鏁版嵁缁欏埌鍓嶈��",*rule1,*rule2)
area := structure.AreaMap{}
for _, sdkData := range args.Sdkdata {
for _, areaMap := range sdkData.AreaMapList {
--
Gitblit v1.8.0