联动规则稳定版

panlei

2019-08-01 b18beafcaaa2e2086610f22079842b2e5af6e283

 ruleserver/ruleToformula.go

@@ -335,11 +335,11 @@
            //logger.Debug("------locations的内容：", locations)
            if sdkNames != "" {
               args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
               logger.Info("-------------------yolo结果标签长度", len(args.RuleResult["yolo"].([]Result)))
               //logger.Info("-------------------yolo结果标签长度", len(args.RuleResult["yolo"].([]Result)))
            }
            if faceFlag {
               args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,label},faces})
               logger.Info("-------------------face结果标签", len(args.RuleResult["face"].([]FaceResult)))
               //logger.Info("-------------------face结果标签", len(args.RuleResult["face"].([]FaceResult)))
            }
            return true
         } else {
@@ -430,18 +430,14 @@
            tempMap := make(map[string]interface{})
            for k,result := range args.RuleResult {
               if k == "yolo" {
                  logger.Info("有没有yolo标签")
                  tempMap[k] = []Result{}
                  for _,res := range result.([]Result) {
                     logger.Info("进一次yolo循环")
                     tempMap[k] = append(tempMap[k].([]Result),res)
                  }
               }
               if k == "face" {
                  logger.Info("有没有face标签")
                  tempMap[k] = []FaceResult{}
                  for _,res := range result.([]FaceResult) {
                     logger.Info("进一次face循环")
                     tempMap[k] = append(tempMap[k].([]FaceResult),res)
                  }
               }
@@ -484,6 +480,11 @@
                     args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
                  }
               }
               for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++  {
                  if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 把联动数据追加上
                     args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
                  }
               }
            }
         }
      } else {