---
panlei
2019-07-31 f677cf7b9196a2aadc376cab4c769402d9ce1a5c
ruleserver/ruleToformula.go
@@ -328,13 +328,17 @@
                  }
               }
            }
            nihao := make(map[string]interface{})
            for k,v := range label{
               nihao[k] = v
            }
            //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})
               args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,nihao})
               //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})
               args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,nihao},faces})
               //logger.Info("-------------------face结果标签", len(args.RuleResult["face"].([]FaceResult)))
            }
            return true
@@ -423,7 +427,7 @@
      for _, va := range timeEle.RuleResults {
         if va.CameraId == args.CameraId {
            va.Result = strconv.FormatBool(isOk)
            //va.CacheData = ResultMsg{message,args.RuleResult}
            va.CacheData = ResultMsg{message,args.RuleResult}
            logger.Info("这个摄像机--", args.CameraId, "--被赋予了result", va.Result)
         }
      }