From 0499de0bdaa4d6c20e14911d09c21a3f9d4f8516 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 09 十二月 2019 14:28:52 +0800
Subject: [PATCH] ---
---
algorithm/insertEs/insertDataToEs.go | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/algorithm/insertEs/insertDataToEs.go b/algorithm/insertEs/insertDataToEs.go
index 4fbe1d0..1d06682 100644
--- a/algorithm/insertEs/insertDataToEs.go
+++ b/algorithm/insertEs/insertDataToEs.go
@@ -107,7 +107,7 @@
func InsertToEs(msg structure.ResultMsg) {
defer func() {
if err := recover(); err != nil {
- _ = logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+ logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
}
}()
localConfig1, err := cache.GetServerInfo()
@@ -143,7 +143,7 @@
faces = PutFace(faces, results.([]structure.Result))
//logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
if faces != nil {
- _ = logger.Warn("face涓嶄负nil")
+ logger.Warn("face涓嶄负nil")
var imgMaxUrl []string = []string{}
var picTime string = ""
for _, face := range faces {
@@ -165,7 +165,7 @@
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),face.Type)
resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
if err != nil {
- _ = logger.Error("涓婁紶灏忓浘鍑洪敊")
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
}
// 涓婁紶澶у浘
if len(imgMaxUrl) == 0 {
@@ -242,7 +242,7 @@
esid := face.Liker[0].TargetId
returnMsg, err1 := esutil.AppendTargetInfo(esid, string(requstbody),EsInfo.EsIndex.AIOcean.IndexName,serverIp,serverPort)
if err1 != nil {
- _ = logger.Error("杩藉姞鏁版嵁鍑洪敊锛�---", err1)
+ logger.Error("杩藉姞鏁版嵁鍑洪敊锛�---", err1)
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", returnMsg)
// 鍙戝嚭褰曞儚淇″彿
@@ -251,7 +251,7 @@
} else {
resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
if err1 != nil {
- _ = logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
// 鍙戝嚭褰曞儚淇″彿
@@ -347,7 +347,7 @@
err = proto.Unmarshal(bdata, &i)
resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err1 != nil {
- _ = logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
}
@@ -407,7 +407,7 @@
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err != nil {
- _ = logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
return
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
@@ -461,7 +461,7 @@
}
resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
- _ = logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛坹olo锛夛細", resp1)
// 鍙戝嚭褰曞儚淇″彿
@@ -470,7 +470,7 @@
logger.Info("鑱斿姩浠诲姟鐨勫綍鍍忎俊鍙凤細", index)
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: link.CameraId, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{strconv.Itoa(index)}, Type: 2})
}
- _ = logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
}
@@ -544,7 +544,7 @@
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
if err != nil {
- _ = logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
return
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
@@ -621,7 +621,7 @@
}
resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
- _ = logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛坱arget锛夛細", resp1)
// 鍙戝嚭褰曞儚淇″彿
@@ -630,7 +630,7 @@
logger.Info("鑱斿姩浠诲姟鐨勫綍鍍忎俊鍙凤細", index)
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: link.CameraId, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{strconv.Itoa(index)}, Type: 2})
}
- _ = logger.Warn("__________________________________________寰�ES鎻掑叆target鏁版嵁鎴愬姛")
+ logger.Warn("__________________________________________寰�ES鎻掑叆target鏁版嵁鎴愬姛")
//os.Exit(1)
}
}
@@ -704,7 +704,7 @@
err = proto.Unmarshal(bdata, &i)
resp1, err1 := util.DrawPolygonOnImageForTarget(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
if err1 != nil {
- _ = logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
}
@@ -813,7 +813,7 @@
err = proto.Unmarshal(bdata, &i)
resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err1 != nil {
- _ = logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
}
@@ -856,7 +856,7 @@
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err != nil {
- _ = logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
return nil
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
--
Gitblit v1.8.0