From f08948b36e73de524a8177f64dab91afd33fe8fd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 09 十月 2019 17:07:01 +0800
Subject: [PATCH] 把分值和id以及坐标都预备存上
---
ruleserver/ruleToformula.go | 271 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 170 insertions(+), 101 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index db342db..da722fc 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,10 +2,11 @@
import (
"ruleprocess/cache"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
"sort"
"strconv"
"strings"
+ "sync"
"time"
"basic.com/pubsub/protomsg.git"
@@ -14,6 +15,7 @@
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
type Arg struct {
+ Id uint64
Score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
Size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
@@ -39,12 +41,14 @@
args []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
filterData []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
+ isEffective bool // 瑙勫垯涓槸鍚︾敤鍒颁簡姝ゅ尯鍩�
keepRight bool // 鏄惁闈犲彸琛�
isStatic bool // 鏄惁闈欐
}
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
type PhotoMap struct {
+ Id uint64
Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
IsYolo bool // 鏄惁鏄痽olo鏁版嵁
@@ -78,6 +82,11 @@
RuleResult map[string]interface{} // 杩囧畬瑙勫垯鍚庢墦鐨勬爣绛� face: []FaceResult, yolo: []Result
}
+type TargetInfo struct {
+ Rect
+ TargetId uint64
+ TargetScore float64
+}
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type Result struct {
TaskId string // 浠诲姟id
@@ -86,8 +95,9 @@
DefenceState bool // 鏄惁甯冮槻
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
- Location []Rect // 鐩爣鐨勫潗鏍�
+ Location []TargetInfo // 鐩爣鐨勫潗鏍�
AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
+ IsLink bool // 鏄惁鏄仈鍔ㄤ换鍔�
Others
}
type Others struct {
@@ -95,10 +105,11 @@
LinkCache []ResultMsg
TimeLabel string
}
+
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type FaceResult struct {
Result
- Args []Arg
+ Args []Arg
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
@@ -106,18 +117,25 @@
Sort int32
}
+var rw sync.RWMutex // 璇诲啓閿�
+
// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 thisSdkDatas 褰撳墠浼犲叆鐨勮繖甯ф暟鎹紝cacheSdkData 瀹氭椂鍣ㄩ噷缂撳瓨鐨勪竴甯ф暟鎹� 娌℃湁灏辫繑鍥瀗il (thisSdkDatas SdkDatas, cacheSdkDatas SdkDatas)
func Judge(args *SdkDatas, message *protomsg.SdkMessage) {
+ defer func() {
+ if err := recover(); err != nil {
+ logger.Error("瑙勫垯妯″潡鍎跨殑寮傚父鎹曡幏锛�",err)
+ }
+ }()
if len(args.Sdkdata) > 0 {
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
cameraPolygons := GetPolygons(args.CameraId)
// 鎶婃墍鏈夌殑sdk鎻愬彇鐨勬暟鎹兘鎸夋墍灞炴憚鍍忔満鐨勫尯鍩熷綊缃�
- //logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname)
+ logger.Debug("褰撳墠鎽勫儚鏈篿d涓猴細",message.Cid,"褰撳墠鎽勫儚鏈烘墽琛岀殑浠诲姟鏄細",message.Tasklab.Taskname,"--浠诲姟id涓猴細",message.Tasklab.Taskid)
for _, arg := range args.Sdkdata {
SdkDataFormat(args.CameraId, arg, cameraPolygons)
}
// 璺戞湰鎽勫儚鏈虹殑鎵�鏈夎鍒欑粍 涓�缁勪竴缁勮窇
- taskGroup := GetRuleGroup(args.CameraId, args.TaskId) // 鏈憚鍍忔満涓嬫墍鏈変换鍔＄粍
+ taskGroup := GetRuleGroup(args.CameraId, args.TaskId) // 鏈憚鍍忔満鏈换鍔′笅鎵�鏈夎鍒欑粍
//logger.Println("鐪嬩笅鎽勫儚鏈轰笅鐨勪换鍔＄粍锛�",taskRuleList)
// 寰楀埌灞炰簬璇ユ憚鍍忔満鐨勮嫢骞茬粍浠诲姟鐨勫畬鏁磋鍒欙紙璺熸瘡涓�鏉″畬鏁磋鍒欐瘮杈冧箣鍚庡緱鍑烘湰寮犲浘鍍忓浜庢煇涓鍒欐槸鍚︽姤璀︾殑缁撴灉銆傛斁杩沵ap锛屾瘮濡傛湰甯у浘鍍忕殑id锛屾墍纰版挒鎴愬姛鐨勮鍒檌d锛�
args.RuleResult = make(map[string]interface{})
@@ -135,7 +153,7 @@
if len(temp) > 0 {
if group.SetType != "linkTask" {
// 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, group, taskId, message,label)
+ RunRule(args, group, taskId, message, label)
}
}
}
@@ -148,7 +166,7 @@
if len(temp) > 0 {
if group.SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- LinkTask(args, group, taskId, message,label)
+ LinkTask(args, group, taskId, message, label)
}
}
}
@@ -156,7 +174,7 @@
}
}
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage,label Others) bool {
+func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) (bool,[]int) {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
@@ -185,12 +203,15 @@
ruleResult := filterRule(groupRule.Rules[j], areaMap)
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 + ","
- polygonId = groupRule.Rules[j].PolygonId + ","
}
- if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
+ if strings.Contains(ruleResult.Result, "true") && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
polygonId = groupRule.Rules[j].PolygonId + ","
}
resultSplice = append(resultSplice, &ruleResult)
@@ -199,7 +220,6 @@
}
}
}
-
// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
@@ -214,6 +234,9 @@
for _, areaMap := range sdkData.AreaMapList {
ruleResult := transferParameters(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
+ 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 + ","
@@ -240,6 +263,9 @@
for _, areaMap := range sdkData.AreaMapList {
ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
+ 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 + ","
@@ -270,14 +296,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) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -315,16 +341,19 @@
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)...)
+ 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 := []Rect{}
+ locations := []TargetInfo{}
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
for _, areaMap := range sdkData.AreaMapList {
@@ -333,36 +362,45 @@
}
}
//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"].([]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, islink,label,})
+ labelTypes = append(labelTypes,0)
//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, []TargetInfo{}, polygonId, islink,label,}, faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
+ labelTypes = append(labelTypes,1)
}
- return true
+ return true,labelTypes
} else {
- return false
+ return false,[]int{}
}
} else {
- // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏃跺�欎负鍋囩殑鐘舵�佸弽杞暟鎹篃闇�瑕佽褰曚笅鏉�
- //timeFlag := TimerAlarm(args, groupRule.GroupId, result.(bool))
+ // 缁撴灉涓哄亣鏃朵篃瑕佽蛋锛屾湁鏉�姝诲畾鏃跺櫒鐨勬搷浣�
+ TimerAlarm(&label, groupRule.GroupId, result.(bool))
//fmt.Println(timeFlag)
- return false
+ return false,[]int{}
}
} else {
- return false
+ return false,[]int{}
}
}
-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
}
@@ -372,16 +410,19 @@
}
}
}
-
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
-func putYolosToResult(am *AreaMap) []Rect {
- locations := []Rect{}
+func putYolosToResult(am *AreaMap) []TargetInfo {
+ locations := []TargetInfo{}
if len(am.filterData) > 0 {
for _, data := range am.filterData {
- locations = append(locations, data.Location)
+ location := TargetInfo{}
+ location.Rect = data.Location
+ location.TargetId = data.Id
+ location.TargetScore = data.Score
+ locations = append(locations, location)
}
}
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
@@ -389,16 +430,20 @@
}
// 鑱斿姩浠诲姟鐨勫鐞�
-func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage,label Others) {
+func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
logger.Info("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細", groupRule.GroupText)
var flag bool = true
var timeEle = TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId}
+ rw.Lock()
for k, timeEle1 := range TimeEleList {
if k == groupRule.GroupId {
flag = false // 宸茬粡鏈変簡杩欎釜瀹氭椂鍣ㄥ氨缃负false 涓嶅啀鏂板
timeEle = *timeEle1
}
+ }
+ for _,ruleRe := range timeEle.RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁----",ruleRe.CameraId,ruleRe.Sort)
}
if flag { // 濡傛灉杩樻病鏈夎繖涓畾鏃跺櫒鍏冪礌灏辨柊澧炰竴涓�
//timeEle := TimeElement{N: 2, InitN: 2, GroupId: groupRule.GroupId} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
@@ -408,18 +453,21 @@
// 寰楀嚭杩欑粍瀹屾暣瑙勫垯閲屾秹鍙婂埌鍑犱釜鎽勫儚鏈猴紝鍐冲畾鐫�鏁扮粍閲屾湁鍑犱釜缁撴瀯浣�,鍘婚噸娣诲姞鏂瑰紡
for j := 0; j < len(groupRule.Rules); j++ {
var flag1 bool = true
+ logger.Info("瑙勫垯缁勪俊鎭細",groupRule.Rules[j].CameraId)
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
+ logger.Info("鑱斿姩鏁扮粍閲岀殑鏁版嵁锛�",ruleRes.CameraId,ruleRes.Sort)
if groupRule.Rules[j].CameraId == ruleRes.CameraId {
flag1 = false
}
}
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{}})
}
}
}
+ rw.Unlock()
// 寰�鏁扮粍閲岃祴鍊�
- isOk := RunRule(args, groupRule, taskId, message,label)
+ isOk,labelTypes := RunRule(args, groupRule, taskId, message, label)
if isOk {
logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
@@ -428,23 +476,21 @@
if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
tempMap := make(map[string]interface{})
- for k,result := range args.RuleResult {
+ for k, result := range args.RuleResult {
if k == "yolo" {
- for _,res := range result.([]Result) {
- tempMap[k] = append(tempMap[k].([]Result),res)
+ tempMap[k] = []Result{}
+ for _, res := range result.([]Result) {
+ tempMap[k] = append(tempMap[k].([]Result), res)
}
}
if k == "face" {
- for _,res := range result.([]FaceResult) {
- tempMap[k] = append(tempMap[k].([]FaceResult),res)
+ tempMap[k] = []FaceResult{}
+ for _, res := range result.([]FaceResult) {
+ tempMap[k] = append(tempMap[k].([]FaceResult), res)
}
}
- tempMap[k] = result
}
- for _,result := range args.RuleResult["yolo"].([]Result) {
- logger.Warn("鏀捐繘鑱斿姩缂撳瓨鐨勯暱搴︽槸",len(result.LinkCache))
- }
- va.CacheData = ResultMsg{message,tempMap}
+ va.CacheData = ResultMsg{message, tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
@@ -471,26 +517,47 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
- // 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
- label.LinkCache = []ResultMsg{}
- for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
- label.LinkCache = append(label.LinkCache,ruleRes.CacheData)
- }
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label.LinkCache))
- //for _,result := range args.RuleResult["yolo"].([]Result) {
- // if result.RuleGroupId == groupRule.GroupId {
- // result.Others["linkCache"] = label
- // }
- //}
- 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
+ rw.RLock()
+ if TimeEleList[groupRule.GroupId] != nil { // 鏋佸伓灏旀湁鎯呭喌浼氱瓑浜巒il锛屼笉鐭ラ亾涓哄暐锛屽仛涓垽鏂互闃插畷鏈�
+ // 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
+ label.LinkCache = []ResultMsg{}
+ for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
+ label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
+ }
+ 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
+ }
}
}
+ rw.RUnlock()
}
}
} else {
logger.Warn("鏁扮粍涓嶅渾婊′笉鎵撴爣绛�")
+ // 鍊掓槸鎶婃墦鐨勭粍瑙勫垯鏍囩缁欏幓鎺変簡鍟�
+ for _,val := range labelTypes {
+ if val == 0 {
+ if len(args.RuleResult["yolo"].([]Result)) >= 1 {
+ lens := len(args.RuleResult["yolo"].([]Result))-1
+ args.RuleResult["yolo"] = args.RuleResult["yolo"].([]Result)[0:lens]
+ }
+ }
+ if val == 1 {
+ if len(args.RuleResult["face"].([]FaceResult)) >= 1 {
+ lens := len(args.RuleResult["face"].([]FaceResult))-1
+ args.RuleResult["face"] = args.RuleResult["face"].([]FaceResult)[0:lens]
+ }
+ }
+ }
+
+
}
} else { // 娌℃湁鎶ヨ锛�
//logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
@@ -500,12 +567,14 @@
// va.Result = strconv.FormatBool(isOk)
// }
//}
- for k,_ := range TimeEleList {
+ rw.Lock()
+ for k, _ := range TimeEleList {
if k == groupRule.GroupId {
- delete(TimeEleList,k)
+ delete(TimeEleList, k)
logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
}
}
+ rw.Unlock()
// 鍥犱负鏈抚鏁版嵁涓嶇鍚堣鍒欙紝鎵�浠ヤ篃涓嶇敤缁熻缁撴灉鏁扮粍閲岀殑涓滆タ
}
@@ -518,36 +587,43 @@
//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" {
- //logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
- flag := "false"
- // 鎶婃病鏈夌浉浼艰�呯殑浜鸿劯浠巉ilterData涓垹闄�
- for index := 0; index < len(am.filterData); {
- // 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
- if len(am.filterData[index].Liker) == 0 {
- // Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
- am.filterData = append(am.filterData[:index], am.filterData[index+1:]...)
- } else {
- index++
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" {
+ if rule.RuleWithPre == "||" {
+ return LittleRuleResult{}
+ } else {
+ //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:]...)
+ } else {
+ index++
+ }
}
+ if len(am.filterData) > 0 {
+ flag = "true"
+ }
+ logger.Info("---------浜鸿劯姣斿绗﹀悎鏉′欢鐨勬暟閲忎负锛�",len(am.filterData))
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
- if len(am.filterData) > 0 {
- flag = "true"
- }
- return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
//logger.Debug("褰撳墠灏忚鍒欐槸锛�",rule)
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
//logger.Info("杩囨护鍚庣殑args鐨勯暱搴︿负锛�",len(args))
} else {
args = am.args
+ //涓嶆竻绌轰箣鍓嶇殑杩囨护鏁版嵁锛岀户缁
//logger.Info("娌¤繃婊ょ殑args鐨勯暱搴︿负锛�",len(args))
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
@@ -572,21 +648,22 @@
}
}
am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
+ 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 if rule.SdkArgAlias == "" { // 浠�涔堝弬鏁伴兘涓嶉厤鐨勬儏鍐�
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}
}
- } else {
- return LittleRuleResult{}
}
- } else {
- return LittleRuleResult{}
}
} else {
// 澶勭悊鐨勯兘鏄痽olo鏁版嵁
@@ -626,14 +703,16 @@
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
}
- } else {
- return LittleRuleResult{}
+ } else if rule.SdkArgAlias == "" {
+ if am.targetNum > 0 {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
+ } else {
+ return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
+ }
}
-
- } else {
- return LittleRuleResult{}
}
}
+ return LittleRuleResult{}
}
// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
@@ -642,6 +721,7 @@
if rule.SdkArgAlias == "duration" { //
logger.Info("褰撳墠灏忚鍒欐槸锛�---------", rule)
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欐潯瑙勫垯鐨勫畾鏃跺櫒,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
+ rw.Lock()
var flag bool = true
for k, _ := range TimeEleList {
if k == groupId+"+"+rule.Id {
@@ -657,6 +737,7 @@
TimeEleList[groupId+"+"+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互褰撳墠鎸佺画鏃堕棿灏忚鍒檌d涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒")
}
+ rw.Unlock()
}
}
}
@@ -682,18 +763,6 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
return LittleRuleResult{am.sdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
- } else if rule.SdkId == "IsStatic" { // 闈欐绠楁硶
- if am.isStatic {
- return LittleRuleResult{}
- } else {
- return LittleRuleResult{}
- }
- } else if rule.SdkId == "KeepRight" { // 闈犲彸琛岀畻娉�
- if am.keepRight {
- return LittleRuleResult{}
- } else {
- return LittleRuleResult{}
- }
}
}
return LittleRuleResult{}
--
Gitblit v1.8.0