---

panlei

2019-07-04 37e0cf80dde971cd10cf1d57377c7729b008881d

---

 ruleserver/ruleToformula.go

@@ -307,7 +307,7 @@
        completeFormula = completeFormula + va.Result
    }
    if completeFormula != "" {
        log.Println("看看公式-----------：", completeFormula)
        log.Println("结果公式-----------：", completeFormula)
        expression, _ := govaluate.NewEvaluableExpression(completeFormula)
        if strings.HasPrefix(completeFormula,"&&") || strings.HasPrefix(completeFormula,"||"){
            panic("规则有误，得到的数学公式不可解析")
@@ -787,7 +787,7 @@
                    result, _ := expression.Evaluate(nil)                      // 得到数学公式的结果

                    formula1 := timeSlot.End + " > " + am.time
                    log.Println("-----------------时间规则不满足的公式end：",formula)
                    log.Println("-----------------时间规则不满足的公式end：",formula1)
                    expression1, _ := govaluate.NewEvaluableExpression(formula1) // 得到数学公式
                    result1, _ := expression1.Evaluate(nil)                      // 得到数学公式的结果
                    if result.(bool) && result1.(bool) {