panlei
2019-11-15 72b7bd50772b4e9a466d5a7b30350639b61a9ffb
ruleserver/ruleToformula.go
@@ -109,7 +109,7 @@
      for _, areaMap := range sdkData.AreaMapList {
         targets = append(targets,areaMap.AlarmObj...)
         for _,obj := range areaMap.AlarmObj {
            logger.Info("个体静止的目标",obj.Id,obj.Location,obj.CacheData)
            logger.Info("个体静止的目标",obj.Id, obj.Location, obj.CacheData.Cid, len(obj.CacheData.Data))
         }
      }
   }
@@ -175,16 +175,16 @@
         }
         logger.Debug("------locations的内容:", yolos)
         // 处理目标定时数据
         //targets := []*structure.Arg{}
         //for _, sdkData := range args.Sdkdata {
         //   if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 把yolo数据的各个目标的坐标输出方便后面画框
         //      for _, areaMap := range sdkData.AreaMapList {
         //         if areaMap.IsEffective {
         //            yolos = append(yolos, putTargetsToResult(areaMap)...)
         //         }
         //      }
         //   }
         //}
         targets := []*structure.Arg{}
         for _, sdkData := range args.Sdkdata {
            if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 把yolo数据的各个目标的坐标输出方便后面画框
               for _, areaMap := range sdkData.AreaMapList {
                  if areaMap.IsEffective {
                     targets = append(targets, putTargetsToResult(areaMap)...)
                  }
               }
            }
         }
         var islink bool
         if groupRule.SetType == "linkTask" {
            islink = true
@@ -202,11 +202,11 @@
            //logger.Info("-------------------face结果标签", len(args.RuleResult["face"].([]FaceResult)))
            labelTypes = append(labelTypes,1)
         }
         //if len(targets) > 0 {
         //   args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, targets, polygonId, islink,label})
         //   //logger.Info("-------------------目标持续结果标签", len(args.RuleResult["face"].([]FaceResult)))
         //   //labelTypes = append(labelTypes,2)
         //}
         if len(targets) > 0 {
            args.RuleResult["target"] = append(args.RuleResult["target"].([]structure.Result), structure.Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, targets, polygonId, islink,label})
            //logger.Info("-------------------目标持续结果标签", len(args.RuleResult["face"].([]FaceResult)))
            //labelTypes = append(labelTypes,2)
         }
         // 给持续时间的第一张赋予缓存数据(遍历复制)
         if cacheId != "" { // 有这帧数据的缓存
            tempMap := make(map[string]interface{})