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 | 139 ++++++++++++++++++++++++++++++---------------- 1 files changed, 91 insertions(+), 48 deletions(-) diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go index 13ac16e..ffdb4d4 100644 --- a/insertdata/insertDataToEs.go +++ b/insertdata/insertDataToEs.go @@ -9,7 +9,6 @@ "net" "ruleprocess/cache" "ruleprocess/logger" - "ruleprocess/structure" "time" "basic.com/pubsub/protomsg.git" @@ -111,6 +110,7 @@ RuleText string `json:"ruleText"` DefenceState bool `json:"defenceState"` IsLink bool `json:"isLink"` + LinkInfo string `json:"linkInfo"` } // 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣� @@ -181,7 +181,7 @@ //os.Exit(1) for _,faceResult := range face.rules { alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel) - alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink}) + alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState,faceResult.IsLink,""}) } i := protomsg.Image{} err = proto.Unmarshal(bdata, &i) @@ -204,7 +204,7 @@ if err != nil { logger.Error("涓婁紶灏忓浘鍑洪敊") } - logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string)) + //logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string)) sex := "" if face.ThftRes.Gender == 1 { sex = "鐢�" @@ -337,7 +337,11 @@ //logger.Info("搴旇杩涙潵鎵嶅鐨�") sdkNames = sdkNames + yoloResult.SdkName alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel) - alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink}) + linkInfo := "" + if yoloResult.IsLink { + linkInfo = "鑱斿姩浠诲姟" + } + alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState,yoloResult.IsLink,linkInfo}) // 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl if yoloResult.Others.CacheData != nil { //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg)) @@ -395,6 +399,7 @@ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl) if err != nil { logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err) + return } else { logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp) } @@ -415,52 +420,90 @@ 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鏉′欢閮戒笉绗﹀悎锛�") -- Gitblit v1.8.0