From 11ee4d898c98d940943a005f8b6bcba9d04f7541 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 11:28:58 +0800
Subject: [PATCH] 白人黄人改汉字
---
insertdata/insertDataToEs.go | 145 ++++++++++++++++++++++++++++++-----------------
1 files changed, 92 insertions(+), 53 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 447e3af..15aa12f 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -20,34 +20,34 @@
var weedfsUrl = "http://192.168.1.182:6333/submit"
// 浜鸿劯鐨勬暟鎹粨鏋�
type PerVideoPicture struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraAddr string `json:"cameraAddr"`
- PicDate string `json:"picDate"`
- PicMaxUrl string `json:"picMaxUrl"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- LikeDate string `json:"likeDate"`
- Sex int32 `json:"sex"`
- Age int32 `json:"age"`
- AgeDescription string `json:"ageDescription"`
- Race int32 `json:"race"`
- SmileLevel int32 `json:"smileLevel"`
- BeautyLevel int32 `json:"beautyLevel"`
- FaceFeature string `json:"faceFeature"`
- PicSmUrl string `json:"picSmUrl"`
- VideoUrl string `json:"videoUrl"`
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
- IsDelete int `json:"isDelete"`
- BaseInfo Base `json:"baseInfo"`
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ PicDate string `json:"picDate"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ Content string `json:"content"`
+ LikeDate string `json:"likeDate"`
+ Sex string `json:"sex"`
+ Age int32 `json:"age"`
+ AgeDescription string `json:"ageDescription"`
+ Race string `json:"race"`
+ SmileLevel int32 `json:"smileLevel"`
+ BeautyLevel int32 `json:"beautyLevel"`
+ FaceFeature string `json:"faceFeature"`
+ PicSmUrl []string `json:"picSmUrl"`
+ VideoUrl string `json:"videoUrl"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ IsAlarm string `json:"isAlarm"`
+ IsAckAlarm string `json:"isAckAlarm"`
+ IsCollect string `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []Base `json:"baseInfo"`
}
type Base struct {
@@ -124,33 +124,47 @@
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- i1 := protomsg.Image{}
- i1 = util.Subimg(i.Data, 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.PostFormBufferData(weedfsUrl, i1, uuid.NewV4().String())
+ 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,
- msg.Caddr,
+ camera.Addr,
time.Now().Format("2006-01-02 15:04:05"),
- bigPhotoUrl["fileUrl"].(string),
+ strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
- face.SdkName,
+ "浜鸿劯",
"",
- "", // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- face.ThftRes.Gender,
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ sex,
face.ThftRes.Age,
- "",
- face.ThftRes.Race,
+ ageDescription,
+ race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- strings.Split(resp["fileUrl"].(string), "/")[1],
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
@@ -160,7 +174,7 @@
"",
"",
0,
- Base{},
+ []Base{},
}
requstbody, err := json.Marshal(pervideo)
@@ -170,13 +184,9 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- if err != nil {
- log.Println("es can not execute right.")
- } else {
- log.Println("___________________________________寰�ES鎻掑叆浜鸿劯鏁版嵁鎴愬姛")
- }
- }else {
- log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�",face.Liker)
+ log.Println(err)
+ } else {
+ log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
}
}
}
@@ -201,10 +211,10 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err =util.DrawPolygonOnImage(msg.Cid,i)
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i)
if err != nil {
- log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
- }else{
+ log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
} else {
@@ -215,7 +225,7 @@
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
- if err !=nil {
+ if err != nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
@@ -255,7 +265,7 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/personaction/perVideoAction", requstbody)
if err != nil {
- log.Println("寰�ES鎻掑叆鏁版嵁澶辫触",err)
+ log.Println("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
log.Println("__________________________________________寰�ES鎻掑叆鏁版嵁yolo鎴愬姛")
}
@@ -291,7 +301,7 @@
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(i int32) string{
+func ChangeToString(i int32) string {
alarm := ""
if i == 1 {
alarm = "涓�绾�"
@@ -309,4 +319,33 @@
alarm = "浜旂骇"
}
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 = "鐧戒汉"
+ } else if i == 2{
+ race = "榛勪汉"
+ } else {
+ race = "榛戜汉"
+ }
+ return race
}
\ No newline at end of file
--
Gitblit v1.8.0