From 06572edd43c8789514808e38a9aba2611d6a3e87 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 17:32:07 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 68 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 02209d4..ee1e18b 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -237,7 +237,7 @@
}
}
}
- // 浣滃紛锛岀洿鎺ヨ鍏舵瘮瀵瑰叏閮ㄥ簳搴�
+ // 涓轰簡娴嬭瘯浣滀笅寮婏紝鐩存帴璁╁叾姣斿鍏ㄩ儴搴曞簱
compareFlag = 1
if compareFlag == 0 {
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
@@ -246,8 +246,8 @@
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
for _, sdkData := range args.Sdkdata {
- if sdkData.IpcId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
- logger.Info("_____________________________________________绗竴鍏�")
+ if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
+ logger.Info("============================================绗竴鍏�")
for _, areaMap := range sdkData.AreaMapList {
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.areaId {
@@ -259,6 +259,7 @@
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)
@@ -432,29 +433,10 @@
timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
}
}
- logger.Info("-------------------閲嶇疆鍙兘瀛樺湪鐨勫畾鏃跺櫒骞惰繑鍥瀎alse---------------")
+ logger.Info("-------------------閲嶇疆鐩稿叧鐨勫畾鏃跺櫒骞惰繑鍥瀎alse---------------")
return false
} else {
- // 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
- faces := []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 {
- faces = append(faces, putFaceToResult(&areaMap)...)
- }
- }
- }
- // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- if faceFlag {
- args.RuleResult["face"] = faces
- }
- // 鍘荤湅姹犲瓙閲屾槸鍚︽湁涓庢湰甯ф暟鎹湁鍏崇殑瀹氭椂鍣紝濡傛灉鏈夛紝鐪嬫鏃舵槸鍚﹁蛋鍒�0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
+ // 鍒ゆ柇鎸佺画鏃堕棿鏉′欢锛屽幓鐪嬫睜瀛愰噷鏄惁鏈変笌鏈抚鏁版嵁鏈夊叧鐨勫畾鏃跺櫒锛屽鏋滄湁锛岀湅姝ゆ椂鏄惁璧板埌0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
var flag bool = true
for k, timeEle := range TimeEleList {
if strings.Contains(k, taskId) {
@@ -465,6 +447,26 @@
}
}
if flag {
+ // 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
+ // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
+ logger.Info("------------------------------鏈�鍚庝竴鍏�")
+ faces := []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 {
+ faces = append(faces, putFaceToResult(&areaMap)...)
+ }
+ }
+ }
+ if faceFlag {
+ args.RuleResult["face"] = faces
+ }
logger.Warn("___________________________________________________________________________缁堜簬璧板畬涓囬噷闀垮緛")
// 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
locations := []Rect{}
@@ -794,16 +796,26 @@
}
}
-// 閮借繃婊ゅ畬鏉′欢涔嬪悗鐪嬬湅鏄惁瑕佸垱寤轰竴涓畾鏃跺櫒鍏冪礌 鍒涘缓瀹氭椂鍣ㄧ殑鏉′欢锛氭槸鍚︽湁闈犲彸琛岋紝涓綋闈欐绛夎嚜甯﹀畾鏃跺櫒鍚箟鐨勭畻娉曚互鍙婃槸鍚︽湁鎸佺画鏃堕棿
-func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) {
+// 閮借繃婊ゅ畬鏉′欢涔嬪悗鐪嬬湅鏄惁婊¤冻鎸佺画鏃堕棿鏉′欢
+func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) LittleRuleResult{
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
var flag bool = true
- for k, _ := range TimeEleList {
+ for k,value := range TimeEleList {
if k == am.taskId+" "+am.sdkId+" "+am.areaId {
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}
+ }
}
}
@@ -813,9 +825,11 @@
//TimeEleList = make(map[string]timeElement)
TimeEleList[am.taskId+" "+am.sdkId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
+ return LittleRuleResult{am.sdkName, "false" + "" + rule.RuleWithPre, rule.Sort}
}
}
}
+ return LittleRuleResult{}
}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
--
Gitblit v1.8.0