From b5abe51183873c61209299b7560b781662f44a43 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 01 七月 2019 18:11:06 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index ca648a2..5f5c1b8 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -295,11 +295,11 @@
if completeFormula != "" {
log.Println("鐪嬬湅鍏紡-----------锛�", completeFormula)
expression, _ := govaluate.NewEvaluableExpression(completeFormula)
- result, err := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- if err != nil {
- panic("寰楀埌鐨勬暟瀛﹀叕寮忎笉鍙В鏋�")
+ if strings.HasPrefix(completeFormula,"&&") || strings.HasPrefix(completeFormula,"||"){
+ panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
}
- if result.(bool) {
+ result,_ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ if !result.(bool) {
// 缁欒繖甯ф暟鎹墦涓婅鍒欑粍鏍囩
//args.RuleResult = append(args.RuleResult, Result{TaskId: taskId, RuleGroupId: groupRule.GroupId})
for k, timeEle := range TimeEleList {
@@ -720,6 +720,7 @@
now := time.Now()
index := getIndexOfWeek(now.Weekday().String())
timeList := GetTimeById(rule.SdkArgValue, index)
+ log.Println("褰撳ぉ鐨勬椂闂磋鍒欙細----------",timeList)
//fmt.Println("浠庢暟鎹簱涓煡鍑虹殑鏃堕棿瑙勫垯锛�", timeList)
// 鍒ゆ柇鍥剧墖鏁版嵁鐨勬椂闂存槸鍚︾鍚堝綋鍓嶈鍒� 鍦ㄤ竴涓嵆涓簍rue锛屽叏涓嶅湪涓篺alse
flag := "false"
@@ -783,6 +784,7 @@
var cameraTimeRule protomsg.CameraTimerule
var api dbapi.CameraApi
_, rules := api.FindAllTimeRules()
+ log.Println("鏃堕棿闆嗗悎锛�----------------",rules)
for _, rule := range rules {
if rule.Id == id {
cameraTimeRule = rule
--
Gitblit v1.8.0