panlei
2019-07-09 728d6b93340548e39a471b96d38d1340198840e4
ruleserver/ruleToformula.go
@@ -297,13 +297,15 @@
         }
         ipcId := sdk.IpcId
         sdkName := sdk.SdkName
         if ipcId == sdkData.IpcId {
            logger.Info("当前走的规则的算法是--:",sdkName,"---")
            for _, areaMap := range sdkData.AreaMapList {
               ruleResult := filterRule(groupRule.Rules[j], &areaMap)
               if ruleResult.Result != "" {
                  logger.Info("条件规则结果:", ruleResult.Result)
                  // 如果此结果为真且当前过的是yolo算法,应记下此规则所对应的sdkName,另外,还要去重
                  if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
                  if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                     sdkNames = sdkName + ","
                  }
                  resultSplice = append(resultSplice, &ruleResult)
@@ -328,7 +330,7 @@
               ruleResult := transferParameters(groupRule.Rules[j], &areaMap)
               if ruleResult.Result != "" {
                  logger.Info("数量规则结果:", ruleResult.Result)
                  if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
                  if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                     sdkNames = sdkName + ","
                  }
                  resultSplice = append(resultSplice, &ruleResult)
@@ -351,7 +353,7 @@
               ruleResult := timeRuleResult(groupRule.Rules[j], &areaMap)
               if ruleResult.Result != "" {
                  logger.Info("时间规则结果:", ruleResult.Result)
                  if ruleResult.Result == "true" && ipcId == "" && !strings.Contains(sdkNames, sdkName) {
                  if ruleResult.Result == "true" && ipcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && !strings.Contains(sdkNames, sdkName) {
                     sdkNames = sdkName + ","
                  }
                  resultSplice = append(resultSplice, &ruleResult)