panlei
2019-09-29 7a06bb3e7e47e9b67adfd1fcbe025491819b2970
ruleserver/ruleToformula.go
@@ -2,7 +2,7 @@
import (
   "ruleprocess/cache"
   "ruleprocess/logger"
   "basic.com/valib/logger.git"
   "sort"
   "strconv"
   "strings"
@@ -205,9 +205,8 @@
                  // 如果此结果为真且当前过的是yolo算法,应记下此规则所对应的sdkName,另外,还要去重 (后加:把此条触碰的区域id也记录下来)
                  if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                     sdkNames = sdkName + ","
                     polygonId = groupRule.Rules[j].PolygonId + ","
                  }
                  if strings.Contains(ruleResult.Result, "true") && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
                  if strings.Contains(ruleResult.Result, "true") && !strings.Contains(polygonId, groupRule.Rules[j].PolygonId) {
                     polygonId = groupRule.Rules[j].PolygonId + ","
                  }
                  resultSplice = append(resultSplice, &ruleResult)
@@ -580,7 +579,7 @@
      //logger.Info("规则的算法id和区域的算法id:", rule.SdkId, "===", am.sdkId)
      if rule.PolygonId == am.areaId { // 算法和区域都得对的上
         if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule"{
         if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" {
            if rule.RuleWithPre == "||" {
               return LittleRuleResult{}
            } else {
@@ -648,17 +647,15 @@
                  } else {
                     return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
                  }
               } else {
                  return LittleRuleResult{}
               }
            } else {
               return LittleRuleResult{}
            } else if rule.SdkArgAlias == "" { // 什么参数都不配的情况
               if am.targetNum > 0 {
                  return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
               } else {
                  return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
               }
            }
         } else {
            return LittleRuleResult{}
         }
      } else {
         return LittleRuleResult{}
      }
   } else {
      // 处理的都是yolo数据
@@ -698,14 +695,16 @@
               return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
            }
         } else {
            return LittleRuleResult{}
         } else if rule.SdkArgAlias == "" {
            if am.targetNum > 0 {
               return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
            } else {
               return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
            }
         }
      } else {
         return LittleRuleResult{}
      }
   }
   return LittleRuleResult{}
}
// 如果有持续时间条件维护开启一个定时器
@@ -756,18 +755,6 @@
         result, _ := expression.Evaluate(nil)                      // 得到数学公式的结果
         return LittleRuleResult{am.sdkName, rule.RuleWithPre + " " + strconv.FormatBool(result.(bool)), rule.Sort}
         // 加上关于算法的判断条件,不能只有关于规则的,有的算法本身就是一个规则,如个体静止,靠右行,所以,拿到当前子规则的sdkid来判断是否是那些特殊的规则
      } else if rule.SdkId == "IsStatic" { // 静止算法
         if am.isStatic {
            return LittleRuleResult{}
         } else {
            return LittleRuleResult{}
         }
      } else if rule.SdkId == "KeepRight" { // 靠右行算法
         if am.keepRight {
            return LittleRuleResult{}
         } else {
            return LittleRuleResult{}
         }
      }
   }
   return LittleRuleResult{}