From 87981f30bd29d7c1b336da956bf2d5b39b25bdfe Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 16:34:04 +0800
Subject: [PATCH] 车辆不再扩充
---
insertdata/insertDataToEs.go | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 34a5a61..bf65120 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -97,7 +97,8 @@
type Target struct {
TargetId string `json:"targetId"`
TargetScore float64 `json:"targetScore"`
- FaceFeature string `json:"feature"`
+ TargetType string `json:"targetType"`
+ Feature string `json:"feature"`
PicSmUrl string `json:"picSmUrl"`
TargetLocation Points `json:"targetLocation"`
}
@@ -170,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("涓婁紶灏忓浘鍑洪敊")
@@ -187,7 +188,8 @@
var target = new(Target)
target.TargetId = face.Id
target.TargetScore = face.Score
- target.FaceFeature = base64.StdEncoding.EncodeToString(face.Feature)
+ target.TargetType = face.Type
+ target.Feature = base64.StdEncoding.EncodeToString(face.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
@@ -200,6 +202,7 @@
case "plate":
sdkname = "杞︾墝璇嗗埆"
}
+ logger.Info("浜鸿劯鐩爣target:",targetInfos)
pervideo := PerVideoPicture{
face.Uuid,
msg.Cid,
@@ -239,7 +242,7 @@
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", sdkname,"---",resp1)
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", sdkname, "---", resp1)
// 鍙戝嚭褰曞儚淇″彿
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
}
@@ -358,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)
}
@@ -558,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)
}
@@ -593,7 +598,7 @@
false,
false,
nil,
- nil,
+ targetInfos,
linkTag,
linkTagInfos,
}
@@ -744,15 +749,16 @@
}
race := getRaceString(obj.ThftRes.Race)
ageDescription := getDescription(obj.ThftRes.Age)
- lable = sex + "/" + ageDescription + "/" + race + "/"
+ lable = sex + "/" + ageDescription + "/" + race
lableAttach = strconv.Itoa(int(obj.ThftRes.Age)) + "宀�" + "/" + "寰瑧鍊硷細" + strconv.Itoa(int(obj.ThftRes.Smile)) + "/" + "棰滃�硷細" + strconv.Itoa(int(obj.ThftRes.Beauty))
case "plate":
// 杞︾墝杩愬姩鏂瑰悜锛�0 unknown, 1 left, 2 right, 3 up, 4 down
- 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
}
--
Gitblit v1.8.0