label重大更新

panlei

2019-08-01 5729425c8552b08d80f3b4c3488d0436c42fd50e

 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,11 @@
      for _, va := range timeEle.RuleResults {
         if va.CameraId == args.CameraId {
            va.Result = strconv.FormatBool(isOk)
            va.CacheData = ResultMsg{message,args.RuleResult}
            tempMap := make(map[string]interface{})
            for k,result := range args.RuleResult {
               tempMap[k] = result
            }
            va.CacheData = ResultMsg{message,tempMap}
            logger.Info("这个摄像机--", args.CameraId, "--被赋予了result", va.Result)
         }
      }
@@ -456,7 +464,19 @@
                  label["linkCache"] = append(label["linkCache"].([]ResultMsg),ruleRes.CacheData)
               }
               logger.Debug("联动任务缓存了几个数据",len(label["linkCache"].([]ResultMsg)))
               //os.Exit(1)
               //for _,result := range args.RuleResult["yolo"].([]Result) {
               //   if result.RuleGroupId == groupRule.GroupId {
               //      result.Others["linkCache"] = label
               //   }
               //}
               for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++  {
                  if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 把原来那个删掉再存一份新的
                     res := args.RuleResult["yolo"].([]Result)[i]
                     res.Others["linkCache"] = label["linkCache"]
                     args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result)[:i],args.RuleResult["yolo"].([]Result)[i+1:]...)
                     args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result),res)
                  }
               }
            }
         }
      } else {