arg新加一个参数

panlei

2019-12-16 1570637a67ec0849dbe53cff570c8691a9cff49b

 algorithm/middleware/readyData.go

@@ -21,7 +21,7 @@
func CountAreaObjs(a *structure.AreaMap,arg *structure.SdkData) {

   a.TargetNum = 0
   threshold := 70.0       // 相似度
   threshold := 0.0       // 相似度
   intersectionper := 20.0 // 占比
   size := 0.0            // 尺寸

@@ -35,7 +35,7 @@
         // 这步要备齐表达式里所需要的所有参数
         a.TargetNum++
         uuid := uuid.NewV4().String()
         arg1 := structure.Arg{structure.SourceArg{obj.Id,uuid,obj.Score, ruleserver.PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature,obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}},structure.SourceArg{}}
         arg1 := structure.Arg{structure.SourceArg{obj.Id,uuid,obj.Score, ruleserver.PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), a.AreaJson,obj.Type, obj.Rects, obj.Car,obj.Feature,obj.BodyFeature,obj.ThftRes, []*structure.BaseInfo{},"",structure.ResultMsg{}},structure.SourceArg{}}
         //logger.Println("放进去的arg：-------", arg1)
         a.Args = append(a.Args, &arg1)
         a.FilterData = append(a.FilterData, &arg1)
@@ -80,7 +80,6 @@
      if err := recover(); err != nil {
         logger.Info("解包过程的异常捕获", err.(string))
      }

   }()
   // 反序列化数据得到sdk入参
   m := protomsg.SdkMessage{}
@@ -220,10 +219,8 @@
         return
      }
      for _, info := range Track.Result {
         logger.Info("接收跟踪数据：",info.Id,info.Confidence)
         photoMap := structure.PhotoMap{structure.SourcePhoto{Id: strconv.Itoa(int(info.Id)),Score: float64(info.Confidence)*100,Rects: rectFormat(info.RcHuman), Type: "track"},structure.SourcePhoto{}}
         //FacePush2Body(&photoMap,m.Tasklab.Sdkinfos)
         logger.Info("组装后的跟踪数据：",photoMap)
         logger.Info("接收跟踪数据：",info.Id,info.Confidence,info.Feature)
         photoMap := structure.PhotoMap{structure.SourcePhoto{Id: strconv.Itoa(int(info.Id)),Score: float64(info.Confidence)*100,Rects: rectFormat(info.RcHuman), Type: "track",BodyFeature: info.Feature},structure.SourcePhoto{}}
         arg.Photo = append(arg.Photo, photoMap)
      }
      args.Sdkdata = append(args.Sdkdata, &arg)