车辆不再扩充

panlei

2019-11-21 87981f30bd29d7c1b336da956bf2d5b39b25bdfe

 insertdata/insertDataToEs.go

@@ -171,7 +171,7 @@
                  i := protomsg.Image{}
                  err = proto.Unmarshal(bdata, &i)
                  // 先传小图，再传大图，防止脸上有线
                  bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
                  bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height),face.Type)
                  resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
                  if err != nil {
                     logger.Error("上传小图出错")
@@ -189,9 +189,7 @@
                  target.TargetId = face.Id
                  target.TargetScore = face.Score
                  target.TargetType = face.Type
                  logger.Info("人脸的特征值是：",face.Feature)
                  target.Feature = base64.StdEncoding.EncodeToString(face.Feature)
                  logger.Info("base64版本：",target.Feature)
                  target.PicSmUrl = resp["fileUrl"].(string)
                  target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
                  var targetInfos []Target
@@ -363,6 +361,7 @@
                     var target1 = new(Target)
                     target1.TargetId = target.Id
                     target1.TargetScore = target.Score
                     target1.TargetType = target.Type
                     target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
                     targetInfos = append(targetInfos, *target1)
                  }
@@ -563,6 +562,7 @@
                  var target1 = new(Target)
                  target1.TargetId = target.Id
                  target1.TargetScore = target.Score
                  target1.TargetType = target.Type
                  target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
                  targetInfos = append(targetInfos, *target1)
               }
@@ -754,11 +754,11 @@

   case "plate":
      // 车牌运动方向，0 unknown, 1 left, 2 right, 3 up, 4 down
      logger.Info("车辆车牌信息：", obj.Car.NColor, obj.Car.NCarColor, obj.Car.NCarLogo, obj.Car.NCarType, obj.Car.NDirection)
      lable = obj.Car.License + "/" + cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor))) + "车牌" + "/" +
         cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor))) + "车辆" + "/" + "品牌：" + cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo))) + "/" + "型号：" + cache.GetDic("nCarType"+strconv.Itoa(int(obj.Car.NCarType)))
      lableAttach = "运动方向：" + cache.GetDic("nDirection"+strconv.Itoa(int(obj.Car.NDirection))) + "/" + "车牌置信度：" + strconv.Itoa(int(obj.Car.NConfidence)) + "/" +
         "车牌亮度：" + strconv.Itoa(int(obj.Car.NBright)) + "/" + "车的亮度：" + strconv.Itoa(int(obj.Car.NCarBright)) + "/" + "识别时间：" + strconv.Itoa(int(obj.Car.NTime))
      lable = obj.Car.License + "/" + cache.GetDic("nVehicleColor1"+strconv.Itoa(int(obj.Car.NVehicleColor1))) + "车辆" + "/" +
         cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor))) + "车牌"
      lableAttach = "车牌置信度：" + strconv.Itoa(int(obj.Car.NConfidence)) + "/" + "车的亮度：" + strconv.Itoa(int(obj.Car.NVehicleBright)) +"/"+ "车牌类型"+cache.GetDic("nType"+strconv.Itoa(int(obj.Car.NType)))+
         "车身辅颜色："+cache.GetDic("nVehicleColor2"+strconv.Itoa(int(obj.Car.NVehicleColor2)))+"/"+"是否识别到车牌："+cache.GetDic("nVehicleColor1"+strconv.Itoa(int(obj.Car.NVehicleColor1)))+"/"+
         "车辆置信度"+strconv.Itoa(int(obj.Score))+"/"+"品牌：" +obj.Car.VehicleType1
   }
   return lable, lableAttach
}