logger改用公共库

panlei

2019-09-27 7b20cb1a629526553ed640c42108fe3fba203040

 labelFilter/ruleForLabel.go

@@ -4,7 +4,7 @@
   "basic.com/dbapi.git"
   "basic.com/pubsub/protomsg.git"
   "github.com/knetic/govaluate"
   "ruleprocess/logger"
   "basic.com/valib/logger.git"
   "ruleprocess/ruleserver"
   "strconv"
   "time"
@@ -45,19 +45,19 @@
         for _, rule := range ruleGroup.Rules {
            // 过每一个小规则
            if rule.TopicType == "camera" {
               result = Connector + cameraJudge(label, rule)
               result += Connector + cameraJudge(label, rule)
            }
            if rule.TopicType == "dbtable" {
               result = Connector + baseJudge(label, rule)
               result += Connector + baseJudge(label, rule)
            }
            if rule.TopicType == "task" {
               result = Connector + taskJudge(label, rule)
               result += Connector + taskJudge(label, rule)
            }
            if rule.TopicType == "person" {
               result = Connector + taskJudge(label, rule)
               result += Connector + taskJudge(label, rule)
            }
            if rule.TopicType == "alarmLevel" {
               result = Connector + defenceJudge(label, rule)
               result += Connector + defenceJudge(label, rule)
            }
         }
         // 得出总的判断结果
@@ -67,6 +67,7 @@
            expression, err := govaluate.NewEvaluableExpression(result);
            if err != nil {
               logger.Error("表达式有误，请检查！")
               return
            }
            result, err1 := expression.Evaluate(nil)
            if err1 != nil {
@@ -107,6 +108,7 @@
   expression, err := govaluate.NewEvaluableExpression("t1 < t2");
   if err != nil {
      logger.Error("表达式有误，请检查！")
      return false
   }
   parameters := make(map[string]interface{}, 8)
   parameters["t1"] = time1
@@ -167,7 +169,7 @@
               logger.Info("-------打印底库规则公式：",formula)
               if err != nil {
                  logger.Error("表达式有误，请检查！", formula)
                  //return "false"
                  return "false"
               }
               result, err1 := expression.Evaluate(nil)
               if err1 != nil {
@@ -208,7 +210,7 @@
         expression, err := govaluate.NewEvaluableExpression(formula);
         if err != nil {
            logger.Error("表达式有误，请检查！", formula)
            //return "false"
            return "false"
         }
         result, err1 := expression.Evaluate(nil)
         if err1 != nil {
@@ -232,7 +234,7 @@
            expression, err := govaluate.NewEvaluableExpression(formula);
            if err != nil {
               logger.Error("表达式有误，请检查！", formula)
               //return "false"
               return "false"
            }
            result, err1 := expression.Evaluate(nil)
            if err1 != nil {
@@ -264,12 +266,12 @@
      }
   } else {
      for _, def := range label.DefenceLevel {
         formula := strconv.Itoa(int(def)) + rule.Operator + formate(rule.RuleValue)
         formula := strconv.Itoa(int(def)) + rule.Operator + rule.RuleValue
         logger.Info("-------打印布防等级规则公式：",formula)
         expression, err := govaluate.NewEvaluableExpression(formula);
         if err != nil {
            logger.Error("表达式有误，请检查！", formula)
            //return "false"
            return "false"
         }
         result, err1 := expression.Evaluate(nil)
         if err1 != nil {