From b72e2fb28b90b82842a17743146afb01c898a1a0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 06 八月 2019 19:37:53 +0800
Subject: [PATCH] ---
---
insertdata/insertDataToEs.go | 333 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 243 insertions(+), 90 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index f9c4bd4..2d39911 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -71,7 +71,7 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
- LinkId string `json:"linkId"`
+ LinkId string `json:"linkId"`
DetectScore float64 `json:"detectScore"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
@@ -97,7 +97,7 @@
ClusterId string `json:"clusterId"`
PicSmUrl []string `json:"picSmUrl"`
PicDate string `json:"picDate"`
- LinkId string `json:"linkId"`
+ LinkId string `json:"linkId"`
VideoUrl string `json:"videoUrl"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
@@ -110,6 +110,12 @@
AlarmLevel string `json:"alarmLevel"`
RuleText string `json:"ruleText"`
DefenceState bool `json:"defenceState"`
+}
+
+// 涓�涓猣ace瀵瑰涓鍒欑粍鐨勫綊缃汉鑴哥殑缁撴瀯浣�
+type FaceAndRules struct {
+ ruleserver.Arg
+ rules []ruleserver.Result
}
// 寰�ES鎻掓暟鎹�
@@ -137,19 +143,32 @@
// //}
//}
func InsertToEs(msg ruleserver.ResultMsg) {
- InsertFace(msg,"")
- //flag := ruleserver.BodyIsSame(msg.SdkMessage)
- //if !flag {
- InsertYolo(msg,"")
- //}
+ InsertFace(msg, "")
+ // 濡傛灉鏍囩涓惈鏈夋寔缁椂闂撮娆℃姤璀︾殑timeLabel鐨勮瘽鍒欎笉闇�瑕佽繃浜轰綋杩借釜锛屼笉鐒跺氨娌＄殑鎻掑叆浜�
+ fk := ruleserver.TrackOrNot(msg.RuleResult)
+ if fk {
+ InsertYolo(msg, "")
+ //if msg.Cid == "61de081a-7ed9-4970-8432-41d642c35456" {
+ // logger.Warn("鎹曟崏188鎽勫儚鏈虹殑鎸佺画鏃堕棿浠诲姟.....")
+ // os.Exit(1)
+ //}
+ } else {
+ flag := ruleserver.BodyIsSame(msg.SdkMessage)
+ if !flag {
+ InsertYolo(msg, "")
+ }
+ }
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
-func InsertFace(msg ruleserver.ResultMsg,linkId string) {
+func InsertFace(msg ruleserver.ResultMsg, linkId string) {
if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
- for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
- for _, face := range faceResult.Args {
+ faces := []*FaceAndRules{}
+ faces = PutFace(faces,msg)
+ //logger.Info("鏁寸悊鍚庣殑鏁版嵁锛�",faces)
+ if faces != nil {
+ for _,face := range faces {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
@@ -157,8 +176,12 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
+ logger.Warn("浜鸿劯id涓猴細",face.Id,"浜鸿劯鐨勮鍒欓暱搴︿负锛�",len(face.rules))
+ //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})
+ }
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
bigPhotoUrl := make(map[string]interface{})
@@ -245,87 +268,42 @@
}
}
}
-func ChangeStatusFace(msg ruleserver.ResultMsg) {
- logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- bdata, err := util.UnCompress(msg.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- bigPhotoUrl := make(map[string]interface{})
- bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
- logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
- // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
- localConfig, err := cache.GetServerInfo()
- if err != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- serverIp, err := GetLocalIP()
- // 鏌ヨcameraName
- camera, err := cache.GetCameraById(msg.Cid)
- if err != nil {
- logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- esDataId := uuid.NewV4().String()
- pervideo := PerVideoPicture{
- esDataId,
- msg.Cid,
- camera.Addr,
- i.Timestamp,
- strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- "浜鸿劯",
- "鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
- []AlarmRule{},
- time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- "",
- 0,
- "",
- "",
- 0,
- 0,
- "",
- []string{""},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- "",
- 0,
- 1,
- 0,
- 0,
- 0,
- []*ruleserver.BaseInfo{},
- }
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
- }
- resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
-
- if err1 != nil {
- logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+// 褰掔疆浜鸿劯
+func PutFace(faces []*FaceAndRules,msg ruleserver.ResultMsg)[]*FaceAndRules{
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+ for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+ faces = hebingFace(faces, faceResult)
+ }
+ return faces
} 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})
+ return nil
}
- //if msg.RuleResult["cacheData"] != nil {
- // InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
- //}
+}
+func hebingFace(faces []*FaceAndRules, faceResult ruleserver.FaceResult) []*FaceAndRules{
+ for _, arg := range faceResult.Args {
+ // 鎷垮埌姣忎竴寮犱汉鑴�
+ logger.Info("褰掔疆浜鸿劯鏃剁浉浼艰�呯殑鏁伴噺锛�",len(arg.Liker))
+ flag := false
+ for _, face := range faces {
+ for _,lik := range face.Liker {
+ logger.Warn("--------鍚堝苟浜鸿劯鏃剁浉浼艰�咃細",lik.PersonId,lik.TableName)
+ }
+ if arg.Id == face.Id {
+ flag = true
+ face.rules = append(face.rules,faceResult.Result)
+ face.Liker = append(face.Liker,arg.Liker...)
+ }
+ }
+ if !flag {
+ faces = append(faces, &FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
+ }
+ }
+ return faces
}
// 寰�es涓彃鍏olo鏁版嵁
-func InsertYolo(msg ruleserver.ResultMsg,linkId string) {
+func InsertYolo(msg ruleserver.ResultMsg, linkId string) {
if msg.RuleResult["yolo"] != nil && len(msg.RuleResult["yolo"].([]ruleserver.Result)) > 0 {
// 鍏堝垽鏂竴涓嬫暟鎹甫鐨勮鍒欐爣绛炬槸鍚︽湁鍙互鎻掑叆鐨�
flag := false
@@ -373,11 +351,11 @@
}
linkFlag := false
for _, yoloResult := range msg.RuleResult["yolo"].([]ruleserver.Result) {
- if (yoloResult.Others.TimeLabel == "01" || yoloResult.Others.TimeLabel == "10") && yoloResult.Others.LinkCache != nil && len(yoloResult.Others.LinkCache) > 1{
+ 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)
+ logger.Warn("鎻掑叆鑱斿姩鏁版嵁", "姝ゅ抚鏁版嵁鐨刬d涓�", msg2.Cid)
+ InsertYolo(msg2, linkId)
linkFlag = true
}
}
@@ -547,6 +525,84 @@
//os.Exit(1)
}
}
+func ChangeStatusFace(msg ruleserver.ResultMsg) {
+ logger.Info("寰�ES鎻掑叆浜鸿劯闈炴姤璀︿絾鏄姸鎬佽浆鎹㈡暟鎹�")
+ // 涓婁紶澶у浘
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ bdata, err := util.UnCompress(msg.Data)
+ if err != nil {
+ panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ }
+ i := protomsg.Image{}
+ err = proto.Unmarshal(bdata, &i)
+ bigPhotoUrl := make(map[string]interface{})
+ bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+ logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+ // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+ localConfig, err := cache.GetServerInfo()
+ if err != nil {
+ logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+ }
+ serverIp, err := GetLocalIP()
+ // 鏌ヨcameraName
+ camera, err := cache.GetCameraById(msg.Cid)
+ if err != nil {
+ logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+ }
+
+ esDataId := uuid.NewV4().String()
+ pervideo := PerVideoPicture{
+ esDataId,
+ msg.Cid,
+ camera.Addr,
+ i.Timestamp,
+ strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+ msg.Tasklab.Taskid,
+ msg.Tasklab.Taskname,
+ "浜鸿劯",
+ "鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
+ []AlarmRule{},
+ time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+ "",
+ 0,
+ "",
+ "",
+ 0,
+ 0,
+ "",
+ []string{""},
+ "鏆傛棤闆嗙兢",
+ localConfig.ServerId,
+ localConfig.ServerName,
+ serverIp,
+ "",
+ "",
+ 0,
+ 1,
+ 0,
+ 0,
+ 0,
+ []*ruleserver.BaseInfo{},
+ }
+ requstbody, err := json.Marshal(pervideo)
+
+ if err != nil {
+ logger.Info("json parse error ", err)
+ return
+ }
+ resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+
+ if err1 != nil {
+ logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ } 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})
+ }
+ //if msg.RuleResult["cacheData"] != nil {
+ // InsertFace(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
+ //}
+}
// 鑾峰彇鏈満ip
func GetLocalIP() (ipv4 string, err error) {
@@ -630,3 +686,100 @@
}
return race
}
+
+
+//for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+// for _, face := range faceResult.Args {
+// // 涓婁紶澶у浘
+// // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+// bdata, err := util.UnCompress(msg.Data)
+// 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{})
+// bigPhotoUrl, err = util.PostFormBufferData(weedfsUrl, i, uuid.NewV4().String())
+// logger.Debug("========澶у浘璺緞锛�", bigPhotoUrl)
+// // 浜鸿劯妫�娴嬶紝娌℃湁鐩镐技鐨勫簳搴撲汉鍛�
+// localConfig, err := cache.GetServerInfo()
+// if err != nil {
+// logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
+// }
+// serverIp, err := GetLocalIP()
+// // 鏌ヨcameraName
+// camera, err := cache.GetCameraById(msg.Cid)
+// if err != nil {
+// logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
+// }
+// bytes := util.SubImg(i, int(face.Location.X), int(face.Location.Y), int(face.Location.X+face.Location.Width), int(face.Location.Y+face.Location.Height))
+// resp, err := util.PostFormBufferData1(weedfsUrl, bytes, uuid.NewV4().String())
+// if err != nil {
+// logger.Error("涓婁紶灏忓浘鍑洪敊")
+// }
+// logger.Info("================灏忓浘鍦板潃:", resp["fileUrl"].(string))
+// sex := ""
+// if face.ThftRes.Gender == 1 {
+// sex = "鐢�"
+// } else {
+// sex = "濂�"
+// }
+// race := getRaceString(face.ThftRes.Race)
+// ageDescription := getDescription(face.ThftRes.Age)
+// esDataId := uuid.NewV4().String()
+// linksId := ""
+// if linkId != "" {
+// linksId = linkId
+// }
+// pervideo := PerVideoPicture{
+// esDataId,
+// msg.Cid,
+// camera.Addr,
+// i.Timestamp,
+// strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
+// msg.Tasklab.Taskid,
+// msg.Tasklab.Taskname,
+// "浜鸿劯",
+// "",
+// alarmRules,
+// time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
+// sex,
+// face.ThftRes.Age,
+// ageDescription,
+// race,
+// face.ThftRes.Smile,
+// face.ThftRes.Beauty,
+// base64.StdEncoding.EncodeToString(face.Feature),
+// []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+// "鏆傛棤闆嗙兢",
+// localConfig.ServerId,
+// localConfig.ServerName,
+// serverIp,
+// "",
+// linksId,
+// face.Score,
+// 1,
+// 0,
+// 0,
+// 0,
+// face.Liker,
+// }
+// requstbody, err := json.Marshal(pervideo)
+//
+// if err != nil {
+// logger.Info("json parse error ", err)
+// return
+// }
+// resp1, err1 := EsReq("POST", videoPersonUrl, requstbody)
+// if err1 != nil {
+// logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+// } 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})
+// }
+// }
+//}
\ No newline at end of file
--
Gitblit v1.8.0