From fab26a9861ee7ce4652b4c15483cfc8e833b28d3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 13 十二月 2019 11:08:29 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 356 +++++++++++++++++++++++++++++------------------------------
1 files changed, 174 insertions(+), 182 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c9407ed..f2f81f2 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,21 +2,14 @@
import (
"basic.com/pubsub/protomsg.git"
- "basic.com/valib/logger.git"
"github.com/knetic/govaluate"
"plugin"
"ruleprocess/cache"
- "ruleprocess/structure"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
"ruleprocess/structure"
"sort"
"strconv"
- "strings"
"sync"
- "time"
-
- "basic.com/pubsub/protomsg.git"
- "github.com/knetic/govaluate"
)
@@ -34,16 +27,17 @@
cameraPolygons := GetPolygons(args.CameraId)
// 鎶婃墍鏈夌殑sdk鎻愬彇鐨勬暟鎹兘鎸夋墍灞炴憚鍍忔満鐨勫尯鍩熷綊缃�
logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname,"--浠诲姟id涓猴細",message.Tasklab.Taskid)
- for _, arg := range args.Sdkdata {
- SdkDataFormat(args.CameraId, arg, cameraPolygons)
- }
+ CallReadyData(args,cameraPolygons)
// 璺戞湰鎽勫儚鏈虹殑鎵�鏈夎鍒欑粍 涓�缁勪竴缁勮窇
taskGroup := GetRuleGroup(args.CameraId, args.TaskId) // 鏈憚鍍忔満鏈换鍔′笅鎵�鏈夎鍒欑粍
//logger.Println("鐪嬩笅鎽勫儚鏈轰笅鐨勪换鍔＄粍锛�",taskRuleList)
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
args.RuleResult = make(map[string]interface{})
args.RuleResult["yolo"] = []structure.Result{}
- args.RuleResult["face"] = []structure.FaceResult{}
+ args.RuleResult["face"] = []structure.Result{}
+ args.RuleResult["target"] = []structure.Result{}
+ args.RuleResult["plate"] = []structure.Result{}
+ args.RuleResult["track"] = []structure.Result{}
//logger.Warn("浼犺繘鍘讳箣鍓嶆槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
if taskGroup != nil && len(taskGroup.GroupRules) > 0 {
// 鍏堣繃鐙珛锛屽啀杩囪仈鍔�
@@ -83,7 +77,7 @@
}
}
-func CallMiddleware(args *structure.SdkDatas,rule protomsg.GroupRule) ([]*structure.LittleRuleResult, string, string){
+func CallMiddleware(args *structure.SdkDatas,rule protomsg.GroupRule,lable *structure.Others,message *protomsg.SdkMessage) (bool, string, string){
p,err := plugin.Open("./algorithm/middleware.so")
if err != nil {
panic(err)
@@ -92,8 +86,20 @@
if err1 != nil {
panic("娌℃湁鎵惧埌涓棿浠跺叆鍙ｅ嚱鏁�")
}
- a,b,c := f.(func(args *structure.SdkDatas,rule protomsg.GroupRule)([]*structure.LittleRuleResult, string, string))(args,rule)
+ a,b,c := f.(func(args *structure.SdkDatas,rule protomsg.GroupRule,label *structure.Others,message *protomsg.SdkMessage)(bool,string, string))(args,rule,lable,message)
return a,b,c
+}
+
+func CallReadyData(args *structure.SdkDatas,cameraPolygons []protomsg.CameraPolygon) {
+ p,err := plugin.Open("./algorithm/middleware.so")
+ if err != nil {
+ panic(err)
+ }
+ f,err1 := p.Lookup("ReadData")
+ if err1 != nil {
+ panic("娌℃湁鎵惧埌涓棿浠剁殑鏁版嵁鍑嗗鍑芥暟")
+ }
+ f.(func(args *structure.SdkDatas,cameraPolygons []protomsg.CameraPolygon)())(args,cameraPolygons)
}
func RunRule(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) (bool,[]int) {
@@ -105,155 +111,51 @@
logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠澶ц鍒�--锛�", (*groupRule).GroupText)
//logger.Warn("浼犺繘鍘讳箣鍚庢槸浠�涔堝痉琛岋細",args.RuleResult["yolo"])
Compare(args, groupRule)
- resultSplice := []*structure.LittleRuleResult{}
+ result := false
sdkNames := ""
polygonId := ""
- resultSplice,sdkNames,polygonId = CallMiddleware(args,*groupRule)
- // 灏嗘暟缁勬寜sort鎺掑簭
- sort.Sort(resultList(resultSplice))
- // 鎺掑簭鍚庡彇鍚勮嚜鐨勭粨鏋滃拰杩炴帴绗︽嫾鍑鸿鍒欒〃杈惧紡寰楀嚭缁撴灉
- completeFormula := ""
- for _, va := range resultSplice {
- completeFormula = completeFormula + va.Result
- }
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || strings.HasPrefix(completeFormula, ">=") || strings.HasPrefix(completeFormula, "<=") || strings.HasPrefix(completeFormula, "==") || strings.HasPrefix(completeFormula, "!=") || strings.HasPrefix(completeFormula, ">") || strings.HasPrefix(completeFormula, "<") {
- // 浠ヨ繖浜涘紑澶寸殑鍩烘湰鏄仈鍔ㄤ换鍔�
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || strings.HasPrefix(completeFormula, ">=") || strings.HasPrefix(completeFormula, "<=") || strings.HasPrefix(completeFormula, "==") || strings.HasPrefix(completeFormula, "!=") {
- completeFormula = completeFormula[2:]
- }
- if strings.HasPrefix(completeFormula, ">") || strings.HasPrefix(completeFormula, "<") {
- completeFormula = completeFormula[1:]
- }
- logger.Info("-------------------鐪嬬湅鎷旀瘺鍚庣殑琛ㄨ揪寮忥細", completeFormula)
- //expression, _ := govaluate.NewEvaluableExpression(completeFormula)
- //result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- //return result.(bool)
- }
- if completeFormula != "" {
- logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
- expression, err2 := govaluate.NewEvaluableExpression(completeFormula)
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err2 != nil {
- panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
- }
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- if result.(bool) {
- // 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢 鎶婃椂闂磋鍒欎綅缃皟鏁村埌杩欎釜浣嶇疆鏄负浜嗙紦瀛樻暟鎹�
- cacheId := ""
- 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
- if ipcId == sdkData.IpcId {
- for _, areaMap := range sdkData.AreaMapList {
- // 鍘诲紑鍚竴涓畾鏃跺櫒
- cacheid := duration(groupRule.Rules[j], groupRule.GroupId, areaMap, args, message)
- if cacheid != "" {
- cacheId = cacheid
- }
- }
+ // 鎶婁竴甯ф暟鎹拰涓�缁勮鍒欏彂缁欑畻娉曢儴鍒嗭紝寰楀嚭鍒ゆ柇缁撴灉
+ result,sdkNames,polygonId = CallMiddleware(args,*groupRule,&label,message)
+
+ if result {
+
+ // 鏈�鍚庤繃鎸佺画鏃堕棿绛夋椂闂寸淮搴︾殑鏉′欢 鎶婃椂闂磋鍒欎綅缃皟鏁村埌杩欎釜浣嶇疆鏄负浜嗙紦瀛樻暟鎹� 锛侊紒锛侊紒锛乸s: 瀵圭敾闈腑鍗曚釜鐩爣鍋氬畾鏃跺櫒鐨勪笉鐢ㄥ啀杩囩敾闈㈠畾鏃跺櫒
+ 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
+ if ipcId == sdkData.IpcId {
+ for _, areaMap := range sdkData.AreaMapList {
+ // 鍘诲紑鍚竴涓畾鏃跺櫒
+ duration(groupRule.Rules[j], groupRule.GroupId, areaMap, args, message,label)
}
}
}
- // 杩涜瀹氭椂鍣ㄧ殑澶勭悊鍜屽垽鏂�
- timeFlag := TimerAlarm(&label, groupRule.GroupId, result.(bool))
- if timeFlag == "01" || timeFlag == "10" || timeFlag == "11" || cacheId != ""{ // 娌℃湁瀹氭椂鍣ㄦ垨鑰呮弧瓒冲畾鏃跺櫒鏉′欢
- // 鎵撲汉鑴告爣绛惧拰yolo鏍囩
- // 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
- // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- faces := []structure.Arg{}
- faceFlag := false
- for j := 0; j < len(groupRule.Rules); j++ {
- if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
- faceFlag = true
- }
- }
- for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
- for _, areaMap := range sdkData.AreaMapList {
- if areaMap.IsEffective {
- faces = append(faces, putFaceToResult(areaMap, faces)...)
- }
- }
- }
- }
- //logger.Info("face鏍囩鐨勯暱搴︼細",len(faces))
- //for _,face := range faces {
- // //logger.Debug("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�擾_______________鐪嬬湅浜鸿劯鐨勫潗鏍�:",face.Location)
- //}
- logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
- // 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
- locations := []structure.TargetInfo{}
- for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
- for _, areaMap := range sdkData.AreaMapList {
- if areaMap.IsEffective {
- locations = append(locations, putYolosToResult(areaMap)...)
- }
- }
- }
- }
- //logger.Debug("------locations鐨勫唴瀹癸細", locations)
- var islink bool
- if groupRule.SetType == "linkTask" {
- islink = true
- } else {
- islink = false
- }
- var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
- if sdkNames != "" {
- 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)))
- }
- if faceFlag {
- args.RuleResult["face"] = append(args.RuleResult["face"].([]structure.FaceResult), structure.FaceResult{structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []structure.TargetInfo{}, polygonId, islink,label,}, faces})
- //logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
- labelTypes = append(labelTypes,1)
- }
- // 缁欐寔缁椂闂寸殑绗竴寮犺祴浜堢紦瀛樻暟鎹紙閬嶅巻澶嶅埗锛�
- if cacheId != "" { // 鏈夎繖甯ф暟鎹殑缂撳瓨
- tempMap := make(map[string]interface{})
- for k, result := range args.RuleResult {
- if k == "yolo" {
- tempMap[k] = []structure.Result{}
- for _, res := range result.([]structure.Result) {
- tempMap[k] = append(tempMap[k].([]structure.Result), res)
- }
- }
- if k == "face" {
- tempMap[k] = []structure.FaceResult{}
- for _, res := range result.([]structure.FaceResult) {
- tempMap[k] = append(tempMap[k].([]structure.FaceResult), res)
- }
- }
- }
- rw.Lock()
- TimeEleList[cacheId].CacheSdkData.RuleResult = tempMap
- rw.Unlock()
- }
-
- return true,labelTypes
- } else {
- return false,[]int{}
- }
-
+ }
+ // 杩涜瀹氭椂鍣ㄧ殑澶勭悊鍜屽垽鏂�
+ timeFlag := TimerAlarm(&label, groupRule.GroupId, result)
+ if timeFlag == "01" || timeFlag == "10" || timeFlag == "11"{ // 娌℃湁瀹氭椂鍣ㄦ垨鑰呮弧瓒冲畾鏃跺櫒鏉′欢
+ labelTypes := AssembResultLabel(args,groupRule,sdkNames,taskId,polygonId,label)
+ return true,labelTypes
} else {
- // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
- TimerAlarm(&label, groupRule.GroupId, result.(bool))
- //fmt.Println(timeFlag)
return false,[]int{}
}
+
} else {
+ // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
+ TimerAlarm(&label, groupRule.GroupId, result)
+ //fmt.Println(timeFlag)
+ //logger.Info("涓嶇鍚堣鍒�")
return false,[]int{}
}
}
-func putFaceToResult(am *structure.AreaMap, faceList []structure.Arg) []structure.Arg {
- faces := []structure.Arg{}
+func putFaceToResult(am *structure.AreaMap, faceList []*structure.Arg) []*structure.Arg {
+ faces := []*structure.Arg{}
if len(am.FilterData) > 0 {
for _, data := range am.FilterData {
flag := true
@@ -263,29 +165,27 @@
}
}
if flag {
- faces = append(faces, *data)
+ faces = append(faces, data)
}
}
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
-func putYolosToResult(am *structure.AreaMap) []structure.TargetInfo {
- locations := []structure.TargetInfo{}
+func putYolosToResult(am *structure.AreaMap) []*structure.Arg {
+ locations := []*structure.Arg{}
if len(am.FilterData) > 0 {
- for _, data := range am.FilterData {
- location := structure.TargetInfo{}
- location.Rect = data.Location
- location.TargetId = data.Id
- location.TargetScore = data.Score
- locations = append(locations, location)
- }
+ locations = am.FilterData
}
- //logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return locations
}
-
+func putTargetsToResult(am *structure.AreaMap) []*structure.Arg {
+ locations := []*structure.Arg{}
+ if len(am.AlarmObj) > 0 {
+ locations = am.AlarmObj
+ }
+ return locations
+}
// 鑱斿姩浠诲姟鐨勫鐞�
func LinkTask(args *structure.SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label structure.Others) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
@@ -341,14 +241,14 @@
}
}
if k == "face" {
- tempMap[k] = []structure.FaceResult{}
- for _, res := range result.([]structure.FaceResult) {
- tempMap[k] = append(tempMap[k].([]structure.FaceResult), res)
+ tempMap[k] = []structure.Result{}
+ for _, res := range result.([]structure.Result) {
+ tempMap[k] = append(tempMap[k].([]structure.Result), res)
}
}
}
va.CacheData = structure.ResultMsg{message, tempMap}
- logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
+ //logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
@@ -368,12 +268,12 @@
for _, va := range timeEle.RuleResults {
completeFormula = completeFormula + va.RuleWithPre + "" + va.Result
}
- logger.Info("---------------------------鑱斿姩浠诲姟鐨勫叕寮�", completeFormula)
+ //logger.Info("---------------------------鑱斿姩浠诲姟鐨勫叕寮�", completeFormula)
if completeFormula != "" {
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
- logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
+ //logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
rw.RLock()
if TimeEleList[groupRule.GroupId] != nil { // 鏋佸伓灏旀湁鎯呭喌浼氱瓑浜巒il锛屼笉鐭ラ亾涓哄暐锛屽仛涓垽鏂互闃插畷鏈�
// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
@@ -387,9 +287,9 @@
args.RuleResult["yolo"].([]structure.Result)[i].Others.LinkCache = label.LinkCache
}
}
- for i := 0; i < len(args.RuleResult["face"].([]structure.FaceResult)); i++ {
- if args.RuleResult["face"].([]structure.FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
- args.RuleResult["face"].([]structure.FaceResult)[i].Others.LinkCache = label.LinkCache
+ for i := 0; i < len(args.RuleResult["face"].([]structure.Result)); i++ {
+ if args.RuleResult["face"].([]structure.Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
+ args.RuleResult["face"].([]structure.Result)[i].Others.LinkCache = label.LinkCache
}
}
}
@@ -397,7 +297,7 @@
}
}
} else {
- logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
+ //logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
// 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
for _,val := range labelTypes {
if val == 0 {
@@ -407,9 +307,9 @@
}
}
if val == 1 {
- 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]
+ if len(args.RuleResult["face"].([]structure.Result)) >= 1 {
+ lens := len(args.RuleResult["face"].([]structure.Result))-1
+ args.RuleResult["face"] = args.RuleResult["face"].([]structure.Result)[0:lens]
}
}
}
@@ -426,7 +326,7 @@
for k, _ := range TimeEleList {
if k == groupRule.GroupId {
delete(TimeEleList, k)
- logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
+ //logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
}
}
rw.Unlock()
@@ -435,9 +335,13 @@
}
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
-func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage) string{
+func duration(rule *protomsg.Rule, groupId string, am *structure.AreaMap, args *structure.SdkDatas, message *protomsg.SdkMessage, label structure.Others){
+ // cacheId := ""
if rule.PolygonId == am.AreaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
- if rule.SdkArgAlias == "duration" { //
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a977" { // 鎺掗櫎瀵圭敾闈腑鍗曚釜鐩爣鐨勭畻娉曪紝涓綋闈欐浠ュ強闈犲彸琛岃繖绉�
+ return
+ }
+ if rule.SdkArgAlias == "duration" {
//logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
rw.Lock()
@@ -450,16 +354,104 @@
}
if flag {
+ m := make(map[string]interface{})
+ m["yolo"] = []structure.Result{}
+ m["yolo"] = append(m["yolo"].([]structure.Result), structure.Result{args.TaskId, "", "", true, 0, "", am.FilterData,am.AreaJson, false,label})
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
- timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, nil}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
+ timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, BufferFlag: 10, CacheSdkData: structure.ResultMsg{message, m}} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
- logger.Info("鍒涘缓浜嗚鏁板櫒")
- cacheId = groupId+"+"+rule.Id
+ //logger.Info("鍒涘缓浜嗚鏁板櫒")
+ //cacheId = groupId+"+"+rule.Id
}
rw.Unlock()
}
}
- return cacheId
+ return
}
+func AssembResultLabel(args *structure.SdkDatas, groupRule *protomsg.GroupRule,sdkNames string,taskId string,polygonId string,label structure.Others) []int{
+
+ faces := []*structure.Arg{}
+ yolos := []*structure.Arg{}
+ targets := []*structure.Arg{}
+ personTrack := []*structure.Arg{}
+ cars := []*structure.Arg{}
+ faceFlag := false
+ for j := 0; j < len(groupRule.Rules); j++ {
+ if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
+ faceFlag = true
+ }
+ }
+ for _, sdkData := range args.Sdkdata {
+ switch sdkData.IpcId {
+ case "A8B73405-373D-4F23-CED2-A617EBD7EC55" :
+ if faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
+ for _, areaMap := range sdkData.AreaMapList {
+ if areaMap.IsEffective {
+ faces = append(faces, putFaceToResult(areaMap, faces)...)
+ }
+ }
+ }
+ case "02D54B61-0F16-C604-8567-FC4BE493C523":
+ if sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
+ for _, areaMap := range sdkData.AreaMapList {
+ if areaMap.IsEffective {
+ yolos = append(yolos, putYolosToResult(areaMap)...)
+ // 澶勭悊鐩爣瀹氭椂鏁版嵁
+ targets = append(targets, putTargetsToResult(areaMap)...)
+ }
+ }
+ }
+ case "91d923ef-6200-4549-ab1b-8e773e85d729":
+ // 杞﹁締鏁版嵁
+ for _, areaMap := range sdkData.AreaMapList {
+ if areaMap.IsEffective {
+ cars = append(cars, putFaceToResult(areaMap, cars)...)
+ }
+ }
+ case "807bac1b-4501-4c52-b450-0aeb75a68ded":
+ // 璺熻釜鐩爣
+ for _, areaMap := range sdkData.AreaMapList {
+ if areaMap.IsEffective {
+ personTrack = append(personTrack, putFaceToResult(areaMap, personTrack)...)
+ }
+ }
+ }
+ }
+
+ var islink bool
+ if groupRule.SetType == "linkTask" {
+ islink = true
+ } else {
+ islink = false
+ }
+ //logger.Info("瑙﹀彂鐨勫尯鍩焛d锛�",polygonId)
+ var labelTypes []int // 0涓簓olo鏍囩锛�1涓篺ace鏍囩 2涓轰袱鑰呮爣绛�
+ if sdkNames != "" && len(targets) == 0 {
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, yolos,polygonId, islink,label})
+ labelTypes = append(labelTypes,0)
+ //logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
+ }
+ if faceFlag {
+ args.RuleResult["face"] = append(args.RuleResult["face"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, faces,polygonId, islink,label})
+ //logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]structure.Result)))
+ labelTypes = append(labelTypes,1)
+ }
+ if len(targets) > 0 {
+ args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, targets, polygonId, islink,label})
+ //logger.Info("-------------------鐩爣鎸佺画缁撴灉鏍囩", len(args.RuleResult["target"].([]structure.Result)))
+ labelTypes = append(labelTypes,2)
+ }
+ if len(cars) > 0 {
+ args.RuleResult["plate"] = append(args.RuleResult["plate"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, cars, polygonId, islink,label})
+ //logger.Info("-------------------杞︾墝缁撴灉鏍囩", len(args.RuleResult["plate"].([]structure.Result)))
+ labelTypes = append(labelTypes,3)
+ }
+ if len(personTrack) > 0 {
+ args.RuleResult["track"] = append(args.RuleResult["track"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, personTrack, polygonId, islink,label})
+ //logger.Info("-------------------杞︾墝缁撴灉鏍囩", len(args.RuleResult["plate"].([]structure.Result)))
+ labelTypes = append(labelTypes,4)
+ }
+ return labelTypes
+}
\ No newline at end of file
--
Gitblit v1.8.0