From 299dc1fe1772c950c379b2a8b6c9c3c297c06f1e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 11:23:52 +0800
Subject: [PATCH] 人脸对比规则放开compareBase
---
ruleserver/ruleToformula.go | 110 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 73 insertions(+), 37 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index a691282..66dbb62 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -14,6 +14,7 @@
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
type Arg struct {
+ Id uint64
Score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
Size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
@@ -45,6 +46,7 @@
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
type PhotoMap struct {
+ Id uint64
Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
IsYolo bool // 鏄惁鏄痽olo鏁版嵁
@@ -88,13 +90,18 @@
RuleText string // 鏂囧瓧鐗堣鍒欑粍
Location []Rect // 鐩爣鐨勫潗鏍�
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
- Others map[string]interface{} // cacheData: []ResultMsg,(鏈粍瑙勫垯涓惈鏈夋寔缁椂闂寸殑瑙勫垯寮�鍚殑瀹氭椂鍣ㄧ紦瀛樼殑鏁版嵁甯�)锛宭inkCache: []ResultMsg 锛宼imeLabel: 00,01,10,11,12
+ Others
+}
+type Others struct {
+ CacheData []ResultMsg //(鏈粍瑙勫垯涓惈鏈夋寔缁椂闂寸殑瑙勫垯寮�鍚殑瀹氭椂鍣ㄧ紦瀛樼殑鏁版嵁甯�)
+ LinkCache []ResultMsg
+ TimeLabel string
}
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type FaceResult struct {
Result
- Args []Arg
+ Args []Arg
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
@@ -127,11 +134,11 @@
taskId := taskGroup.TaskId
//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- label := make(map[string]interface{})
+ label := Others{}
if len(temp) > 0 {
if group.SetType != "linkTask" {
// 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, group, taskId, message,label)
+ RunRule(args, group, taskId, message, label)
}
}
}
@@ -140,11 +147,11 @@
taskId := taskGroup.TaskId
//logger.Println("------------鏈粍浠诲姟涓嬬殑瑙勫垯缁勭殑鏁伴噺锛�",len(ruleList))
temp := group.Rules // temp涓轰竴缁勫畬鏁磋鍒� 鍦ㄦ闇�瑕佸垽鏂鍒欐槸鍚︽槸鑱斿姩瑙勫垯
- label := make(map[string]interface{})
+ label := Others{}
if len(temp) > 0 {
if group.SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- LinkTask(args, group, taskId, message,label)
+ LinkTask(args, group, taskId, message, label)
}
}
}
@@ -152,7 +159,7 @@
}
}
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage,label map[string]interface{}) bool {
+func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) bool {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
@@ -266,14 +273,14 @@
completeFormula = completeFormula[1:]
}
logger.Info("-------------------鐪嬬湅鎷旀瘺鍚庣殑琛ㄨ揪寮忥細", completeFormula)
- expression, _ := govaluate.NewEvaluableExpression(completeFormula)
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return result.(bool)
+ //expression, _ := govaluate.NewEvaluableExpression(completeFormula)
+ //result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ //return result.(bool)
}
if completeFormula != "" {
logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
- expression, err := govaluate.NewEvaluableExpression(completeFormula)
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil{
+ expression, err2 := govaluate.NewEvaluableExpression(completeFormula)
+ if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err2 != nil {
panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
}
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -296,8 +303,8 @@
}
}
// 杩涜瀹氭椂鍣ㄧ殑澶勭悊鍜屽垽鏂�
- timeFlag := TimerAlarm(label, groupRule.GroupId, result.(bool))
- if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 婊¤冻瀹氭椂鍣ㄦ潯浠�
+ timeFlag := TimerAlarm(&label, groupRule.GroupId, result.(bool))
+ if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" { // 娌℃湁瀹氭椂鍣ㄦ垨鑰呮弧瓒冲畾鏃跺櫒鏉′欢
// 鎵撲汉鑴告爣绛惧拰yolo鏍囩
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
@@ -311,7 +318,7 @@
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
for _, areaMap := range sdkData.AreaMapList {
- faces = append(faces, putFaceToResult(areaMap,faces)...)
+ faces = append(faces, putFaceToResult(areaMap, faces)...)
}
}
}
@@ -330,11 +337,11 @@
}
//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, label})
//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, label}, faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
}
return true
@@ -353,12 +360,12 @@
}
}
-func putFaceToResult(am *AreaMap,faceList []Arg) []Arg {
+func putFaceToResult(am *AreaMap, faceList []Arg) []Arg {
faces := []Arg{}
if len(am.filterData) > 0 {
for _, data := range am.filterData {
flag := true
- for _,face := range faceList {
+ for _, face := range faceList {
if data.Location.X == face.Location.X && data.Location.Y == face.Location.Y && data.Location.Width == face.Location.Width && data.Location.Height == face.Location.Height {
flag = false
}
@@ -385,7 +392,7 @@
}
// 鑱斿姩浠诲姟鐨勫鐞�
-func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage,label map[string]interface{}) {
+func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
logger.Info("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細", groupRule.GroupText)
var flag bool = true
@@ -410,12 +417,12 @@
}
}
if flag1 {
- TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre,ResultMsg{}})
+ TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre, ResultMsg{}})
}
}
}
// 寰�鏁扮粍閲岃祴鍊�
- isOk := RunRule(args, groupRule, taskId, message,label)
+ isOk := RunRule(args, groupRule, taskId, message, label)
if isOk {
logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
@@ -423,7 +430,22 @@
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 {
+ if k == "yolo" {
+ tempMap[k] = []Result{}
+ for _, res := range result.([]Result) {
+ tempMap[k] = append(tempMap[k].([]Result), res)
+ }
+ }
+ if k == "face" {
+ tempMap[k] = []FaceResult{}
+ for _, res := range result.([]FaceResult) {
+ tempMap[k] = append(tempMap[k].([]FaceResult), res)
+ }
+ }
+ }
+ va.CacheData = ResultMsg{message, tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
@@ -451,12 +473,21 @@
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)
+ label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
}
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label["linkCache"].([]ResultMsg)))
- //os.Exit(1)
+ logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
+ for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
+ if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
+ }
+ }
+ for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
+ if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
+ }
+ }
}
}
} else {
@@ -470,9 +501,9 @@
// va.Result = strconv.FormatBool(isOk)
// }
//}
- for k,_ := range TimeEleList {
+ for k, _ := range TimeEleList {
if k == groupRule.GroupId {
- delete(TimeEleList,k)
+ delete(TimeEleList, k)
logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
}
}
@@ -488,12 +519,13 @@
//logger.Info("瑙勫垯鐨勭畻娉昳d鍜屽尯鍩熺殑绠楁硶id锛�", rule.SdkId, "===", am.sdkId)
if rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
- if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" && rule.SdkArgAlias != "compareBase" {
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{
//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
flag := "false"
// 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
for index := 0; index < len(am.filterData); {
// 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
+ logger.Info("鐪嬬湅鐩镐技鑰呬汉鏁帮細",len(am.filterData[index].Liker))
if len(am.filterData[index].Liker) == 0 {
// Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
am.filterData = append(am.filterData[:index], am.filterData[index+1:]...)
@@ -504,6 +536,7 @@
if len(am.filterData) > 0 {
flag = "true"
}
+ logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.filterData))
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
@@ -511,7 +544,7 @@
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
- //logger.Info("---------------------------缁堜簬绛夊埌浣�")
+ logger.Info("-----------------------杩囪鍒欎箣鍓嶅尯鍩熷唴鐨勪汉鑴告暟閲忎负锛�",am.targetNum)
var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
@@ -542,15 +575,18 @@
}
}
am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
- }
- if am.targetNum > 0 {
- logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ logger.Info("杩囧畬鏉′欢鍚庣殑鐩爣鏁伴噺涓猴細",am.targetNum)
+ if am.targetNum > 0 {
+ logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
} else {
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return LittleRuleResult{}
}
} else {
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ return LittleRuleResult{}
}
} else {
return LittleRuleResult{}
--
Gitblit v1.8.0