From 29ec0580c1300d63ccb0f9fcf491515f4fa1fc23 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 27 七月 2019 11:21:56 +0800
Subject: [PATCH] 追踪
---
insertdata/insertDataToEs.go | 25 ++++----
ruleserver/personTrack.go | 136 ++++++++++++++++++++++----------------------
2 files changed, 81 insertions(+), 80 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 4e9491a..a4bddd7 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -104,9 +104,10 @@
}
type AlarmRule struct {
- GroupId string `json:"groupId"`
- AlarmLevel string `json:"alarmLevel"`
- RuleText string `json:"ruleText"`
+ GroupId string `json:"groupId"`
+ AlarmLevel string `json:"alarmLevel"`
+ RuleText string `json:"ruleText"`
+ DefenceState bool `json:"defenceState"`
}
// 寰�ES鎻掓暟鎹�
@@ -145,8 +146,8 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- alarm := ChangeToString(faceResult.DefenceState,faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText})
+ 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)
bigPhotoUrl := make(map[string]interface{})
@@ -222,7 +223,7 @@
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:1})
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
}
}
}
@@ -299,7 +300,7 @@
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:1 })
+ ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
}
//if msg.RuleResult["cacheData"] != nil {
// InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
@@ -314,8 +315,8 @@
alarmRules := []AlarmRule{}
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
sdkNames = sdkNames + yoloResult.SdkName
- alarm := ChangeToString(yoloResult.DefenceState,yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
+ alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
}
isAlarm := 0
resp := make(map[string]interface{})
@@ -409,7 +410,7 @@
} 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 })
+ 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)
}
@@ -480,7 +481,7 @@
} else {
logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1)
// 鍙戝嚭褰曞儚淇″彿
- ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:2 })
+ 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)
}
@@ -515,7 +516,7 @@
}
// 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧
-func ChangeToString(defenceState bool,i int32) string {
+func ChangeToString(defenceState bool, i int32) string {
alarm := ""
if defenceState {
if i == 1 {
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index 3d036f8..342b02a 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -9,86 +9,86 @@
var TrackPond = make(map[string]*PersonTrack)
type PersonTrack struct {
- Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
- Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Face int // 浜鸿劯鐨刬d鏁扮粍 鏀逛负鏁伴噺
+ Yolo int // yolo瀵硅薄鐨刬d鏁扮粍 鏀逛负鏁伴噺
}
// 妫�鏌ユ槸鍚﹀墠鍚庝袱娆＄殑鏁版嵁id鏄惁瀹屽叏鐩稿悓锛堜汉鑴稿拰yolo锛� 鏀逛负鐩存帴妫�鏌ユ暟閲忔槸鍚︿竴鑷�
func IsSame(msg *protomsg.SdkMessage) {
- logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細",msg.Cid)
- logger.Debug("---------------------缂撳瓨姹�--------------------------锛�",TrackPond)
+ logger.Debug("+++++++++++++++++++++杩借釜寮�濮�+++++++++++++++鎽勫儚鏈篿d涓猴細", msg.Cid)
+ logger.Debug("---------------------缂撳瓨姹�--------------------------锛�", TrackPond)
for _, sdkinfo := range msg.Tasklab.Sdkinfos { // 閬嶅巻鍚勭畻娉曠殑sdkData
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- if len(sdkinfo.Sdkdata) > 1 {
- faceParam := protomsg.ParamFacePos{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- if TrackPond[msg.Cid] != nil {
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces),"鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細",TrackPond[msg.Cid].Face)
- } else {
- logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細",len(faceParam.Faces),"杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
- }
- if faceParam.Faces != nil && TrackPond[msg.Cid] != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Face { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
- faceParam.Faces = (faceParam.Faces)[0:0]
- sdkinfo.Sdkdata,err = proto.Marshal(&faceParam)
- if err != nil {
- logger.Error("浜鸿劯搴忓垪鍖栭敊璇�",err)
- }
- logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟",len(faceParam.Faces))
- } else {
- if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�",len(faceParam.Faces))
- TrackPond[msg.Cid].Face = len(faceParam.Faces)
- } else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�",len(faceParam.Faces))
- TrackPond[msg.Cid] = &PersonTrack{Face:len(faceParam.Faces)}
- }
- }
- } else {
+ //if len(sdkinfo.Sdkdata) > 1 {
+ faceParam := protomsg.ParamFacePos{}
+ err := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽face sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Face)
+ } else {
+ logger.Info("================杩借釜涔嬪墠浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces), "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ }
+ if faceParam.Faces != nil && TrackPond[msg.Cid] != nil && len(faceParam.Faces) == TrackPond[msg.Cid].Face { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ faceParam.Faces = (faceParam.Faces)[0:0]
+ sdkinfo.Sdkdata, err = proto.Marshal(&faceParam)
+ if err != nil {
+ logger.Error("浜鸿劯搴忓垪鍖栭敊璇�", err)
+ }
+ logger.Info("===================杩借釜涓�斾汉鑴哥殑涓暟", len(faceParam.Faces))
+ } else {
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
+ TrackPond[msg.Cid].Face = len(faceParam.Faces)
+ } else {
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑浜鸿劯涓暟锛�", len(faceParam.Faces))
+ TrackPond[msg.Cid] = &PersonTrack{Face: len(faceParam.Faces)}
+ }
+ }
+ //} else {
+ // continue
+ //}
}
if sdkinfo.Sdktype == "Yolo" {
- if len(sdkinfo.Sdkdata) > 1 {
- yoloParam := protomsg.ParamYoloObj{}
- err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- var yoloNum int = 0
- for i := 0;i < len(yoloParam.Infos); i++ {
- if yoloParam.Infos[i].Typ == 0 {
- yoloNum++
- }
- }
- if TrackPond[msg.Cid] != nil {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",yoloNum,"鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細",TrackPond[msg.Cid].Yolo)
- } else {
- logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細",yoloNum,"杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
- }
- if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
- yoloParam.Infos = (yoloParam.Infos)[0:0]
- sdkinfo.Sdkdata,err = proto.Marshal(&yoloParam)
- if err != nil {
- logger.Error("yolo搴忓垪鍖栭敊璇�",err)
- }
- logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
- } else {
- if TrackPond[msg.Cid] != nil {
- logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�",yoloNum)
- TrackPond[msg.Cid].Yolo = yoloNum
- } else {
- logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�",yoloNum)
- TrackPond[msg.Cid] = &PersonTrack{Yolo:yoloNum}
- }
- }
- } else {
+ //if len(sdkinfo.Sdkdata) > 1 {
+ yoloParam := protomsg.ParamYoloObj{}
+ err := proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
+ if err != nil {
+ logger.Info("瑙ｆ瀽yolo鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ var yoloNum int = 0
+ for i := 0; i < len(yoloParam.Infos); i++ {
+ if yoloParam.Infos[i].Typ == 0 {
+ yoloNum++
+ }
+ }
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "鐜板湪缂撳瓨姹犱腑璁板綍鐨勪釜鏁帮細", TrackPond[msg.Cid].Yolo)
+ } else {
+ logger.Info("================杩借釜涔嬪墠yolo鐨勪釜鏁帮細", yoloNum, "杩樻病鏈夎繖涓憚鍍忔満鐨勭紦瀛�")
+ }
+ if yoloParam.Infos != nil && TrackPond[msg.Cid] != nil && yoloNum == TrackPond[msg.Cid].Yolo { // yolo鐨勫鏋滄暟閲忕浉鍚屽垯瑙嗕负涓嶅彉銆佹妸yolo鐨剆dkData娓呯┖
+ yoloParam.Infos = (yoloParam.Infos)[0:0]
+ sdkinfo.Sdkdata, err = proto.Marshal(&yoloParam)
+ if err != nil {
+ logger.Error("yolo搴忓垪鍖栭敊璇�", err)
+ }
+ logger.Info("璺熶箣鍓嶇浉鍚岋紝娓呯┖yolo鏁版嵁")
+ } else {
+ if TrackPond[msg.Cid] != nil {
+ logger.Info("鏇存柊褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ TrackPond[msg.Cid].Yolo = yoloNum
+ } else {
+ logger.Info("鏂板缓褰撳墠鎽勫儚鏈虹紦瀛樻睜涓殑yolo涓暟锛�", yoloNum)
+ TrackPond[msg.Cid] = &PersonTrack{Yolo: yoloNum}
+ }
+ }
+ //} else {
+ // continue
+ //}
}
}
logger.Debug("---------------------------------------杩借釜缁撴潫--------------------------------------")
--
Gitblit v1.8.0