From 5c3cfd092cf6fc9c1aec5027a5ed97eaa1a13c6f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 04 七月 2019 19:36:09 +0800
Subject: [PATCH] 加上给目标画框，解析底库数据
---
insertdata/insertDataToEs.go | 159 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 101 insertions(+), 58 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 1d375df..277b14a 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 int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []Base `json:"baseInfo"`
}
type Base struct {
@@ -82,9 +82,9 @@
PicSmUrl []string `json:"picSmUrl"`
PicDate string `json:"picDate"`
VideoUrl string `json:"videoUrl"`
- IsAlarm string `json:"isAlarm"`
- IsAckAlarm string `json:"isAckAlarm"`
- IsCollect string `json:"isCollect"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
}
@@ -124,43 +124,57 @@
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- log.Println("======================================鐪嬬湅杩欎釜妗嗭細",face.Location)
+ 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,
+ "浜鸿劯",
"",
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,
"涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- strings.Split(resp["fileUrl"].(string), "/")[1],
+ []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
localConfig.ServerName,
serverIp,
"",
- "",
- "",
- "",
+ 1,
0,
- Base{},
+ 0,
+ 0,
+ []Base{},
}
requstbody, err := json.Marshal(pervideo)
@@ -171,8 +185,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)
}
}
}
@@ -185,10 +199,10 @@
alarm := ChangeToString(yoloResult.AlarmLevel)
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
}
- isAlarm := ""
+ isAlarm := 0
resp := make(map[string]interface{})
if len(alarmRules) > 0 {
- isAlarm = "1"
+ isAlarm = 1
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
if err != nil {
@@ -197,21 +211,21 @@
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,msg.RuleResult["yolo"].([]ruleserver.Result))
if err != nil {
- log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊",err)
- }else{
+ log.Println("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
log.Println("宸叉姤璀﹀苟涓婁紶鏀瑰抚鍥剧墖鍒版湇鍔″櫒")
}
} else {
- isAlarm = "0"
+ isAlarm = 0
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
localConfig, err := cache.GetServerInfo()
- if err !=nil {
+ if err != nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
@@ -238,8 +252,8 @@
time.Now().Format("2006-01-02 15:04:05"),
"",
isAlarm,
- "",
- "",
+ 0,
+ 0,
0,
}
requstbody, err := json.Marshal(peraction)
@@ -251,9 +265,9 @@
}
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鎴愬姛")
+ log.Println("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
}
}
}
@@ -287,7 +301,7 @@
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(i int32) string{
+func ChangeToString(i int32) string {
alarm := ""
if i == 1 {
alarm = "涓�绾�"
@@ -305,4 +319,33 @@
alarm = "浜旂骇"
}
return alarm
-}
\ No newline at end of file
+}
+
+//鑾峰彇骞撮緞鎻忚堪
+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
+}
--
Gitblit v1.8.0