From 4f3158002e0dc9fc0026c4127223fa281a2d8ccd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 19 十一月 2019 09:41:26 +0800
Subject: [PATCH] ---

---
 insertdata/insertDataToEs.go |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 4a14019..140b972 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -49,8 +49,8 @@
 	Content         string                `json:"content"`
 	AlarmRules      []AlarmRule           `json:"alarmRules"`
 	LikeDate        string                `json:"likeDate"`
-	ShowLables      string                `json:"showLables"`
-	OtherLables     string                `json:"otherLables"`
+	ShowLabels      string                `json:"showLabels"`
+	OtherLabels     string                `json:"otherLabels"`
 	VideoUrl        string                `json:"videoUrl"`
 	AnalyServerId   string                `json:"analyServerId"`
 	AnalyServerName string                `json:"analyServerName"`
@@ -79,8 +79,8 @@
 	Content         string                `json:"content"`
 	AlarmRules      []AlarmRule           `json:"alarmRules"`
 	LikeDate        string                `json:"likeDate"`
-	ShowLables      string                `json:"showLables"`
-	OtherLables     string                `json:"otherLables"`
+	ShowLabels      string                `json:"showLabels"`
+	OtherLabels     string                `json:"otherLabels"`
 	VideoUrl        string                `json:"videoUrl"`
 	AnalyServerId   string                `json:"analyServerId"`
 	AnalyServerName string                `json:"analyServerName"`
@@ -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"`
 }
@@ -763,15 +763,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