From ee960033e881a16f0243a349036b7fdac8975228 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 29 七月 2019 15:05:30 +0800
Subject: [PATCH] 人脸多区域坐标去重
---
insertdata/insertDataToEs.go | 279 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 165 insertions(+), 114 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 9a9bec8..ffb81ab 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鎻掓暟鎹�
@@ -124,94 +127,104 @@
InsertYolo(msg)
}
- if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
- //ChangeStatusFace(msg)
- ChangeStatusYolo(msg)
- }
+ //if timeLabel == "12" { // 骞堕潪鎶ヨ鏁版嵁锛屽彧鏄姸鎬佹敼鍙樼殑鏁版嵁
+ // //ChangeStatusFace(msg)
+ // ChangeStatusYolo(msg)
+ //}
}
// 寰�es涓彃鍏ヤ汉鑴告暟鎹�
func InsertFace(msg ruleserver.ResultMsg) {
- if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.Arg)) > 0 {
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
logger.Info("寰�ES鎻掍汉鑴告暟鎹�")
- for _, face := range msg.RuleResult["face"].([]ruleserver.Arg) {
- // 涓婁紶澶у浘
- // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
- 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("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
- }
- 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)
+ 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()
+ 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,
+ "",
+ face.Score,
+ 1,
+ 0,
+ 0,
+ 0,
+ face.Liker,
+ }
+ requstbody, err := json.Marshal(pervideo)
- pervideo := PerVideoPicture{
- uuid.NewV4().String(),
- msg.Cid,
- camera.Addr,
- i.Timestamp,
- strings.Split(bigPhotoUrl["fileUrl"].(string), "/")[1],
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- "浜鸿劯",
- "",
- time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
- sex,
- face.ThftRes.Age,
- ageDescription,
- race,
- face.ThftRes.Smile,
- face.ThftRes.Beauty,
- string(face.Feature),
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
- "鏆傛棤闆嗙兢",
- localConfig.ServerId,
- localConfig.ServerName,
- serverIp,
- "",
- face.Score,
- 1,
- 0,
- 0,
- 0,
- face.Liker,
- }
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
- }
- err1 := EsReq("POST", videoPersonUrl, requstbody)
- if err1 != nil {
- logger.Error("涓婁紶ES鍑洪敊锛�---", err1)
+ 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})
+ }
}
}
}
@@ -241,8 +254,9 @@
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
+ esDataId := uuid.NewV4().String()
pervideo := PerVideoPicture{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Addr,
i.Timestamp,
@@ -251,6 +265,7 @@
msg.Tasklab.Taskname,
"浜鸿劯",
"鐘舵�佽浆鎹㈡暟鎹紝闈炴姤璀︽暟鎹�",
+ []AlarmRule{},
time.Now().Format("2006-01-02 15:04:05"), // 鍙娴嬶紝娌℃湁姣斿鏃堕棿
"",
0,
@@ -278,9 +293,14 @@
logger.Info("json parse error ", err)
return
}
- err1 := EsReq("POST", videoPersonUrl, requstbody)
+ 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))
@@ -295,8 +315,8 @@
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})
+ alarm := ChangeToString(yoloResult.DefenceState, yoloResult.AlarmLevel)
+ alarmRules = append(alarmRules, AlarmRule{yoloResult.RuleGroupId, alarm, yoloResult.RuleText,yoloResult.DefenceState})
}
isAlarm := 0
resp := make(map[string]interface{})
@@ -333,8 +353,30 @@
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))
+ // 鎶婄紦瀛樼殑鏁版嵁涓婁紶鍚庡緱鍒板湴鍧�瀛樿繘鍘�
+ // 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
+ msg1 := msg.RuleResult["cacheData"].(ruleserver.ResultMsg)
+ bdata, err := util.UnCompress(msg1.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)
+ } else {
+ logger.Info("涓婁紶鐨勫浘鐗囦俊鎭細", resp1)
+ }
+ url = append(url, strings.Split(resp1["fileUrl"].(string), "/")[1])
+ }
+ esDataId := uuid.NewV4().String()
peraction := Personaction{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Name,
camera.Addr,
@@ -347,7 +389,7 @@
localConfig.ServerName,
serverIp,
"",
- []string{strings.Split(resp["fileUrl"].(string), "/")[1]},
+ url,
i.Timestamp,
"",
isAlarm,
@@ -362,15 +404,15 @@
return
}
- err = EsReq("POST", personAction, requstbody)
- if err != nil {
+ 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)
- }
- if msg.RuleResult["cacheData"] != nil {
- InsertYolo(msg.RuleResult["cacheData"].(ruleserver.ResultMsg))
}
}
}
@@ -403,8 +445,9 @@
logger.Error("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
serverIp, err := GetLocalIP()
+ esDataId := uuid.NewV4().String()
peraction := Personaction{
- uuid.NewV4().String(),
+ esDataId,
msg.Cid,
camera.Name,
camera.Addr,
@@ -432,10 +475,13 @@
return
}
- err = EsReq("POST", personAction, requstbody)
- if err != nil {
+ resp1, err1 := EsReq("POST", personAction, requstbody)
+ if err1 != nil {
logger.Error("寰�ES鎻掑叆鏁版嵁澶辫触", err)
} 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})
logger.Warn("__________________________________________寰�ES鎻掑叆yolo鏁版嵁鎴愬姛")
//os.Exit(1)
}
@@ -470,23 +516,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