From f85585b1a6260678fe5912dc0048944b309d949e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 04 七月 2019 13:58:22 +0800
Subject: [PATCH] 联动任务的非第一条规则去掉连接符
---
ruleserver/ruleToformula.go | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c7e3667..6bc1fde 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -217,7 +217,7 @@
if len(temp) > 0 {
if ruleList[i].SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- //LinkTask(args, ruleList[i], taskId)
+ LinkTask(args, ruleList[i], taskId)
} else {
// 鐙珛浠诲姟鐨勫鐞�
RunRule(args, ruleList[i], taskId)
@@ -248,25 +248,7 @@
}
}
}
- // 杩囧畬鏉′欢鏁版嵁鍚庢妸绗﹀悎鏉′欢鐨勪汉鑴告暟鎹杩涚粨鏋滄爣绛鹃噷
- faces := []Arg{}
- for _, sdkData := range args.Sdkdata {
- for _, areaMap := range sdkData.AreaMapList {
- for j := 0; j < len(groupRule.Rules); j++ {
- faces = append(faces, putFaceToResult(groupRule.Rules[j], &areaMap)...)
- }
- }
- }
- // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- flag := 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-5c1c3278a971" {
- flag = true
- }
- }
- if flag {
- args.RuleResult["face"] = faces
- }
+
// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
for j := 0; j < len(groupRule.Rules); j++ {
for _, sdkData := range args.Sdkdata {
@@ -306,6 +288,21 @@
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:len(completeFormula)-1]
+ }
+ if strings.HasPrefix(completeFormula,">") || strings.HasPrefix(completeFormula,"<") {
+ completeFormula = completeFormula[1:len(completeFormula)-1]
+ }
+ expression, _ := govaluate.NewEvaluableExpression(completeFormula)
+ if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") {
+ panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
+ }
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ return result.(bool)
+ }
if completeFormula != "" {
log.Println("缁撴灉鍏紡-----------锛�", completeFormula)
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
@@ -321,8 +318,28 @@
timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
}
}
+ log.Println("--------------------璧拌繖閲屼簡鍚�---------------")
return false
} else {
+ // 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
+ faces := []Arg{}
+ for _, sdkData := range args.Sdkdata {
+ for _, areaMap := range sdkData.AreaMapList {
+ for j := 0; j < len(groupRule.Rules); j++ {
+ faces = append(faces, putFaceToResult(groupRule.Rules[j], &areaMap)...)
+ }
+ }
+ }
+ // 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
+ flag11 := 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-5c1c3278a971" {
+ flag11 = true
+ }
+ }
+ if flag11 {
+ args.RuleResult["face"] = faces
+ }
// 鍘荤湅姹犲瓙閲屾槸鍚︽湁涓庢湰甯ф暟鎹湁鍏崇殑瀹氭椂鍣紝濡傛灉鏈夛紝鐪嬫鏃舵槸鍚﹁蛋鍒�0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
var flag bool = true
for k, timeEle := range TimeEleList {
@@ -484,11 +501,13 @@
for _, va := range timeEle.RuleResults {
if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
+ log.Println("杩欎釜鎽勫儚鏈�--",args.CameraId,"--琚祴浜堜簡result",va.Result)
}
}
// 鍒ゆ柇缁撴灉鏁扮粍鏄惁瀹屾弧(鍗宠璧嬪�煎畬姣�)鍙緱鍑烘姤璀︾粨鏋�
var isPerfect = true
for _, va := range timeEle.RuleResults {
+ log.Println("---------------------鐬呯瀰褰撳墠鏁扮粍________________锛�",*va)
if va.Result == "" && va.RuleWithPre != "||" {
isPerfect = false
}
--
Gitblit v1.8.0