From 74b51d7b71fa71788754285691ecbaf5d34f7d70 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 16 十一月 2019 11:57:39 +0800
Subject: [PATCH] 为数据写入当前规则处理时间
---
insertdata/insertDataToEs.go | 704 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 526 insertions(+), 178 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 88f0aae..41f90c8 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -40,6 +40,7 @@
Id string `json:"id"`
CameraId string `json:"cameraId"`
CameraAddr string `json:"cameraAddr"`
+ CameraName string `json:"cameraName"`
PicDate string `json:"picDate"`
PicMaxUrl string `json:"picMaxUrl"`
TaskId string `json:"taskId"`
@@ -61,31 +62,68 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
- LinkId string `json:"linkId"`
DetectScore float64 `json:"detectScore"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
BaseInfo []*structure.BaseInfo `json:"baseInfo"`
- TargetInfo Target
+ TargetInfo []Target `json:"targetInfo"`
+ LinkTag string `json:"linkTag"`
+ LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
+}
+
+type LinkInfo struct {
+ Id string `json:"id"`
+ CameraId string `json:"cameraId"`
+ CameraAddr string `json:"cameraAddr"`
+ CameraName string `json:"cameraName"`
+ PicDate string `json:"picDate"`
+ PicMaxUrl string `json:"picMaxUrl"`
+ TaskId string `json:"taskId"`
+ TaskName string `json:"taskName"`
+ SdkName string `json:"sdkName"`
+ 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"`
+ FaceFeature string `json:"faceFeature"`
+ PicSmUrl []string `json:"picSmUrl"`
+ VideoUrl string `json:"videoUrl"`
+ AnalyServerId string `json:"analyServerId"`
+ AnalyServerName string `json:"analyServerName"`
+ AnalyServerIp string `json:"analyServerIp"`
+ ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
+ IsAlarm int `json:"isAlarm"`
+ IsAckAlarm int `json:"isAckAlarm"`
+ IsCollect int `json:"isCollect"`
+ IsDelete int `json:"isDelete"`
+ BaseInfo []*structure.BaseInfo `json:"baseInfo"`
+ TargetInfo []Target `json:"targetInfo"`
}
type Target struct {
- TargetId string `json:"targetId"`
+ TargetId string `json:"targetId"`
TargetScore float64 `json:"targetScore"`
- TargetLocation Points
+ TargetLocation Points `json:"targetLocation"`
}
type Points struct {
- TopLeft Point `json:"topLeft"`
+ TopLeft Point `json:"topLeft"`
BottomRight Point `json:"bottomRight"`
}
type Point struct {
- Lat float64 `json:"lat"`
- Lon float64 `json:"lon"`
+ X float64 `json:"x"`
+ Y float64 `json:"y"`
}
+
// yolo琛屼负鐨勬暟鎹粨鏋�
type Personaction struct {
Id string `json:"id"`
@@ -103,13 +141,14 @@
ClusterId string `json:"clusterId"`
PicSmUrl []string `json:"picSmUrl"`
PicDate string `json:"picDate"`
- LinkId string `json:"linkId"`
VideoUrl string `json:"videoUrl"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
IsDelete int `json:"isDelete"`
- TargetInfo []Target
+ TargetInfo []Target `json:"targetInfo"`
+ LinkTag string `json:"linkTag"`
+ LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
}
type AlarmRule struct {
@@ -117,7 +156,6 @@
AlarmLevel string `json:"alarmLevel"`
RuleText string `json:"ruleText"`
DefenceState bool `json:"defenceState"`
- IsLink bool `json:"isLink"`
LinkInfo string `json:"linkInfo"`
}
@@ -128,11 +166,11 @@
}
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("閰嶇疆鏂囦欢涓嶅悎娉�")
@@ -140,13 +178,14 @@
weedfsUrl = "http://" + localConfig1.WebPicIp + ":" + strconv.Itoa(int(localConfig1.WebPicPort)) + "/submit"
videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.VideoPersons.IndexName + "/" + EsInfo.EsIndex.VideoPersons.IndexType
personAction = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.Personaction.IndexName + "/" + EsInfo.EsIndex.Personaction.IndexType
- InsertFace(msg, "")
- InsertYolo(msg, "")
+ InsertFace(msg)
+ InsertYolo(msg)
+ InsertTarget(msg)
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg structure.ResultMsg, linkId string) {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.TargetResult)) > 0 {
+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)
@@ -165,7 +204,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, ""})
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
@@ -178,7 +217,7 @@
// 涓婁紶澶у浘
if imgMaxUrl == "" {
bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.TargetResult), weedfsUrl)
+ bigPhotoUrl, err = util.DrawPolygonOnImageForFace(msg.Cid, i, msg.RuleResult["face"].([]structure.Result), weedfsUrl)
logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
imgMaxUrl = bigPhotoUrl["fileUrl"].(string)
picTime = i.Timestamp
@@ -193,27 +232,24 @@
race := getRaceString(face.ThftRes.Race)
ageDescription := getDescription(face.ThftRes.Age)
logger.Info(ageDescription)
- //esDataId := uuid.NewV4().String()
- linksId := ""
- if linkId != "" {
- linksId = linkId
- }
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}}
+ 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{
- msg.Push.PushId,
+ 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"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
sex, //鏆傛敼涓轰汉鑴竔d strconv.FormatUint(face.Id, 10)
@@ -229,14 +265,15 @@
msg.Push.ServerName,
msg.Push.LocalIp,
"",
- linksId,
face.Score,
1,
0,
0,
0,
face.Liker,
- *target,
+ targetInfos,
+ "",
+ []*LinkInfo{},
}
requstbody, err := json.Marshal(pervideo)
@@ -248,9 +285,9 @@
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭�(浜鸿劯)锛�", 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{}, Type: 1})
+ 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})
}
}
}
@@ -259,8 +296,8 @@
// 褰掔疆浜鸿劯
func PutFace(faces []*FaceAndRules, msg structure.ResultMsg) []*FaceAndRules {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]structure.TargetResult)) > 0 {
- for _, faceResult := range msg.RuleResult["face"].([]structure.TargetResult) {
+ 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
@@ -268,8 +305,8 @@
return nil
}
}
-func hebingFace(faces []*FaceAndRules, faceResult structure.TargetResult) []*FaceAndRules {
- for _, arg := range faceResult.Args {
+func hebingFace(faces []*FaceAndRules, faceResult structure.Result) []*FaceAndRules {
+ for _, arg := range faceResult.AlarmObj {
// 鎷垮埌姣忎竴寮犱汉鑴�
//logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�", len(arg.Liker))
flag := false
@@ -279,7 +316,7 @@
//}
if arg.Id == face.Id {
flag = true
- face.rules = append(face.rules, faceResult.Result)
+ face.rules = append(face.rules, faceResult)
// 鐩镐技鑰呭幓閲嶅綊骞�
for _, liker := range arg.Liker {
flag1 := true
@@ -296,14 +333,14 @@
}
}
if !flag {
- faces = append(faces, &FaceAndRules{arg, []structure.Result{faceResult.Result}})
+ faces = append(faces, &FaceAndRules{*arg, []structure.Result{faceResult}})
}
}
return faces
}
// 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg structure.ResultMsg, linkId string) {
+func InsertYolo(msg structure.ResultMsg) {
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
@@ -314,162 +351,309 @@
}
}
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, yoloResult.IsLink, 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))
+ 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})
+ 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["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.Location {
- // 鍘婚噸娣诲姞
- var flag = true
- for _,selectTarget := range targetInfos {
- if strconv.FormatUint(target.TargetId, 10) == selectTarget.TargetId {
- flag = false
- break
+ // 瑁呴厤鐩爣淇℃伅鏁版嵁
+ 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.TargetId, 10)
- target1.TargetScore = target.TargetScore
- target1.TargetLocation = Points{TopLeft:Point{target.X,target.Y},BottomRight:Point{target.X+target.Width,target.Y+target.Height}}
- targetInfos = append(targetInfos,*target1)
+ 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)
+ }
}
}
}
- }
- linkFlag := false
- 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 {
- logger.Warn("鎻掑叆鑱斿姩鏁版嵁", "姝ゅ抚鏁版嵁鐨刬d涓�", msg2.Cid)
- InsertYolo(msg2, linkId)
- linkFlag = true
+ // 鑱斿姩鍥惧儚鐨勫鐞�
+ 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))
+ }
+ }
}
}
- }
- if linkFlag {
- // 鑱斿姩鏁版嵁涓寘鍚湰甯ф暟鎹紝鎻掑叆鑱斿姩鏁版嵁鍚庡氨涓嶉渶瑕佹彃鍏ユ湰甯ф暟鎹簡
- logger.Warn("鎴愬姛鎻掑叆涓や釜鑱斿姩鍥剧墖")
- //os.Exit(1)
- return
- }
- //logger.Info("--------璧板埌杩欏効灏变笉涓�鏍�")
- 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)
+ linkTag := ""
+ if len(linkTagInfos) > 0 {
+ linkTag = "鑱斿姩浠诲姟"
+ }
+ isAlarm := 0
+ resp := make(map[string]interface{})
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
if err != nil {
- logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- return
+ 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 {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+ isAlarm = 0
+ // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+ return
}
- } else {
- isAlarm = 0
- // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
- return
- }
- if resp["fileUrl"] != nil {
- url = append(url, resp["fileUrl"].(string))
- //esDataId := uuid.NewV4().String()
- linksId := ""
- if linkId != "" {
- linksId = linkId
- }
- 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,
- linksId,
- "",
- isAlarm,
- 0,
- 0,
- 0,
- targetInfos,
- }
- 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 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: 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)
+ 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) {
+ // 瑁呰浇鐩爣淇℃伅`
+ // 濡傛灉鏈夐娆℃姤璀︾殑鍒欐湰甯ф暟鎹彲浠ユ彃鍏�
+ 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)
+ // 鑾峰彇鐩爣缂撳瓨鍥剧墖
+ url := []string{}
+ //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ url1 := uploadImg(yoloResult.AlarmObj[0].CacheData)
+ url = append(url,url1)
+ // 娣诲姞鎶ヨ瑙勫垯缁�
+ sdkNames := ""
+ alarmRules := []AlarmRule{}
+ 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})
+ // 鑱斿姩鍥惧儚鐨勫鐞�
+ linkTagInfos := []*LinkInfo{}
+ for _, yoloResult := range msg.RuleResult["target"].([]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{})
+ // 瑙ｅ帇缂╁苟涓婁紶鏈抚鏁版嵁鍥剧墖
+ bdata1, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata1, &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["target"].([]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))
+ if len(url) == 1 {
+ return
+ }
+ //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,
+ nil,
+ 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鎻掑叆target鏁版嵁鎴愬姛")
+ //os.Exit(1)
+ }
+ }
+ } else {
+ logger.Info("娌℃湁棣栨鎶ヨ鐨勭洰鏍囷紝涓嶆彃鍏�")
+ }
+ }
+ }
+}
// 鑾峰彇鏈満ip
func GetLocalIP() (ipv4 string, err error) {
var (
@@ -524,6 +708,25 @@
return alarm
}
+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.DrawPolygonOnImageForTarget(msg.Cid, i, msg.RuleResult["target"].([]structure.Result), weedfsUrl)
+ if err1 != nil {
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ }
+ if resp1["fileUrl"] != nil {
+ return resp1["fileUrl"].(string)
+ } else {
+ return ""
+ }
+}
//鑾峰彇骞撮緞鎻忚堪
func getDescription(age int32) string {
ageInfo := "闈掑勾"
@@ -552,3 +755,148 @@
}
return race
}
+
+func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo {
+ if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]structure.Result)) > 0 {
+ // 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+ flag := false
+ for _, res := range msg.RuleResult["yolo"].([]structure.Result) {
+ //logger.Info("瀹氭椂鍣ㄦ墦鐨勬暟瀛楁爣绛撅細",res.Others.TimeLabel)
+ if res.Others.TimeLabel == "01" || res.Others.TimeLabel == "10" {
+ flag = true
+ }
+ }
+ if flag {
+ logger.Info("鎻掑叆Yolo缁勮鏁版嵁")
+ 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)
+ }
+ }
+ }
+ }
+ 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 nil
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+ }
+ } else {
+ isAlarm = 0
+ // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+ return nil
+ }
+ if resp["fileUrl"] != nil {
+ url = append(url, resp["fileUrl"].(string))
+ //esDataId := uuid.NewV4().String()
+ pervideo := &LinkInfo{
+ msg.Push.PushId + "-" + uuid.NewV4().String(),
+ msg.Cid,
+ msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
+ i.Timestamp,
+ "",
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ "浜鸿劯",
+ "",
+ 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)},
+ "",
+ msg.Push.ServerId,
+ msg.Push.ServerName,
+ msg.Push.LocalIp,
+ "",
+ 0,
+ isAlarm,
+ 0,
+ 0,
+ 0,
+ nil,
+ targetInfos,
+ }
+ return pervideo
+ } else {
+ return nil
+ }
+ } else {
+ logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�")
+ return nil
+ }
+ } else {
+ return nil
+ }
+}
--
Gitblit v1.8.0