From 0c920726510355313e90dc802799f96981777a80 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 11:16:34 +0800
Subject: [PATCH] 转换年龄描述，性别，种族
---
insertdata/insertDataToEs.go | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
util/image.go | 1 -
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index c16d36b..e6919cf 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -30,10 +30,10 @@
SdkName string `json:"sdkName"`
Content string `json:"content"`
LikeDate string `json:"likeDate"`
- Sex int32 `json:"sex"`
+ Sex string `json:"sex"`
Age int32 `json:"age"`
AgeDescription string `json:"ageDescription"`
- Race int32 `json:"race"`
+ Race string `json:"race"`
SmileLevel int32 `json:"smileLevel"`
BeautyLevel int32 `json:"beautyLevel"`
FaceFeature string `json:"faceFeature"`
@@ -131,11 +131,21 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
+ log.Println("-------------------------------------------鐪嬩笅瀹藉拰楂�",i.Width,i.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))
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
log.Println("涓婁紶灏忓浘鍑洪敊")
}
+ sex := ""
+ if face.ThftRes.Gender == 1 {
+ sex = "鐢�"
+ } else {
+ sex = "濂�"
+ }
+ race := getRaceString(face.ThftRes.Race)
+ ageDescription := getDescription(face.ThftRes.Age)
+
pervideo := PerVideoPicture{
uuid.NewV4().String(),
msg.Cid,
@@ -147,10 +157,10 @@
"浜鸿劯",
"",
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- face.ThftRes.Gender,
+ sex,
face.ThftRes.Age,
- "",
- face.ThftRes.Race,
+ ageDescription,
+ race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
@@ -310,3 +320,32 @@
}
return alarm
}
+
+//鑾峰彇骞撮緞鎻忚堪
+func getDescription (age int32) string{
+ ageInfo := "闈掑勾"
+ if age > 0 && age < 7 {
+ ageInfo = "绔ュ勾"
+ } else if age >= 7 && age < 18 {
+ ageInfo = "灏戝勾"
+ } else if age >= 18 && age < 40 {
+ ageInfo = "闈掑勾"
+ } else if age >= 40 && age < 65 {
+ ageInfo = "涓勾"
+ } else if age >= 65 {
+ ageInfo = "鑰佸勾"
+ }
+ return ageInfo
+}
+
+func getRaceString (i int32) string{
+ race := ""
+ if i == 1 {
+ race = "white"
+ } else if i == 2{
+ race = "yellow"
+ } else {
+ race = "black"
+ }
+ return race
+}
\ No newline at end of file
diff --git a/util/image.go b/util/image.go
index 8c245a7..e81abde 100644
--- a/util/image.go
+++ b/util/image.go
@@ -7,7 +7,6 @@
)
// 鎸夊昂瀵稿幓鍒囧浘
func SubImg(i protomsg.Image,x0,y0,x1,y1 int,) []byte{
-
img,_ := gocv.NewMatFromBytes(int(i.Height),int(i.Width),gocv.MatTypeCV8UC3,i.Data)
rect := image.Rect(x0,y0,x1,y1)
region := img.Region(rect)
--
Gitblit v1.8.0