From e2aab518eddae165b9a7c517fbaddaf692ac4070 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 10 九月 2019 18:49:05 +0800
Subject: [PATCH] merge labelFilter
---
insertdata/insertDataToEs.go | 171 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 105 insertions(+), 66 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 30d4117..ffdb4d4 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -76,7 +76,7 @@
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
- BaseInfo []*ruleserver.BaseInfo `json:"baseInfo"`
+ BaseInfo []*structure.BaseInfo `json:"baseInfo"`
}
// yolo琛屼负鐨勬暟鎹粨鏋�
@@ -115,8 +115,8 @@
// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
type FaceAndRules struct {
- ruleserver.Arg
- rules []ruleserver.Result
+ structure.Arg
+ rules []structure.Result
}
// 寰�ES鎻掓暟鎹�
@@ -143,7 +143,7 @@
// // ChangeStatusYolo(msg)
// //}
//}
-func InsertToEs(msg ruleserver.ResultMsg) {
+func InsertToEs(msg structure.ResultMsg) {
InsertFace(msg, "")
// 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
fk := ruleserver.TrackOrNot(msg.RuleResult)
@@ -162,8 +162,8 @@
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg, linkId string) {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+func InsertFace(msg structure.ResultMsg, linkId string) {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
faces := []*FaceAndRules{}
faces = PutFace(faces,msg)
@@ -271,9 +271,9 @@
}
// 褰掔疆浜鸿劯
-func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
- for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+func PutFace(faces []*FaceAndRules,msg structure.ResultMsg)[]*FaceAndRules{
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.FaceResult)) > 0 {
+ for _, faceResult := range msg.RuleResult["face"].([]structure.FaceResult) {
faces = hebingFace(faces, faceResult)
}
return faces
@@ -281,7 +281,7 @@
return nil
}
}
-func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
+func hebingFace(faces []*FaceAndRules, faceResult structure.FaceResult) []*FaceAndRules{
for _, arg := range faceResult.Args {
// 鎷垮埌姣忎竴寮犱汉鑴�
logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
@@ -309,18 +309,18 @@
}
}
if !flag {
- faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
+ faces = append(faces, &FaceAndRules{arg, []structure.Result{faceResult.Result}})
}
}
return faces
}
// 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg ruleserver.ResultMsg, linkId string) {
- if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
+func InsertYolo(msg structure.ResultMsg, linkId string) {
+ if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
- for _, res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, res := range msg.RuleResult["yolo"].([]structure.Result) {
//logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
flag = true
@@ -331,7 +331,7 @@
var sdkNames string = ""
alarmRules := []AlarmRule{}
url := []string{}
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
// 鎷煎嚭sdkname
//logger.Info("搴旇杩涙潵鎵嶅鐨�")
@@ -355,7 +355,7 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ resp1, err1 := util.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err1 != nil {
logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -367,7 +367,7 @@
}
}
linkFlag := false
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1 {
linkId := uuid.NewV4().String()
for _, msg2 := range yoloResult.Others.LinkCache {
@@ -396,9 +396,10 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ return
} else {
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
}
@@ -419,59 +420,97 @@
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
+ if resp["fileUrl"] != nil {
+ url = append(url, resp["fileUrl"].(string))
+ esDataId := uuid.NewV4().String()
+ linksId := ""
+ if linkId != "" {
+ linksId = linkId
+ }
+ peraction := Personaction{
+ esDataId,
+ msg.Cid,
+ camera.Name,
+ camera.Addr,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkNames,
+ "",
+ alarmRules,
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ url,
+ i.Timestamp,
+ linksId,
+ "",
+ isAlarm,
+ 0,
+ 0,
+ 0,
+ }
+ requstbody, err := json.Marshal(peraction)
- url = append(url, resp["fileUrl"].(string))
- esDataId := uuid.NewV4().String()
- linksId := ""
- if linkId != "" {
- linksId = linkId
- }
- peraction := Personaction{
- esDataId,
- msg.Cid,
- camera.Name,
- camera.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "",
- alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- url,
- i.Timestamp,
- linksId,
- "",
- isAlarm,
- 0,
- 0,
- 0,
- }
- requstbody, err := json.Marshal(peraction)
+//<<<<<<< HEAD
+// url = append(url, resp["fileUrl"].(string))
+// esDataId := uuid.NewV4().String()
+// linksId := ""
+// if linkId != "" {
+// linksId = linkId
+// }
+// peraction := Personaction{
+// esDataId,
+// msg.Cid,
+// camera.Name,
+// camera.Addr,
+// msg.Tasklab.Taskid,
+// msg.Tasklab.Taskname,
+// sdkNames,
+// "",
+// alarmRules,
+// localConfig.ServerId,
+// localConfig.ServerName,
+// serverIp,
+// "",
+// url,
+// i.Timestamp,
+// linksId,
+// "",
+// isAlarm,
+// 0,
+// 0,
+// 0,
+// }
+// requstbody, err := json.Marshal(peraction)
+//
+// if err != nil {
+// logger.Info("json parse error ", err)
+// return
+//=======
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+//>>>>>>> labelFilter
- if err != nil {
- logger.Info("json parse error ", err)
- return
-
- }
- resp1, err2 := EsReq("POST", personAction, requstbody)
- if err2 != nil {
- logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
- } 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})
- logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
- //os.Exit(1)
+ }
+ resp1, err2 := EsReq("POST", personAction, requstbody)
+ if err2 != nil {
+ logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ } 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})
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
+ }
}
} else {
logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
}
}
}
-func ChangeStatusYolo(msg ruleserver.ResultMsg) {
+func ChangeStatusYolo(msg structure.ResultMsg) {
logger.Info("寰�ES鎻抷olo闈炴姤璀︾姸鎬佹敼鍙樻暟鎹�")
var sdkNames string = ""
alarmRules := []AlarmRule{}
@@ -482,7 +521,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ resp, err := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -542,7 +581,7 @@
//os.Exit(1)
}
}
-func ChangeStatusFace(msg ruleserver.ResultMsg) {
+func ChangeStatusFace(msg structure.ResultMsg) {
logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
@@ -599,7 +638,7 @@
0,
0,
0,
- []*ruleserver.BaseInfo{},
+ []*structure.BaseInfo{},
}
requstbody, err := json.Marshal(pervideo)
--
Gitblit v1.8.0