From 15e5410c4fab8b9041729ad9a6efaea7c66d5fae Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 03 七月 2019 10:01:36 +0800
Subject: [PATCH] 人脸的路径存成数组，sdkName固定为人脸
---
insertdata/insertDataToEs.go | 78 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 88546fa..2474033 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 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"`
}
type Base struct {
@@ -139,7 +139,7 @@
strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
- face.SdkName,
+ "浜鸿劯",
"",
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
face.ThftRes.Gender,
@@ -149,7 +149,7 @@
face.ThftRes.Smile,
face.ThftRes.Beauty,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- strings.Split(resp["fileUrl"].(string), "/")[1],
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
@@ -170,8 +170,8 @@
}
err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
log.Println(err)
- }else {
- log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�",face.Liker)
+ } else {
+ log.Println("璺熷簳搴撶殑鐩镐技鏁版嵁---------锛�", face.Liker)
}
}
}
@@ -196,10 +196,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 {
@@ -210,7 +210,7 @@
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
- if err !=nil {
+ if err != nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
@@ -250,7 +250,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鎴愬姛")
}
@@ -286,7 +286,7 @@
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(i int32) string{
+func ChangeToString(i int32) string {
alarm := ""
if i == 1 {
alarm = "涓�绾�"
@@ -304,4 +304,4 @@
alarm = "浜旂骇"
}
return alarm
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0