From fe090f3f0d4d135622d631f1798b9414d6bd81cf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 20 十一月 2019 16:35:50 +0800
Subject: [PATCH] 事件推送改造
---
insertdata/insertDataToEs.go | 260 ++++++++++++++++++++++++++--------------------------
1 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 70953b0..8196a51 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -42,27 +42,24 @@
CameraAddr string `json:"cameraAddr"`
CameraName string `json:"cameraName"`
PicDate string `json:"picDate"`
- PicMaxUrl string `json:"picMaxUrl"`
+ 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"`
- ShowLable string `json:"showLable"`
- OtherLable string `json:"otherLable"`
- FaceFeature string `json:"faceFeature"`
- PicSmUrl []string `json:"picSmUrl"`
+ ShowLabels string `json:"showLabels"`
+ OtherLabels string `json:"otherLabels"`
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"`
+ IsAlarm bool `json:"isAlarm"`
+ IsAckAlarm bool `json:"isAckAlarm"`
+ IsCollect bool `json:"isCollect"`
+ IsDelete bool `json:"isDelete"`
BaseInfo []*structure.BaseInfo `json:"baseInfo"`
TargetInfo []Target `json:"targetInfo"`
LinkTag string `json:"linkTag"`
@@ -75,26 +72,24 @@
CameraAddr string `json:"cameraAddr"`
CameraName string `json:"cameraName"`
PicDate string `json:"picDate"`
- PicMaxUrl string `json:"picMaxUrl"`
+ 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"`
- Lable string `json:"lable"`
- FaceFeature string `json:"faceFeature"`
- PicSmUrl []string `json:"picSmUrl"`
+ ShowLabels string `json:"showLabels"`
+ OtherLabels string `json:"otherLabels"`
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"`
+ IsAlarm bool `json:"isAlarm"`
+ IsAckAlarm bool `json:"isAckAlarm"`
+ IsCollect bool `json:"isCollect"`
+ IsDelete bool `json:"isDelete"`
BaseInfo []*structure.BaseInfo `json:"baseInfo"`
TargetInfo []Target `json:"targetInfo"`
}
@@ -102,6 +97,9 @@
type Target struct {
TargetId string `json:"targetId"`
TargetScore float64 `json:"targetScore"`
+ TargetType string `json:"targetType"`
+ Feature string `json:"feature"`
+ PicSmUrl string `json:"picSmUrl"`
TargetLocation Points `json:"targetLocation"`
}
@@ -113,33 +111,6 @@
type Point struct {
X float64 `json:"x"`
Y float64 `json:"y"`
-}
-
-// yolo琛屼负鐨勬暟鎹粨鏋�
-type Personaction struct {
- Id string `json:"id"`
- CameraId string `json:"cameraId"`
- CameraName string `json:"cameraName"`
- CameraAddr string `json:"cameraAddr"`
- TaskId string `json:"taskId"`
- TaskName string `json:"taskName"`
- SdkName string `json:"sdkName"`
- Content string `json:"content"`
- AlarmRules []AlarmRule `json:"alarmRules"`
- AnalyServerId string `json:"analyServerId"`
- AnalyServerName string `json:"analyServerName"`
- AnalyServerIp string `json:"analyServerIp"`
- ClusterId string `json:"clusterId"`
- PicSmUrl []string `json:"picSmUrl"`
- PicDate string `json:"picDate"`
- VideoUrl string `json:"videoUrl"`
- IsAlarm int `json:"isAlarm"`
- IsAckAlarm int `json:"isAckAlarm"`
- IsCollect int `json:"isCollect"`
- IsDelete int `json:"isDelete"`
- TargetInfo []Target `json:"targetInfo"`
- LinkTag string `json:"linkTag"`
- LinkTagInfo []*LinkInfo `json:"linkTagInfo"`
}
type AlarmRule struct {
@@ -157,18 +128,17 @@
}
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("閰嶇疆鏂囦欢涓嶅悎娉�")
}
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
+ videoPersonUrl = "http://" + localConfig1.AlarmIp + ":" + strconv.Itoa(int(localConfig1.AlarmPort)) + "/" + EsInfo.EsIndex.AIOcean.IndexName + "/" + EsInfo.EsIndex.AIOcean.IndexType
InsertFace(msg)
InsertYolo(msg)
InsertTarget(msg)
@@ -178,13 +148,13 @@
func InsertFace(msg structure.ResultMsg) {
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" {
+ 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 imgMaxUrl []string = []string{}
var picTime string = ""
for _, face := range faces {
// 涓婁紶澶у浘
@@ -207,21 +177,34 @@
logger.Error("涓婁紶灏忓浘鍑洪敊")
}
// 涓婁紶澶у浘
- if imgMaxUrl == "" {
+ if len(imgMaxUrl) == 0 {
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)
+ imgMaxUrl = append(imgMaxUrl, bigPhotoUrl["fileUrl"].(string))
picTime = i.Timestamp
}
- lable,lableAttach := Feature2Jsonstr(*face)
+ lable, lableAttach := Feature2Jsonstr(*face)
var target = new(Target)
target.TargetId = face.Id
target.TargetScore = face.Score
+ target.TargetType = face.Type
+ logger.Info("浜鸿劯鐨勭壒寰佸�兼槸锛�",face.Feature)
+ target.Feature = base64.StdEncoding.EncodeToString(face.Feature)
+ logger.Info("base64鐗堟湰锛�",target.Feature)
+ target.PicSmUrl = resp["fileUrl"].(string)
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)
+
+ sdkname := ""
+ switch key {
+ case "face":
+ sdkname = "浜鸿劯"
+ case "plate":
+ sdkname = "杞︾墝璇嗗埆"
+ }
+ logger.Info("浜鸿劯鐩爣target:",targetInfos)
pervideo := PerVideoPicture{
face.Uuid,
msg.Cid,
@@ -231,24 +214,21 @@
imgMaxUrl,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
- "浜鸿劯",
- time.Now().Format("2006-01-02 15:04:05"),
+ sdkname,
+ "",
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,
+ true,
+ false,
+ false,
+ false,
face.Liker,
targetInfos,
"",
@@ -264,7 +244,7 @@
if err1 != nil {
logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
} else {
- logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭�(浜鸿劯)锛�", resp1)
+ logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", sdkname, "---", 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})
}
@@ -298,7 +278,7 @@
for _, liker := range arg.Liker {
flag1 := true
for _, liker1 := range face.Liker {
- if liker.PersonId == liker1.PersonId {
+ if liker.TargetId == liker1.TargetId {
flag1 = false
}
}
@@ -405,7 +385,7 @@
if len(linkTagInfos) > 0 {
linkTag = "鑱斿姩浠诲姟"
}
- isAlarm := 0
+ isAlarm := false
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
@@ -415,7 +395,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
if len(alarmRules) > 0 {
- isAlarm = 1
+ isAlarm = true
//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 {
@@ -425,34 +405,38 @@
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
}
} else {
- isAlarm = 0
+ isAlarm = false
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
}
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
//esDataId := uuid.NewV4().String()
- peraction := Personaction{
+ peraction := PerVideoPicture{
msg.Push.PushId,
msg.Cid,
- msg.Push.Cam.Name,
msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
+ time.Now().Format("2006-01-02 15:04:05"),
+ url,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
time.Now().Format("2006-01-02 15:04:05"),
alarmRules,
+ i.Timestamp,
+ "",
+ "",
+ "",
msg.Push.ServerId,
msg.Push.ServerName,
msg.Push.LocalIp,
"",
- url,
- i.Timestamp,
- "",
isAlarm,
- 0,
- 0,
- 0,
+ false,
+ false,
+ false,
+ nil,
targetInfos,
linkTag,
linkTagInfos,
@@ -466,7 +450,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", personAction, requstbody)
+ resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
@@ -506,13 +490,7 @@
}
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))
@@ -546,7 +524,7 @@
if len(linkTagInfos) > 0 {
linkTag = "鑱斿姩浠诲姟"
}
- isAlarm := 0
+ isAlarm := false
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鏈抚鏁版嵁鍥剧墖
bdata1, err := util.UnCompress(msg.Data)
@@ -556,7 +534,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata1, &i)
if len(alarmRules) > 0 {
- isAlarm = 1
+ isAlarm = true
//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 {
@@ -566,9 +544,28 @@
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
}
} else {
- isAlarm = 0
+ isAlarm = false
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return
+ }
+ // 鏁村悎鐩爣
+ var targetInfos []Target
+ for _, target := range yoloResult.AlarmObj {
+ // 鍘婚噸娣诲姞
+ var flag = true
+ for _, selectTarget := range targetInfos {
+ if target.Id == selectTarget.TargetId {
+ flag = false
+ break
+ }
+ }
+ if flag {
+ var target1 = new(Target)
+ 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)
+ }
}
if resp["fileUrl"] != nil {
url = append(url, resp["fileUrl"].(string))
@@ -576,28 +573,32 @@
return
}
//esDataId := uuid.NewV4().String()
- peraction := Personaction{
+ peraction := PerVideoPicture{
msg.Push.PushId,
msg.Cid,
- msg.Push.Cam.Name,
msg.Push.Cam.Addr,
+ msg.Push.Cam.Name,
+ i.Timestamp,
+ url,
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
sdkNames,
- time.Now().Format("2006-01-02 15:04:05"),
+ "",
alarmRules,
+ time.Now().Format("2006-01-02 15:04:05"),
+ "",
+ "",
+ "",
msg.Push.ServerId,
msg.Push.ServerName,
msg.Push.LocalIp,
"",
- url,
- i.Timestamp,
- "",
isAlarm,
- 0,
- 0,
- 0,
+ false,
+ false,
+ false,
nil,
+ targetInfos,
linkTag,
linkTagInfos,
}
@@ -610,7 +611,7 @@
logger.Info("json parse error ", err)
return
}
- resp1, err2 := EsReq("POST", personAction, requstbody)
+ resp1, err2 := EsReq("POST", videoPersonUrl, requstbody)
if err2 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} else {
@@ -735,30 +736,31 @@
return race
}
-func Feature2Jsonstr(obj ObjAndRules) (string,string) {
+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 "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))
+ case "plate":
+ // 杞︾墝杩愬姩鏂瑰悜锛�0 unknown, 1 left, 2 right, 3 up, 4 down
+ logger.Info("杞﹁締杞︾墝淇℃伅锛�", obj.Car.NColor, obj.Car.NCarColor, obj.Car.NCarLogo, obj.Car.NCarType, obj.Car.NDirection)
+ 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("nCarType"+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
+ return lable, lableAttach
}
func msg2PersonVideo(msg structure.ResultMsg) *LinkInfo {
@@ -832,7 +834,7 @@
}
}
}
- isAlarm := 0
+ isAlarm := false
resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
@@ -842,7 +844,7 @@
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
if len(alarmRules) > 0 {
- isAlarm = 1
+ isAlarm = true
//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 {
@@ -852,7 +854,7 @@
logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
}
} else {
- isAlarm = 0
+ isAlarm = false
// 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
return nil
}
@@ -865,7 +867,7 @@
msg.Push.Cam.Addr,
msg.Push.Cam.Name,
i.Timestamp,
- "",
+ []string{resp["fileUrl"].(string)},
msg.Tasklab.Taskid,
msg.Tasklab.Taskname,
"浜鸿劯",
@@ -874,17 +876,15 @@
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
"",
"",
- []string{resp["fileUrl"].(string)},
"",
msg.Push.ServerId,
msg.Push.ServerName,
msg.Push.LocalIp,
"",
- 0,
isAlarm,
- 0,
- 0,
- 0,
+ false,
+ false,
+ false,
nil,
targetInfos,
}
--
Gitblit v1.8.0