From 2a7709d4ed9161f145631e2e49ffbde2ce44463f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 12 七月 2019 14:51:30 +0800
Subject: [PATCH] 过滤时忽略底库条件
---
ruleserver/ruleToformula.go | 210 +++++++++++++++++++++++++++++-----------------------
1 files changed, 118 insertions(+), 92 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ee1e18b..3b7ece3 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -89,8 +89,8 @@
triggerLine string
directionLine string
targetNum int // 鍖哄煙鍐呯洰鏍囨暟閲�
- args []Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
- filterData []Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
+ args []*Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
+ filterData []*Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
keepRight bool // 鏄惁闈犲彸琛�
isStatic bool // 鏄惁闈欐
@@ -115,7 +115,7 @@
IsStatic bool // 鏄惁闈欐
ImageWidth int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚瀹� 鍍忕礌
ImageHeight int // 鎽勫儚鏈烘媿鎽勭殑鍥惧儚楂� 鍍忕礌
- AreaMapList []AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
+ AreaMapList []*AreaMap // 鏈瑂dk鎻愬彇鐨勬暟鎹寜鐓у尯鍩熷垝鍒嗗悗鐨勬暟鎹泦鍚�
}
// 浠庣畻娉曟ā鍧楀効鎷挎潵鐨勫涓�甯у浘鍍忓悇涓畻娉曟彁鍙栫殑鏁版嵁闆嗗悎
@@ -135,12 +135,13 @@
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type Result struct {
- TaskId string // 浠诲姟id
- SdkName string
- RuleGroupId string // 瑙勫垯缁刬d
- AlarmLevel int32 // 鎶ヨ绛夌骇
- RuleText string // 鏂囧瓧鐗堣鍒欑粍
- Location []Rect
+ TaskId string // 浠诲姟id
+ SdkName string
+ RuleGroupId string // 瑙勫垯缁刬d
+ AlarmLevel int32 // 鎶ヨ绛夌骇
+ RuleText string // 鏂囧瓧鐗堣鍒欑粍
+ Location []Rect // 鐩爣鐨勫潗鏍�
+ AlarmPolygon string // 瑙﹀彂鐨勬姤璀︽
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
@@ -173,14 +174,14 @@
func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
for _, photo := range arg.Photo {
- logger.Info("--------鐪嬬湅瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
+ logger.Info("--------瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
}
for _, polygon := range cameraPolygons {
//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
areaMap := AreaMap{cameraId: cameraId, areaId: polygon.Id, areaJson: polygon.Polygon, triggerLine: polygon.TriggerLine, directionLine: polygon.DirectionLine}
// 涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁
areaMap.CountAreaObjs(arg)
- arg.AreaMapList = append(arg.AreaMapList, areaMap)
+ arg.AreaMapList = append(arg.AreaMapList, &areaMap)
}
}
@@ -222,6 +223,35 @@
}
}
}
+
+// 缁欑洰鏍囧～鍏卨iker
+func (arg *Arg) fillLiker() {
+ bytes := bigCache.Getdbpersonmsg("", arg.Feature, true)
+ var m map[string]float32
+ err1 := json.Unmarshal(bytes, &m)
+ if err1 != nil {
+ logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
+ }
+ logger.Info("----------------------------------------map鏄�", m)
+ for key, val := range m {
+ baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
+ if err1 != nil {
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
+ }
+ baseinfo.CompareScore = Retain(val)
+ arg.Liker = append(arg.Liker, &baseinfo)
+ }
+ //logger.Info("------------------绗竴娆＄湅args:",*arg)
+}
+// 淇濈暀鍥涗綅灏忔暟
+func Retain(f float32)(float32) {
+ s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
+ v, err := strconv.ParseFloat(s, 32)
+ if err != nil {
+ logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
+ }
+ return float32(v)
+}
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
tableIds := ""
@@ -238,7 +268,7 @@
}
}
// 涓轰簡娴嬭瘯浣滀笅寮婏紝鐩存帴璁╁叾姣斿鍏ㄩ儴搴曞簱
- compareFlag = 1
+ //compareFlag = 1
if compareFlag == 0 {
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
return
@@ -247,51 +277,29 @@
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
- logger.Info("============================================绗竴鍏�")
+ logger.Info("============================================杩涜浜鸿劯瀵规瘮")
for _, areaMap := range sdkData.AreaMapList {
+ logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.areaId {
+ logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
for _, arg := range areaMap.args {
if compareFlag == 1 {
- bytes := bigCache.Getdbpersonmsg("", arg.Feature, true)
- var m map[string]float32
- err1 := json.Unmarshal(bytes, &m)
- if err1 != nil {
- logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
- }
- logger.Info("----------------------------------------map鏄�",m)
- for key, val := range m {
- logger.Info("_______________________________________瀵规瘮搴撶殑杩斿洖鍊�",key,val)
- baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
- if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
- }
- baseinfo.CompareScore = val
- arg.Liker = append(arg.Liker, &baseinfo)
- }
+ arg.fillLiker()
}
if compareFlag == 2 {
array := strings.Split(tableIds, ",")
+ logger.Info("--------------------------鐪嬬湅瀵规瘮搴曞簱鐨勫��;",array)
for i := 0; i < len(array)-1; i++ {
- bytes := bigCache.Getdbpersonmsg(array[i], arg.Feature, true)
- var m map[string]float32
- err1 := json.Unmarshal(bytes, &m)
- if err1 != nil {
- logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
- }
- for key, val := range m {
- baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
- if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
- }
- baseinfo.CompareScore = val
- arg.Liker = append(arg.Liker, &baseinfo)
- }
+ arg.fillLiker()
}
}
- logger.Info("-------------------鎴愬姛缁檒iker璧嬪�硷細", arg.Liker)
+ logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
+ areaMap.filterData = areaMap.args
+ //logger.Info("=======绗竴娆＄湅args锛�",(areaMap.filterData))
}
+ logger.Info("-------------------------------浜鸿劯瀵规瘮涔嬪悗鐨勭洰鏍囨暟閲�",len(areaMap.args))
}
}
}
@@ -304,10 +312,11 @@
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
}
}()
- logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠瑙勫垯--锛�", *groupRule)
+ logger.Info("+++++++++++瑙勫垯寮�濮嬭繍琛�+++++++++++++++++褰撳墠澶ц鍒�--锛�", *groupRule)
Compare(args, groupRule)
resultSplice := []*LittleRuleResult{}
sdkNames := ""
+ polygonId := ""
// 鍏堣繃瀹屾潯浠惰鍒�
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
@@ -318,16 +327,24 @@
}
ipcId := sdk.IpcId
sdkName := sdk.SdkName
-
+ logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:", ipcId, "===", sdkData.IpcId)
if ipcId == sdkData.IpcId {
logger.Info("褰撳墠璧扮殑瑙勫垯鐨勭畻娉曟槸--锛�", sdkName, "---")
+ logger.Info("========================鏈夊嚑涓尯鍩燂細",len(sdkData.AreaMapList))
+ for _,areaMap := range sdkData.AreaMapList{
+ logger.Info("妫�鏌ヤ竴涓嬪尯鍩熺殑鍏蜂綋鏁版嵁锛�",areaMap.areaJson)
+ }
for _, areaMap := range sdkData.AreaMapList {
- ruleResult := filterRule(groupRule.Rules[j], &areaMap)
+ ruleResult := filterRule(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
logger.Info("鏉′欢瑙勫垯缁撴灉锛�", ruleResult.Result)
- // 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽olo绠楁硶锛屽簲璁颁笅姝よ鍒欐墍瀵瑰簲鐨剆dkName,鍙﹀锛岃繕瑕佸幓閲�
- if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
+ // 濡傛灉姝ょ粨鏋滀负鐪熶笖褰撳墠杩囩殑鏄痽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) {
+ polygonId = groupRule.Rules[j].PolygonId + ","
}
resultSplice = append(resultSplice, &ruleResult)
}
@@ -348,11 +365,14 @@
sdkName := sdk.SdkName
if ipcId == sdkData.IpcId {
for _, areaMap := range sdkData.AreaMapList {
- ruleResult := transferParameters(groupRule.Rules[j], &areaMap)
+ ruleResult := transferParameters(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
logger.Info("鏁伴噺瑙勫垯缁撴灉锛�", ruleResult.Result)
- if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
+ 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)
}
@@ -371,11 +391,14 @@
sdkName := sdk.SdkName
if ipcId == sdkData.IpcId {
for _, areaMap := range sdkData.AreaMapList {
- ruleResult := timeRuleResult(groupRule.Rules[j], &areaMap)
+ ruleResult := timeRuleResult(groupRule.Rules[j], areaMap)
if ruleResult.Result != "" {
logger.Info("鏃堕棿瑙勫垯缁撴灉锛�", ruleResult.Result)
- if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
+ 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)
}
@@ -393,7 +416,8 @@
ipcId := sdk.IpcId
if ipcId == sdkData.IpcId {
for _, areaMap := range sdkData.AreaMapList {
- duration(groupRule.Rules[j], &areaMap, args)
+ // 鍘诲紑鍚竴涓畾鏃跺櫒
+ duration(groupRule.Rules[j], groupRule.GroupId, areaMap, args)
}
}
}
@@ -429,7 +453,7 @@
// 缁欒繖甯ф暟鎹墦涓婅鍒欑粍鏍囩
//args.RuleResult = append(args.RuleResult, Result{TaskId: taskId, RuleGroupId: groupRule.GroupId})
for k, timeEle := range TimeEleList {
- if strings.Contains(k, taskId) {
+ if strings.Contains(k, groupRule.GroupId) {
timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
}
}
@@ -439,8 +463,8 @@
// 鍒ゆ柇鎸佺画鏃堕棿鏉′欢锛屽幓鐪嬫睜瀛愰噷鏄惁鏈変笌鏈抚鏁版嵁鏈夊叧鐨勫畾鏃跺櫒锛屽鏋滄湁锛岀湅姝ゆ椂鏄惁璧板埌0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
var flag bool = true
for k, timeEle := range TimeEleList {
- if strings.Contains(k, taskId) {
- if timeEle.N != 0 { // 璺熻繖涓换鍔℃湁鍏崇殑瀹氭椂鍣ㄨ鍏ㄩ儴绛変簬0
+ if strings.Contains(k, groupRule.GroupId) {
+ if timeEle.N != 0 { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0
logger.Info("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------涓嶅啢锛屼綘鏄瀹氭椂鍣ㄦ墦璐ョ殑锛�")
flag = false
}
@@ -449,7 +473,6 @@
if flag {
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- logger.Info("------------------------------鏈�鍚庝竴鍏�")
faces := []Arg{}
faceFlag := false
for j := 0; j < len(groupRule.Rules); j++ {
@@ -460,7 +483,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 = append(faces, putFaceToResult(areaMap)...)
}
}
}
@@ -473,16 +496,16 @@
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
for _, areaMap := range sdkData.AreaMapList {
- locations = append(locations, putYolosToResult(&areaMap)...)
+ locations = append(locations, putYolosToResult(areaMap)...)
}
}
}
if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, locations})
- logger.Info("-------------------yolo缁撴灉鏍囩", args.RuleResult["yolo"].([]Result))
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, locations,polygonId})
+ logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
if args.RuleResult["face"] != nil {
- logger.Info("-------------------face缁撴灉鏍囩", args.RuleResult["face"].([]Arg))
+ logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]Arg)))
}
return true
} else {
@@ -493,12 +516,29 @@
return false
}
}
+func TimerAlarm(groupId string) (int) {
+ var flagTime int = 0
+ for k, timeEle := range TimeEleList {
+ if strings.Contains(k, groupId) {
+ if timeEle.N == 0 && !timeEle.AlarmFlag { // 杩欑粍瑙勫垯鐨勫畾鏃跺櫒瑕佸叏閮ㄧ瓑浜�0 鏆備笖璁や负涓�缁勮鍒欏彧鏈変竴涓畾鏃跺櫒
+ logger.Info("鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺��-------------棣栨绗﹀悎鎸佺画鏃堕棿瑙勫垯骞舵姤璀�")
+ flagTime = 1
+ timeEle.AlarmFlag = true
+ }
+ if timeEle.N == 0 && timeEle.AlarmFlag {
+ logger.Info("-------------------------绗﹀悎鎸佺画鏃堕棿瑙勫垯浣嗗苟涓嶆槸棣栨锛屼笉鎶ヨ")
+ flagTime = 2
+ }
+ }
+ }
+ return flagTime
+}
func putFaceToResult(am *AreaMap) []Arg {
faces := []Arg{}
if len(am.filterData) > 0 {
for _, data := range am.filterData {
- faces = append(faces, data)
+ faces = append(faces, *data)
}
}
@@ -535,8 +575,8 @@
a.targetNum++
arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*protomsg.Baseinfo{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
- a.args = append(a.args, arg1)
- a.filterData = append(a.filterData, arg1)
+ a.args = append(a.args, &arg1)
+ a.filterData = append(a.filterData, &arg1)
}
}
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
@@ -633,7 +673,7 @@
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, "", groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, "", groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, []Rect{},""})
logger.Info("-------------------yolo缁撴灉鏍囩鏈夊嚑涓�", len(args.RuleResult["yolo"].([]Result)))
if args.RuleResult["face"] != nil {
logger.Info("-------------------face缁撴灉鏍囩鏈夊嚑涓�", len(args.RuleResult["face"].([]Arg)))
@@ -663,8 +703,7 @@
//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" {
- // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾瑕佽�冭檻濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
+ if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" && rule.SdkArgAlias != "compareBase"{
argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
if err != nil {
logger.Error("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
@@ -699,12 +738,11 @@
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + flag, rule.Sort}
}
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 浜鸿劯妫�娴�
- logger.Info("------------------------------------------------------------------------------------------------------------------------------------缁堜簬绛夊埌浣�")
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("--------------------缁堜簬绛夊埌浣犵殑涓嬫枃")
- var args []Arg
+ logger.Info("---------------------------缁堜簬绛夊埌浣�")
+ var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
} else {
@@ -712,7 +750,7 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
- //logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs锛�", args)
+ logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs閲岀殑鏁伴噺锛�", len(args))
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
@@ -753,7 +791,7 @@
if rule.PolygonId == am.areaId { // 棣栧厛杩欐潯瑙勫垯寰楁槸杩欎釜绠楁硶鐨勮鍒欙紝鍏舵瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
if rule.SdkArgAlias == "score" || rule.SdkArgAlias == "proportion" || rule.SdkArgAlias == "size" { // 鍒ゆ柇鐨勬槸鐩镐技鍊硷紝鍗犳瘮锛屽昂瀵哥瓑杩囨护鏉′欢锛屽鏋滃啀鏈夛紝杩樺彲浠ュ啀鍔�
logger.Info("----------褰撳墠鏉′欢瑙勫垯锛�---------", rule)
- var args []Arg
+ var args []*Arg
if rule.RuleWithPre == "&&" {
args = am.filterData
} else {
@@ -796,40 +834,28 @@
}
}
-// 閮借繃婊ゅ畬鏉′欢涔嬪悗鐪嬬湅鏄惁婊¤冻鎸佺画鏃堕棿鏉′欢
-func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) LittleRuleResult{
+// 濡傛灉鏈夋寔缁椂闂存潯浠剁淮鎶ゅ紑鍚竴涓畾鏃跺櫒
+func duration(rule *protomsg.Rule, groupId string, am *AreaMap, args *SdkDatas) {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
- for k,value := range TimeEleList {
- if k == am.taskId+" "+am.sdkId+" "+am.areaId {
+ for k, _ := range TimeEleList {
+ if k == groupId+" "+rule.Id {
flag = false // 鏈夊氨缃负false
logger.Info("鏈夎繖涓畾鏃跺櫒锛屼笉鍐嶅垱寤轰簡锛�")
- // 鐪嬬湅瀹氭椂鍣ㄤ腑鐨勫�兼槸鍚︿负0 濡傛灉涓�0搴旇鎶ヨ锛屽鏋滀笉涓�0杩斿洖false锛屾湭杈惧埌鎸佺画鏃堕棿鐨勮姹�
- if value.N == 0 && !value.AlarmFlag{
- // 鎶ヨ涔嬪悗鏀逛负缃负true 鍚庨潰鐨勬姤璀﹀浘鐗囧氨涓嶆姤浜�,椤轰究鎶婄紦瀛樼殑閭ｅ紶鍥剧墖涔熺粰缁撴灉鏍囩
- value.AlarmFlag = true
- args.RuleResult["cacheData"] = value.CacheSdkData
- return LittleRuleResult{am.sdkName, "true" + "" + rule.RuleWithPre, rule.Sort}
- }else {
- logger.Info("------------------------------鎸佺画鏃堕棿鏉′欢涓嶆弧瓒�")
- return LittleRuleResult{am.sdkName, "false" + "" + rule.RuleWithPre, rule.Sort}
- }
}
}
if flag {
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
- timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: *args} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
+ timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: *args} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌锛堝苟缂撳瓨褰撳墠鐢婚潰甯ф暟鎹級
//TimeEleList = make(map[string]timeElement)
- TimeEleList[am.taskId+" "+am.sdkId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
+ TimeEleList[groupId+" "+rule.Id] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
- return LittleRuleResult{am.sdkName, "false" + "" + rule.RuleWithPre, rule.Sort}
}
}
}
- return LittleRuleResult{}
}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
--
Gitblit v1.8.0