From 23c837bc4d5b4312c0bb5eb96260c90e887882ac Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 15:10:23 +0800
Subject: [PATCH] git add .
---
insertdata/insertDataToEs.go | 65 ++++++++++----------------------
1 files changed, 21 insertions(+), 44 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index b5f88c7..a54a5c3 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -208,19 +208,6 @@
imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
picTime = i.Timestamp
}
- // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
-
- //logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string))
sex := ""
logger.Info(sex)
if face.ThftRes.Gender == 1 {
@@ -231,7 +218,7 @@
race := getRaceString(face.ThftRes.Race)
ageDescription := getDescription(face.ThftRes.Age)
logger.Info(ageDescription)
- esDataId := uuid.NewV4().String()
+ //esDataId := uuid.NewV4().String()
linksId := ""
if linkId != "" {
linksId = linkId
@@ -243,9 +230,9 @@
//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
logger.Info("%%%%%%%%%%%%%%%%%%%%%鐩爣淇℃伅锛�",*target)
pervideo := PerVideoPicture{
- esDataId,
+ msg.Push.PushId,
msg.Cid,
- camera.Addr,
+ msg.Push.Cam.Addr,
picTime,
imgMaxUrl,
msg.Tasklab.Taskid,
@@ -262,10 +249,10 @@
face.ThftRes.Beauty,
base64.StdEncoding.EncodeToString(face.Feature),
[]string{resp["fileUrl"].(string)},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
+ "",
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
"",
linksId,
face.Score,
@@ -288,7 +275,7 @@
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl:msg.Push.VideoUrl,ImgId: i.Id, SdkIds: []string{}, Type: 1})
}
}
}
@@ -381,6 +368,10 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
+ logger.Debug("鎸佺画鏃堕棿绗竴寮犵敾妗嗭細")
+ for _,res := range msg1.RuleResult["yolo"].([]structure.Result) {
+ logger.Debug("鎸佺画鏃堕棿绗竴寮犺鍒欙細",res)
+ }
resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err1 != nil {
logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
@@ -455,40 +446,27 @@
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
- // 鏌ヨ鏈満淇℃伅
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- logger.Info("鎽勫儚鏈轰俊鎭細",camera)
- serverIp, err := GetLocalIP()
- logger.Info("%%%%%%%%%%%%%%%%%yolo鐨則arget淇℃伅锛�",targetInfos)
+
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
- esDataId := uuid.NewV4().String()
+ //esDataId := uuid.NewV4().String()
linksId := ""
if linkId != "" {
linksId = linkId
}
peraction := Personaction{
- esDataId,
+ msg.Push.PushId,
msg.Cid,
- camera.Name,
- camera.Addr,
+ msg.Push.Cam.Name,
+ msg.Push.Cam.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
"",
alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
"",
url,
i.Timestamp,
@@ -505,7 +483,6 @@
if err != nil {
logger.Info("json parse error ", err)
return
-
}
resp1, err2 := EsReq("POST", personAction, requstbody)
if err2 != nil {
@@ -513,7 +490,7 @@
} else {
logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛�", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid,VideoUrl:msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{}, Type: 2})
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
--
Gitblit v1.8.0