From 5a25fb6bbd594374f9cdc9587b8f2ec5ea5df238 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 10:12:43 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 320c7bc..1b61223 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -97,7 +97,7 @@
type Target struct {
TargetId string `json:"targetId"`
TargetScore float64 `json:"targetScore"`
- FaceFeature string `json:"faceFeature"`
+ FaceFeature string `json:"feature"`
PicSmUrl string `json:"picSmUrl"`
TargetLocation Points `json:"targetLocation"`
}
@@ -219,6 +219,14 @@
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
targetInfos = append(targetInfos, *target)
+
+ sdkname := ""
+ switch key {
+ case "face":
+ sdkname = "浜鸿劯"
+ case "plate":
+ sdkname = "杞︾墝璇嗗埆"
+ }
pervideo := PerVideoPicture{
face.Uuid,
msg.Cid,
@@ -228,7 +236,7 @@
imgMaxUrl,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
- "浜鸿劯",
+ sdkname,
time.Now().Format("2006-01-02 15:04:05"),
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
@@ -763,15 +771,15 @@
}
race := getRaceString(obj.ThftRes.Race)
ageDescription := getDescription(obj.ThftRes.Age)
- lable = sex + "//" + ageDescription + "//" + race + "//"
- lableAttach = strconv.Itoa(int(obj.ThftRes.Age)) + "宀�" + "//" + "寰瑧鍊硷細" + strconv.Itoa(int(obj.ThftRes.Smile)) + "//" + "棰滃�硷細" + strconv.Itoa(int(obj.ThftRes.Beauty))
+ 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("nCarLogo"+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("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("nCarLogo"+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))
}
return lable, lableAttach
}
--
Gitblit v1.8.0