From 73e4d775a359b5490b5ebc1465f1b9d682a3bbe5 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 07 十一月 2019 19:56:09 +0800
Subject: [PATCH] Merge branch 'module' of http://192.168.5.5:10010/r/ruleprocess into module
---
algorithm/middleware/middleware.go | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/algorithm/middleware/middleware.go b/algorithm/middleware/middleware.go
index a4577fa..928d6e8 100644
--- a/algorithm/middleware/middleware.go
+++ b/algorithm/middleware/middleware.go
@@ -2,17 +2,17 @@
import (
"basic.com/pubsub/protomsg.git"
+ "basic.com/valib/logger.git"
"encoding/json"
"github.com/knetic/govaluate"
"plugin"
"ruleprocess/cache"
- "ruleprocess/logger"
"ruleprocess/structure"
"strings"
"time"
)
-func Entrance (args *structure.SdkDatas,groupRule protomsg.GroupRule) {
+func Entrance (args *structure.SdkDatas,groupRule protomsg.GroupRule) ([]*structure.LittleRuleResult,string,string){
resultSplice := []*structure.LittleRuleResult{}
sdkNames := ""
polygonId := ""
@@ -40,11 +40,10 @@
}
// 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽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 + ","
+ 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 + ","
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -76,11 +75,10 @@
}
// 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽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 + ","
+ 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 + ","
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -109,10 +107,10 @@
}
logger.Info("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- 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 + ","
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -139,10 +137,10 @@
}
logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
- 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 + ","
+ polygonId = groupRule.Rules[j].PolygonId + " "
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -150,6 +148,7 @@
}
}
}
+ return resultSplice,sdkNames,polygonId
}
func timeRuleResult(rule *protomsg.Rule, am *structure.AreaMap) structure.LittleRuleResult {
@@ -216,11 +215,16 @@
soName = "face.so"
} else if sdkId == "812b674b-2375-4589-919a-5c1c3278a975"{
soName = "intrusion.so"
- } else if sdkId == "812b674b-2375-4589-919a-5c1c3278a976" {
+ } else if sdkId == "812b674b-2375-4589-919a-5c1c3278a976" || sdkId == "812b674b-2375-4589-919a-5c1c3278a973" {
soName = "personUnsual.so"
} else if sdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
soName = "faceCompare.so"
}
+ //soInfo,errr := cache.GetSoInfoById(sdkId)
+ //if errr != nil {
+ // panic("娌¤鍒版敞鍐岃〃")
+ //}
+ //soName := soInfo.SoName
p,err := plugin.Open("./algorithm/"+soName)
if err != nil {
panic(err)
--
Gitblit v1.8.0