From c9b888e47d0697ad6707b858c933a12037265806 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期五, 26 七月 2019 10:07:34 +0800 Subject: [PATCH] func AddLxMessage add Type,type=1 when face ,type=2 when action --- insertdata/insertDataToEs.go | 47 ++++++++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 21 deletions(-) diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go index ee1e825..a46f063 100644 --- a/insertdata/insertDataToEs.go +++ b/insertdata/insertDataToEs.go @@ -144,7 +144,7 @@ panic("瑙e帇缂╁浘鐗囨椂鍑虹幇閿欒") } alarmRules := []AlarmRule{} - alarm := ChangeToString(faceResult.AlarmLevel) + alarm := ChangeToString(faceResult.DefenceState,faceResult.AlarmLevel) alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText}) i := protomsg.Image{} err = proto.Unmarshal(bdata, &i) @@ -221,7 +221,7 @@ } else { logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1) // 鍙戝嚭褰曞儚淇″彿 - ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}}) + ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:1}) } } } @@ -297,7 +297,7 @@ } else { logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1) // 鍙戝嚭褰曞儚淇″彿 - ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}}) + ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), 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)) @@ -312,7 +312,7 @@ alarmRules := []AlarmRule{} for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) { sdkNames = sdkNames + yoloResult.SdkName - alarm := ChangeToString(yoloResult.AlarmLevel) + alarm := ChangeToString(yoloResult.DefenceState,yoloResult.AlarmLevel) alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText}) } isAlarm := 0 @@ -406,7 +406,7 @@ } else { logger.Debug("鎻掑叆es杩斿洖鐨勬暟鎹俊鎭槸锛�", resp1) // 鍙戝嚭褰曞儚淇″彿 - ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}}) + ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:2 }) logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛") //os.Exit(1) } @@ -476,7 +476,7 @@ } else { logger.Info("鎻掑叆es杩斿洖鐨勪俊鎭細", resp1) // 鍙戝嚭褰曞儚淇″彿 - ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}}) + ruleserver.AddLxMessage(&protomsg.VideotapeInfo{EsDataId: resp1["_id"].(string), CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type:2 }) logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛") //os.Exit(1) } @@ -511,23 +511,28 @@ } // 鎶婃姤璀︾瓑绾ц浆鍖栨垚姹夊瓧 -func ChangeToString(i int32) string { +func ChangeToString(defenceState bool,i int32) string { alarm := "" - if i == 1 { - alarm = "涓�绾�" + if defenceState { + if i == 1 { + alarm = "涓�绾�" + } + if i == 2 { + alarm = "浜岀骇" + } + if i == 3 { + alarm = "涓夌骇" + } + if i == 4 { + alarm = "鍥涚骇" + } + if i == 5 { + alarm = "浜旂骇" + } + } else { + alarm = "鎾ら槻" } - if i == 2 { - alarm = "浜岀骇" - } - if i == 3 { - alarm = "涓夌骇" - } - if i == 4 { - alarm = "鍥涚骇" - } - if i == 5 { - alarm = "浜旂骇" - } + return alarm } -- Gitblit v1.8.0