条件过滤中不涉及时间规则的东西

panlei

2019-08-03 84aeb755f5a7cb9e6f35a43d2435b0d0a6a66d38

条件过滤中不涉及时间规则的东西

 ruleserver/ruleToformula.go

@@ -279,8 +279,8 @@
    }
    if completeFormula != "" {
        logger.Info("结果公式-----------：", completeFormula)
        expression, err := govaluate.NewEvaluableExpression(completeFormula)
        if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil {
        expression, err2 := govaluate.NewEvaluableExpression(completeFormula)
        if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err2 != nil {
            panic("规则有误，得到的数学公式不可解析")
        }
        result, _ := expression.Evaluate(nil) // 得到数学公式的结果
@@ -574,15 +574,17 @@
                        }
                        am.targetNum = len(am.filterData) // 把符合条件的目标数量更新到targetNum字段
                        logger.Info("过完条件后的目标数量为：",am.targetNum)
                    }
                    if am.targetNum > 0 {
                        logger.Info("！！！！！！！！！人脸检测成功")
                        return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
                        if am.targetNum > 0 {
                            logger.Info("！！！！！！！！！人脸检测成功")
                            return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
                        } else {
                            return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                        }
                    } else {
                        return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                    }
                } else {
                    return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                    return LittleRuleResult{}
                }
            } else {
                return LittleRuleResult{}