From b96e8aadb0f3c216031dc8f6f5f2dad0786b390a Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 31 七月 2019 14:10:27 +0800
Subject: [PATCH] 联动任务缓存数据(结构重整)
---
insertdata/insertDataToEs.go | 292 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 171 insertions(+), 121 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 23557b6..7a10bf3 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -1,6 +1,7 @@
package insertdata
import (
+ "encoding/base64"
"encoding/json"
"errors"
"fmt"
@@ -55,6 +56,7 @@
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"`
@@ -102,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鎻掓暟鎹�
@@ -117,17 +120,19 @@
logger.Debug("鎻掑叆鏁版嵁鍓嶇湅鐪嬫姤璀︽爣蹇椾綅锛�", timeLabel)
if timeLabel == "01" { // 鏃犲畾鏃跺櫒鐘舵�佽鎻掑叆鐨勬姤璀︽暟鎹�
InsertFace(msg)
- InsertYolo(msg)
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(msg)
+ }
}
if timeLabel == "10" { // 瀹氭椂鍣ㄧ姸鎬佽鎻掑叆鐨勯甯ф姤璀︽暟鎹�傝繛甯︾潃瀹氭椂鍣ㄥ紑鍚椂鐨勯偅甯�
InsertFace(msg)
InsertYolo(msg)
-
}
- if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
- //ChangeStatusFace(msg)
- ChangeStatusYolo(msg)
- }
+ //if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
+ // //ChangeStatusFace(msg)
+ // ChangeStatusYolo(msg)
+ //}
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
@@ -142,6 +147,9 @@
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
+ alarmRules := []AlarmRule{}
+ 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{})
@@ -172,9 +180,9 @@
}
race := getRaceString(face.ThftRes.Race)
ageDescription := getDescription(face.ThftRes.Age)
-
+ esDataId := uuid.NewV4().String()
pervideo := PerVideoPicture{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Addr,
i.Timestamp,
@@ -183,6 +191,7 @@
msg.Tasklab.Taskname,
"浜鸿劯",
"",
+ alarmRules,
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
sex,
face.ThftRes.Age,
@@ -190,7 +199,7 @@
race,
face.ThftRes.Smile,
face.ThftRes.Beauty,
- string(face.Feature),
+ base64.StdEncoding.EncodeToString(face.Feature),
[]string{strings.Split(resp["fileUrl"].(string), "/")[1]},
"鏆傛棤闆嗙兢",
localConfig.ServerId,
@@ -216,7 +225,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: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 1})
}
}
}
@@ -247,8 +256,9 @@
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
+ esDataId := uuid.NewV4().String()
pervideo := PerVideoPicture{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Addr,
i.Timestamp,
@@ -257,6 +267,7 @@
msg.Tasklab.Taskname,
"浜鸿劯",
"鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
+ []AlarmRule{},
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
"",
0,
@@ -291,7 +302,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: 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))
@@ -301,108 +312,141 @@
// 寰�es涓彃鍏olo鏁版嵁
func InsertYolo(msg ruleserver.ResultMsg) {
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
- logger.Info("寰�ES鎻抷olo鏁版嵁")
- var sdkNames string = ""
- alarmRules := []AlarmRule{}
- for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- sdkNames = sdkNames + yoloResult.SdkName
- alarm := ChangeToString(yoloResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText})
- }
- 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.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
- if err != nil {
- logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
- } else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+ // 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
+ flag := false
+ for _,res := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ if res.Others["timeLabel"].(string) == "01" || res.Others["timeLabel"].(string) == "10" {
+ flag = true
}
- } else {
- isAlarm = 0
- // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
- return
}
- // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
- // 鏌ヨ鏈満淇℃伅
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- serverIp, err := GetLocalIP()
- url := []string{}
- url = append(url,strings.Split(resp["fileUrl"].(string), "/")[1])
- if msg.RuleResult["cacheData"] != nil {
- InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+ if flag {
+ logger.Info("寰�ES鎻抷olo鏁版嵁")
+ var sdkNames string = ""
+ alarmRules := []AlarmRule{}
+ url := []string{}
+ for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" {
+ // 鎷煎嚭sdkname
+ sdkNames = sdkNames + yoloResult.SdkName
+ alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
+ // 涓婁紶缂撳瓨鏁版嵁鐨勫浘鐗囨嬁鍒皍rl
+ if yoloResult.Others["cacheData"] != nil {
+ //InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ msgs :=yoloResult.Others["cacheData"].([]ruleserver.ResultMsg)
+ 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.DrawPolygonOnImage(msg1.Cid, i, msg1.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ if err1 != nil {
+ logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ }
+ url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
+ }
+ }
+ }
+ }
+ linkFlag := false
+ for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
+ if yoloResult.Others["timeLabel"].(string) == "01" || yoloResult.Others["timeLabel"].(string) == "10" && yoloResult.Others["linkCache"] != nil{
+ for _,msg2 := range yoloResult.Others["linkCache"].([]*ruleserver.ResultMsg) {
+ logger.Warn("鎻掑叆鑱斿姩鏁版嵁")
+ InsertYolo(*msg2)
+ linkFlag = true
+ }
+ }
+ }
+ if linkFlag {
+ // 鑱斿姩鏁版嵁涓寘鍚湰甯ф暟鎹紝鎻掑叆鑱斿姩鏁版嵁鍚庡氨涓嶉渶瑕佹彃鍏ユ湰甯ф暟鎹簡
+ return
+ }
+ isAlarm := 0
+ resp := make(map[string]interface{})
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- msg1 := msg.RuleResult["cacheData"].(ruleserver.ResultMsg)
- bdata, err := util.UnCompress(msg1.Data)
+ bdata, err := util.UnCompress(msg.Data)
if err != nil {
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
- resp1, err1 := util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
- if err1 != nil {
- logger.Error("缂撳瓨鏁版嵁鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ if len(alarmRules) > 0 {
+ isAlarm = 1
+ //resp, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ resp, err = util.DrawPolygonOnImage(msg.Cid, i, msg.RuleResult["yolo"].([]ruleserver.Result), weedfsUrl)
+ if err != nil {
+ logger.Error("鐢绘鎴栦笂浼犲浘鐗囨湇鍔″櫒鍑洪敊", err)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp)
+ }
} else {
- logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ isAlarm = 0
+ // 涓嶆槸鎶ヨ鏁版嵁涓嶅瓨
+ return
}
- url = append(url,strings.Split(resp1["fileUrl"].(string), "/")[1])
- }
- peraction := Personaction{
- uuid.NewV4().String(),
- msg.Cid,
- camera.Name,
- camera.Addr,
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkNames,
- "",
- alarmRules,
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- url,
- i.Timestamp,
- "",
- isAlarm,
- 0,
- 0,
- 0,
- }
- requstbody, err := json.Marshal(peraction)
+ // logger.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
+ // 鏌ヨ鏈満淇℃伅
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+ serverIp, err := GetLocalIP()
- if err != nil {
- logger.Info("json parse error ", err)
- return
+ url = append(url, strings.Split(resp["fileUrl"].(string), "/")[1])
+ esDataId := uuid.NewV4().String()
+ peraction := Personaction{
+ esDataId,
+ msg.Cid,
+ camera.Name,
+ camera.Addr,
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ sdkNames,
+ "",
+ alarmRules,
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ url,
+ i.Timestamp,
+ "",
+ isAlarm,
+ 0,
+ 0,
+ 0,
+ }
+ requstbody, err := json.Marshal(peraction)
- }
- resp1, err2 := EsReq("POST", personAction, requstbody)
- if err2 != nil {
- logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
+ 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: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
+ logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
+ //os.Exit(1)
+ }
} 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{}})
- logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
- //os.Exit(1)
+ logger.Debug("timeLabel鏉′欢閮戒笉绗﹀悎锛�" )
}
}
}
@@ -435,8 +479,9 @@
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
+ esDataId := uuid.NewV4().String()
peraction := Personaction{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Name,
camera.Addr,
@@ -470,7 +515,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: esDataId, CameraId: msg.Cid, TaskId: msg.Tasklab.Taskid, ImgId: i.Id, SdkIds: []string{}, Type: 2})
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
@@ -505,23 +550,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