From 18827e9e25797b6d24ad7ad4785f7e80fe46a409 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 18 十一月 2019 19:05:14 +0800
Subject: [PATCH] 车辆版本
---
insertdata/insertDataToEs.go | 685 +++++++++++++++++++++-----------------------------------
1 files changed, 259 insertions(+), 426 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index adac153..70953b0 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -49,12 +49,8 @@
Content string `json:"content"`
AlarmRules []AlarmRule `json:"alarmRules"`
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"`
+ ShowLable string `json:"showLable"`
+ OtherLable string `json:"otherLable"`
FaceFeature string `json:"faceFeature"`
PicSmUrl []string `json:"picSmUrl"`
VideoUrl string `json:"videoUrl"`
@@ -86,12 +82,7 @@
Content string `json:"content"`
AlarmRules []AlarmRule `json:"alarmRules"`
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"`
+ Lable string `json:"lable"`
FaceFeature string `json:"faceFeature"`
PicSmUrl []string `json:"picSmUrl"`
VideoUrl string `json:"videoUrl"`
@@ -159,18 +150,18 @@
LinkInfo string `json:"linkInfo"`
}
-// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
-type FaceAndRules struct {
+// 涓�涓猳bj瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣� 鍙敤浜庝汉鑴� 鍙敤浜庤溅鐗�
+type ObjAndRules struct {
structure.Arg
rules []structure.Result
}
func InsertToEs(msg structure.ResultMsg) {
- defer func() {
- if err := recover(); err != nil {
- logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
- }
- }()
+ //defer func() {
+ // if err := recover(); err != nil {
+ // logger.Error("es妯″潡鍎跨殑寮傚父鎹曡幏锛�", err)
+ // }
+ //}()
localConfig1, err := cache.GetServerInfo()
if err != nil {
panic("閰嶇疆鏂囦欢涓嶅悎娉�")
@@ -183,111 +174,101 @@
InsertTarget(msg)
}
-// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
+// 寰�es涓彃鍏ヤ汉鑴哥被鍨嬫暟鎹�
func InsertFace(msg structure.ResultMsg) {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0 {
- logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
- faces := []*FaceAndRules{}
- faces = PutFace(faces, msg)
- //logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
- if faces != nil {
- var imgMaxUrl string = ""
- var picTime string = ""
- for _, face := range faces {
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- alarmRules := []AlarmRule{}
- //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, ""})
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- // 鍏堜紶灏忓浘锛屽啀浼犲ぇ鍥撅紝闃叉鑴镐笂鏈夌嚎
- 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 {
- logger.Error("涓婁紶灏忓浘鍑洪敊")
- }
- // 涓婁紶澶у浘
- if imgMaxUrl == "" {
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.Result), weedfsUrl)
- logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
- imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
- picTime = i.Timestamp
- }
- sex := ""
- logger.Info(sex)
- if face.ThftRes.Gender == 1 {
- sex = "鐢�"
- } else {
- sex = "濂�"
- }
- race := getRaceString(face.ThftRes.Race)
- ageDescription := getDescription(face.ThftRes.Age)
- logger.Info(ageDescription)
- var target = new(Target)
- target.TargetId = strconv.FormatUint(face.Id, 10)
- target.TargetScore = face.Score
- target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
- //logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
- var targetInfos []Target
- targetInfos = append(targetInfos, *target)
- pervideo := PerVideoPicture{
- face.Uuid,
- msg.Cid,
- msg.Push.Cam.Addr,
- msg.Push.Cam.Name,
- picTime,
- imgMaxUrl,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- "浜鸿劯",
- "",
- alarmRules,
- time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- sex, //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
- face.ThftRes.Age,
- ageDescription, // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
- race,
- face.ThftRes.Smile,
- face.ThftRes.Beauty,
- base64.StdEncoding.EncodeToString(face.Feature),
- []string{resp["fileUrl"].(string)},
- "",
- msg.Push.ServerId,
- msg.Push.ServerName,
- msg.Push.LocalIp,
- "",
- face.Score,
- 1,
- 0,
- 0,
- 0,
- face.Liker,
- targetInfos,
- "",
- []*LinkInfo{},
- }
- requstbody, err := json.Marshal(pervideo)
+ if (msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0) || (msg.RuleResult["plate"] != nil && len(msg.RuleResult["plate"].([]structure.Result)) > 0) {
+ for key, results := range msg.RuleResult {
+ if key == "face" || key == "plate" {
+ logger.Info("寰�ES鎻掍汉鑴告暟鎹�(鎴栬溅鐗屾暟鎹�)")
+ faces := []*ObjAndRules{}
+ faces = PutFace(faces, results.([]structure.Result))
+ //logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
+ if faces != nil {
+ var imgMaxUrl string = ""
+ var picTime string = ""
+ for _, face := range faces {
+ // 涓婁紶澶у浘
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ alarmRules := []AlarmRule{}
+ for _, faceResult := range face.rules {
+ alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState, ""})
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ // 鍏堜紶灏忓浘锛屽啀浼犲ぇ鍥撅紝闃叉鑴镐笂鏈夌嚎
+ 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 {
+ logger.Error("涓婁紶灏忓浘鍑洪敊")
+ }
+ // 涓婁紶澶у浘
+ if imgMaxUrl == "" {
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.Result), weedfsUrl)
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
+ picTime = i.Timestamp
+ }
+ lable,lableAttach := Feature2Jsonstr(*face)
+ var target = new(Target)
+ target.TargetId = face.Id
+ target.TargetScore = face.Score
+ target.TargetLocation = Points{TopLeft: Point{face.Location.X, face.Location.Y}, BottomRight: Point{face.Location.X + face.Location.Width, face.Location.Y + face.Location.Height}}
+ //logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
+ var targetInfos []Target
+ targetInfos = append(targetInfos, *target)
+ pervideo := PerVideoPicture{
+ face.Uuid,
+ msg.Cid,
+ msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
+ picTime,
+ imgMaxUrl,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ "浜鸿劯",
+ time.Now().Format("2006-01-02 15:04:05"),
+ alarmRules,
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ lable,
+ lableAttach,
+ base64.StdEncoding.EncodeToString(face.Feature),
+ []string{resp["fileUrl"].(string)},
+ "",
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
+ "",
+ face.Score,
+ 1,
+ 0,
+ 0,
+ 0,
+ face.Liker,
+ targetInfos,
+ "",
+ []*LinkInfo{},
+ }
+ requstbody, err := json.Marshal(pervideo)
- if err != nil {
- logger.Info("json parse error ", err)
- return
- }
- resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
- if err1 != nil {
- logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
- } else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭�(浜鸿劯)锛�", resp1)
- // 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+ }
+ resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ } else {
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭�(浜鸿劯)锛�", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: face.Uuid, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 1})
+ }
+ }
}
}
}
@@ -295,22 +276,18 @@
}
// 褰掔疆浜鸿劯
-func PutFace(faces []*FaceAndRules, msg structure.ResultMsg) []*FaceAndRules {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.Result)) > 0 {
- for _, faceResult := range msg.RuleResult["face"].([]structure.Result) {
- faces = hebingFace(faces, faceResult)
- }
- return faces
- } else {
- return nil
+func PutFace(objs []*ObjAndRules, resutls []structure.Result) []*ObjAndRules {
+ for _, faceResult := range resutls {
+ objs = hebingFace(objs, faceResult)
}
+ return objs
}
-func hebingFace(faces []*FaceAndRules, faceResult structure.Result) []*FaceAndRules {
+func hebingFace(objs []*ObjAndRules, faceResult structure.Result) []*ObjAndRules {
for _, arg := range faceResult.AlarmObj {
// 鎷垮埌姣忎竴寮犱汉鑴�
//logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
flag := false
- for _, face := range faces {
+ for _, face := range objs {
//for _, lik := range face.Liker {
// //logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細", lik.PersonId, lik.TableName)
//}
@@ -333,10 +310,10 @@
}
}
if !flag {
- faces = append(faces, &FaceAndRules{*arg, []structure.Result{faceResult}})
+ objs = append(objs, &ObjAndRules{*arg, []structure.Result{faceResult}})
}
}
- return faces
+ return objs
}
// 寰�es涓彃鍏olo鏁版嵁
@@ -351,174 +328,12 @@
}
}
if flag {
- logger.Info("寰�ES鎻抷olo鏁版嵁")
- var sdkNames string = ""
- alarmRules := []AlarmRule{}
- var targetInfos []Target
- url := []string{}
- for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
- if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
- // 鎷煎嚭sdkname
- //logger.Info("搴旇杩涙潵鎵嶅鐨�")
- sdkNames = sdkNames + yoloResult.SdkName
- alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
- linkInfo := ""
- if yoloResult.IsLink {
- linkInfo = "鑱斿姩浠诲姟"
- }
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
- // 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
- if yoloResult.Others.CacheData != nil {
- //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- msgs := yoloResult.Others.CacheData
- for _, msg1 := range msgs {
- bdata, err := util.UnCompress(msg1.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
- if err1 != nil {
- logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- } else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
- }
- if resp1["fileUrl"] != nil {
- url = append(url, resp1["fileUrl"].(string))
- }
- }
- }
- // 瑁呴厤鐩爣淇℃伅鏁版嵁
- for _, target := range yoloResult.AlarmObj {
- // 鍘婚噸娣诲姞
- var flag = true
- for _, selectTarget := range targetInfos {
- if strconv.FormatUint(target.Id, 10) == selectTarget.TargetId {
- flag = false
- break
- }
- }
- if flag {
- var target1 = new(Target)
- target1.TargetId = strconv.FormatUint(target.Id, 10)
- target1.TargetScore = target.Score
- target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
- targetInfos = append(targetInfos, *target1)
- }
- }
- }
- }
- // 鑱斿姩鍥惧儚鐨勫鐞�
- linkTagInfos := []*LinkInfo{}
- 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 {
- for _, msg2 := range yoloResult.Others.LinkCache {
- // 鎶妋sg2鐨勬暟鎹閰嶆垚涓�涓狿erVideoPicture缁撴瀯浣�
- if msg2.Cid != msg.Cid {
- linkTagInfos = append(linkTagInfos, msg2PersonVideo(msg2))
- }
- }
- }
- }
- linkTag := ""
- if len(linkTagInfos) > 0 {
- linkTag = "鑱斿姩浠诲姟"
- }
- isAlarm := 0
- resp := make(map[string]interface{})
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- if len(alarmRules) > 0 {
- isAlarm = 1
- //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)
- return
- } else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
- }
- } else {
- isAlarm = 0
- // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
- return
- }
- if resp["fileUrl"] != nil {
- url = append(url, resp["fileUrl"].(string))
- //esDataId := uuid.NewV4().String()
- peraction := Personaction{
- msg.Push.PushId,
- msg.Cid,
- msg.Push.Cam.Name,
- msg.Push.Cam.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "",
- alarmRules,
- msg.Push.ServerId,
- msg.Push.ServerName,
- msg.Push.LocalIp,
- "",
- url,
- i.Timestamp,
- "",
- isAlarm,
- 0,
- 0,
- 0,
- targetInfos,
- linkTag,
- linkTagInfos,
- }
- requstbody, err := json.Marshal(peraction)
-
- if len(linkTagInfos)>0 {
- logger.Info("鑱斿姩浠诲姟1111")
- }
- 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杩斿洖鐨勬暟鎹俊鎭槸锛坹olo锛夛細", resp1)
- // 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 2})
- for index,link := range linkTagInfos {
- 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鏁版嵁鎴愬姛")
- //os.Exit(1)
- }
- }
- }
- } else {
- logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
- }
-}
-
-// 鎻掑叆鐩爣鎸佺画鏃堕棿鏁版嵁
-func InsertTarget1(msg structure.ResultMsg) {
- if msg.RuleResult["target"] != nil && len(msg.RuleResult["target"].([]structure.Result)) > 0 {
- // 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
- logger.Info("寰�ES鎻抰arget鏁版嵁")
+ logger.Info("寰�ES鎻抷olo鏁版嵁")
var sdkNames string = ""
alarmRules := []AlarmRule{}
var targetInfos []Target
- //url := []string{}
- for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
+ url := []string{}
+ for _, yoloResult := range msg.RuleResult["yolo"].([]structure.Result) {
if yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10" {
// 鎷煎嚭sdkname
//logger.Info("搴旇杩涙潵鎵嶅鐨�")
@@ -529,43 +344,44 @@
linkInfo = "鑱斿姩浠诲姟"
}
alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText, yoloResult.DefenceState, linkInfo})
+ logger.Info("鎵撳嵃浠诲姟鍚嶇О锛�", )
// 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
- //if yoloResult.Others.CacheData != nil {
- // //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- // // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
- // // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- // msgs := yoloResult.Others.CacheData
- // for _, msg1 := range msgs {
- // bdata, err := util.UnCompress(msg1.Data)
- // if err != nil {
- // panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- // }
- // i := protomsg.Image{}
- // err = proto.Unmarshal(bdata, &i)
- // resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["target"].([]structure.Result), weedfsUrl)
- // if err1 != nil {
- // logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- // } else {
- // logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
- // }
- // if resp1["fileUrl"] != nil {
- // url = append(url, resp1["fileUrl"].(string))
- // }
- // }
- //}
+ if yoloResult.Others.CacheData != nil {
+ //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ msgs := yoloResult.Others.CacheData
+ for _, msg1 := range msgs {
+ bdata, err := util.UnCompress(msg1.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["yolo"].([]structure.Result), weedfsUrl)
+ if err1 != nil {
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ }
+ if resp1["fileUrl"] != nil {
+ url = append(url, resp1["fileUrl"].(string))
+ }
+ }
+ }
// 瑁呴厤鐩爣淇℃伅鏁版嵁
for _, target := range yoloResult.AlarmObj {
// 鍘婚噸娣诲姞
var flag = true
for _, selectTarget := range targetInfos {
- if strconv.FormatUint(target.Id, 10) == selectTarget.TargetId {
+ if target.Id == selectTarget.TargetId {
flag = false
break
}
}
if flag {
var target1 = new(Target)
- target1.TargetId = strconv.FormatUint(target.Id, 10)
+ target1.TargetId = target.Id
target1.TargetScore = target.Score
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
@@ -575,7 +391,7 @@
}
// 鑱斿姩鍥惧儚鐨勫鐞�
linkTagInfos := []*LinkInfo{}
- for _, yoloResult := range msg.RuleResult["target"].([]structure.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 {
for _, msg2 := range yoloResult.Others.LinkCache {
// 鎶妋sg2鐨勬暟鎹閰嶆垚涓�涓狿erVideoPicture缁撴瀯浣�
@@ -601,7 +417,7 @@
if len(alarmRules) > 0 {
isAlarm = 1
//resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
+ resp, err = util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["yolo"].([]structure.Result), weedfsUrl)
if err != nil {
logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
return
@@ -613,106 +429,97 @@
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
- for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
- for _, yolo := range yoloResult.AlarmObj {
- //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- urls := []string{}
- msg1 := yolo.CacheData
- bdata, err := util.UnCompress(msg1.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImageForYolo(msg1.Cid, i, msg1.RuleResult["target"].([]structure.Result), weedfsUrl)
- if err1 != nil {
- logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- } else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
- }
- if resp1["fileUrl"] != nil {
- urls = append(urls, resp1["fileUrl"].(string))
- }
- if resp["fileUrl"] != nil {
- urls = append(urls, resp["fileUrl"].(string))
- //esDataId := uuid.NewV4().String()
- peraction := Personaction{
- msg.Push.PushId,
- msg.Cid,
- msg.Push.Cam.Name,
- msg.Push.Cam.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "",
- alarmRules,
- msg.Push.ServerId,
- msg.Push.ServerName,
- msg.Push.LocalIp,
- "",
- urls,
- i.Timestamp,
- "",
- isAlarm,
- 0,
- 0,
- 0,
- targetInfos,
- linkTag,
- linkTagInfos,
- }
- requstbody, err := json.Marshal(peraction)
+ if resp["fileUrl"] != nil {
+ url = append(url, resp["fileUrl"].(string))
+ //esDataId := uuid.NewV4().String()
+ peraction := Personaction{
+ msg.Push.PushId,
+ msg.Cid,
+ msg.Push.Cam.Name,
+ msg.Push.Cam.Addr,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkNames,
+ time.Now().Format("2006-01-02 15:04:05"),
+ alarmRules,
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
+ "",
+ url,
+ i.Timestamp,
+ "",
+ isAlarm,
+ 0,
+ 0,
+ 0,
+ targetInfos,
+ linkTag,
+ linkTagInfos,
+ }
+ requstbody, err := json.Marshal(peraction)
- if len(linkTagInfos)>0 {
- logger.Info("鑱斿姩浠诲姟1111")
- }
- 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杩斿洖鐨勬暟鎹俊鎭槸锛坱arget锛夛細", resp1)
- // 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 2})
- for index,link := range linkTagInfos {
- 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鏁版嵁鎴愬姛")
- //os.Exit(1)
- }
+ if len(linkTagInfos) > 0 {
+ logger.Info("鑱斿姩浠诲姟1111")
+ }
+ 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杩斿洖鐨勬暟鎹俊鎭槸锛坹olo锛夛細", resp1)
+ // 鍙戝嚭褰曞儚淇″彿
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 2})
+ for index, link := range linkTagInfos {
+ 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鏁版嵁鎴愬姛")
+ //os.Exit(1)
}
}
-
}
+ } else {
+ logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
+ }
}
+
+// 鎻掑叆鐩爣鎸佺画鏃堕棿鏁版嵁
func InsertTarget(msg structure.ResultMsg) {
if msg.RuleResult["target"] != nil && len(msg.RuleResult["target"].([]structure.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+ logger.Info("鎻掑叆瀹氭椂鐩爣淇℃伅锛�", len(msg.RuleResult["target"].([]structure.Result)))
for _, yoloResult := range msg.RuleResult["target"].([]structure.Result) {
- for _, tar := range yoloResult.AlarmObj {
- // 瑁呰浇鐩爣淇℃伅
- var target = new(Target)
- target.TargetId = strconv.FormatUint(tar.Id, 10)
- target.TargetScore = tar.Score
- target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
+ // 瑁呰浇鐩爣淇℃伅`
+ // 濡傛灉鏈夐娆℃姤璀︾殑鍒欐湰甯ф暟鎹彲浠ユ彃鍏�
+ insertFlag := false
+ alarmNum := 0
+ for _, obj := range yoloResult.AlarmObj {
+ if obj.TimeLable == "10" {
+ insertFlag = true
+ alarmNum++
+ }
+ }
+ if insertFlag {
+ logger.Info("鎶ヨ鐩爣涓暟锛�", alarmNum)
+ //var target = new(Target)
+ //target.TargetId = strconv.FormatUint(tar.Id, 10)
+ //target.TargetScore = tar.Score
+ //target.TargetLocation = Points{TopLeft: Point{tar.Location.X, tar.Location.Y}, BottomRight: Point{tar.Location.X + tar.Location.Width, tar.Location.Y + tar.Location.Height}}
//logger.Info("浜鸿劯鐨刬d:",strconv.FormatUint(face.Id, 10))
- var targetInfos []Target
- targetInfos = append(targetInfos, *target)
+ //var targetInfos []Target
+ //targetInfos = append(targetInfos, *target)
// 鑾峰彇鐩爣缂撳瓨鍥剧墖
url := []string{}
//InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
// 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- url1 := uploadImg(tar.CacheData)
- url = append(url,url1)
+ url1 := uploadImg(yoloResult.AlarmObj[0].CacheData)
+ url = append(url, url1)
// 娣诲姞鎶ヨ瑙勫垯缁�
sdkNames := ""
alarmRules := []AlarmRule{}
@@ -765,16 +572,19 @@
}
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
+ if len(url) == 1 {
+ return
+ }
//esDataId := uuid.NewV4().String()
peraction := Personaction{
- tar.Uuid,
+ msg.Push.PushId,
msg.Cid,
msg.Push.Cam.Name,
msg.Push.Cam.Addr,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
- "",
+ time.Now().Format("2006-01-02 15:04:05"),
alarmRules,
msg.Push.ServerId,
msg.Push.ServerName,
@@ -787,13 +597,13 @@
0,
0,
0,
- targetInfos,
+ nil,
linkTag,
linkTagInfos,
}
requstbody, err := json.Marshal(peraction)
- if len(linkTagInfos)>0 {
+ if len(linkTagInfos) > 0 {
logger.Info("鑱斿姩浠诲姟1111")
}
if err != nil {
@@ -807,20 +617,21 @@
logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛坱arget锛夛細", resp1)
// 鍙戝嚭褰曞儚淇″彿
ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: msg.Push.PushId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, VideoUrl: msg.Push.VideoUrl, ImgId: i.Id, SdkIds: []string{"-1"}, Type: 2})
- for index,link := range linkTagInfos {
- logger.Info("鑱斿姩浠诲姟鐨勫綍鍍忎俊鍙凤細",index)
+ for index, link := range linkTagInfos {
+ 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鏁版嵁鎴愬姛")
//os.Exit(1)
}
}
-
-
+ } else {
+ logger.Info("娌℃湁棣栨鎶ヨ鐨勭洰鏍囷紝涓嶆彃鍏�")
}
}
}
}
+
// 鑾峰彇鏈満ip
func GetLocalIP() (ipv4 string, err error) {
var (
@@ -875,14 +686,14 @@
return alarm
}
-func uploadImg(msg structure.ResultMsg) string{
+func uploadImg(msg structure.ResultMsg) string {
bdata, err := util.UnCompress(msg.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImageForYolo(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
+ resp1, err1 := util.DrawPolygonOnImageForTarget(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
if err1 != nil {
logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
} else {
@@ -894,6 +705,7 @@
return ""
}
}
+
//鑾峰彇骞撮緞鎻忚堪
func getDescription(age int32) string {
ageInfo := "闈掑勾"
@@ -921,6 +733,32 @@
race = "榛戜汉"
}
return race
+}
+
+func Feature2Jsonstr(obj ObjAndRules) (string,string) {
+ var lable string
+ var lableAttach string
+ switch obj.Type {
+ case "face":
+ sex := ""
+ if obj.ThftRes.Gender == 1 {
+ sex = "鐢�"
+ } else {
+ sex = "濂�"
+ }
+ race := getRaceString(obj.ThftRes.Race)
+ ageDescription := getDescription(obj.ThftRes.Age)
+ lable = sex+" / "+ageDescription+" / "+race+" / "
+ lableAttach = strconv.Itoa(int(obj.ThftRes.Age))+"宀�"+" / "+"寰瑧鍊硷細"+strconv.Itoa(int(obj.ThftRes.Smile))+" / "+"棰滃�硷細"+strconv.Itoa(int(obj.ThftRes.Beauty))
+
+ case "plate":
+ // 杞︾墝杩愬姩鏂瑰悜锛�0 unknown, 1 left, 2 right, 3 up, 4 down
+ lable = obj.Car.License+" / "+cache.GetDic("nColor"+strconv.Itoa(int(obj.Car.NColor)))+"杞︾墝"+" / "+
+ cache.GetDic("nCarColor"+strconv.Itoa(int(obj.Car.NCarColor)))+"杞﹁締"+" / "+ cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarLogo)))+" / "+cache.GetDic("nCarLogo"+strconv.Itoa(int(obj.Car.NCarType)))
+ lableAttach = cache.GetDic("nDirection"+strconv.Itoa(int(obj.Car.NDirection)))+" / "+"杞︾墝缃俊搴︼細"+strconv.Itoa(int(obj.Car.NConfidence))+" / "+
+ "杞︾墝浜害锛�"+strconv.Itoa(int(obj.Car.NBright))+" / "+"杞︾殑浜害锛�"+strconv.Itoa(int(obj.Car.NCarBright))+" / "+"璇嗗埆鏃堕棿锛�"+strconv.Itoa(int(obj.Car.NTime))
+ }
+ return lable,lableAttach
}
func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo {
@@ -979,14 +817,14 @@
// 鍘婚噸娣诲姞
var flag = true
for _, selectTarget := range targetInfos {
- if strconv.FormatUint(target.Id, 10) == selectTarget.TargetId {
+ if target.Id == selectTarget.TargetId {
flag = false
break
}
}
if flag {
var target1 = new(Target)
- target1.TargetId = strconv.FormatUint(target.Id, 10)
+ target1.TargetId = target.Id
target1.TargetScore = target.Score
target1.TargetLocation = Points{TopLeft: Point{target.Location.X, target.Location.Y}, BottomRight: Point{target.Location.X + target.Location.Width, target.Location.Y + target.Location.Height}}
targetInfos = append(targetInfos, *target1)
@@ -1034,12 +872,7 @@
"",
alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- "", //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
- 0,
- "", // 鏆傛敼涓哄垎鍊糵mt.Sprintf("%.2f",face.Score)
"",
- 0,
- 0,
"",
[]string{resp["fileUrl"].(string)},
"",
--
Gitblit v1.8.0