From 0a101dc2c24674d32d1a9901a4a65ab23c9f03bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 01 八月 2019 19:32:12 +0800
Subject: [PATCH] 归置人脸
---
insertdata/insertDataToEs.go | 318 ++++++++++++++++++++++++++++++++------------
ruleserver/ruleToformula.go | 55 ++++---
main.go | 2
ruleserver/personTrack.go | 10 +
ruleserver/readyDataForRule.go | 2
5 files changed, 270 insertions(+), 117 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 60c55ba..36acc51 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,26 @@
// //}
//}
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, "")
+ } 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 := PutFace(msg)
+ if faces != nil {
+ for _,face := range faces {
// 涓婁紶澶у浘
// 瑙ｅ帇缂╁苟涓婁紶鍥剧墖
bdata, err := util.UnCompress(msg.Data)
@@ -157,8 +170,10 @@
panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
}
alarmRules := []AlarmRule{}
- alarm := ChangeToString(faceResult.DefenceState, faceResult.AlarmLevel)
- alarmRules = append(alarmRules, AlarmRule{faceResult.RuleGroupId, alarm, faceResult.RuleText, faceResult.DefenceState})
+ 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 +260,37 @@
}
}
}
-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{},
+// 褰掔疆浜鸿劯
+func PutFace(msg ruleserver.ResultMsg) []FaceAndRules{
+ if msg.RuleResult["face"] != nil && len(msg.RuleResult["face"].([]ruleserver.FaceResult)) > 0 {
+ logger.Info("鏁寸悊浜鸿劯鏁版嵁")
+ faces := []FaceAndRules{}
+ for _, faceResult := range msg.RuleResult["face"].([]ruleserver.FaceResult) {
+ hebingFace(faces, faceResult)
+ }
+ return faces
}
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- logger.Info("json parse error ", err)
- return
+ return nil
+}
+func hebingFace(faces []FaceAndRules, faceResult ruleserver.FaceResult) {
+ for _, arg := range faceResult.Args {
+ // 鎷垮埌姣忎竴寮犱汉鑴�
+ flag := false
+ for _, face := range faces {
+ if arg.Id == face.Id {
+ flag = true
+ face.rules = append(face.rules,faceResult.Result)
+ }
+ }
+ if flag {
+ faces = append(faces, FaceAndRules{arg, []ruleserver.Result{faceResult.Result}})
+ }
}
- 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))
- //}
}
// 寰�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 +338,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 +512,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 +673,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
diff --git a/main.go b/main.go
index 8276e02..736c650 100644
--- a/main.go
+++ b/main.go
@@ -189,7 +189,7 @@
logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
//logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
+ photoMap := ruleserver.PhotoMap{Id:info.Pos.FaceID,Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata,&arg)
diff --git a/ruleserver/personTrack.go b/ruleserver/personTrack.go
index bd1ed57..0cb12da 100644
--- a/ruleserver/personTrack.go
+++ b/ruleserver/personTrack.go
@@ -103,6 +103,16 @@
logger.Debug("---------------------------------杩借釜缁撴潫--------------------------------------")
return false
}
+func TrackOrNot(label map[string]interface{}) bool{
+ if label["yolo"] != nil && len(label["yolo"].([]Result)) > 0 {
+ for _,res := range label["yolo"].([]Result) {
+ if res.TimeLabel == "10" {
+ return true
+ }
+ }
+ }
+ return false
+}
// 杩囨护鎺夐偅浜涘凡鍦ㄧ紦瀛樹腑涓斿垎鍊兼洿浣庣殑浜鸿劯锛屾洿鏂扮紦瀛橈紙娌℃湁鐨勫姞涓婏紝鍒嗗�兼洿鏂颁负鏇撮珮鐨勶紝澶氱殑鍒犻櫎锛�
func FaceIsInPond(cameraId string, sdkinfor *protomsg.SdkmsgWithTask) string {
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 800898c..6432838 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -267,7 +267,7 @@
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.targetNum++
- arg1 := Arg{obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
+ arg1 := Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, &arg1)
a.filterData = append(a.filterData, &arg1)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index e8c0fbc..4192f37 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -14,6 +14,7 @@
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
type Arg struct {
+ Id uint64
Score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
Proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
Size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
@@ -45,6 +46,7 @@
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
type PhotoMap struct {
+ Id uint64
Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
IsYolo bool // 鏄惁鏄痽olo鏁版嵁
@@ -95,10 +97,11 @@
LinkCache []ResultMsg
TimeLabel string
}
+
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type FaceResult struct {
Result
- Args []Arg
+ Args []Arg
}
type LittleRuleResult struct {
SdkName string // 璁板綍涓嬫缁撴灉鏄摢涓猻dk鐨勭粨鏋�
@@ -135,7 +138,7 @@
if len(temp) > 0 {
if group.SetType != "linkTask" {
// 鐙珛浠诲姟鐨勫鐞�
- RunRule(args, group, taskId, message,label)
+ RunRule(args, group, taskId, message, label)
}
}
}
@@ -148,7 +151,7 @@
if len(temp) > 0 {
if group.SetType == "linkTask" {
// groupId涓惈鏈塴ink鍒欎负鑱斿姩浠诲姟
- LinkTask(args, group, taskId, message,label)
+ LinkTask(args, group, taskId, message, label)
}
}
}
@@ -156,7 +159,7 @@
}
}
-func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage,label Others) bool {
+func RunRule(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) bool {
defer func() {
if err := recover(); err != nil {
logger.Error("姣斿瑙勫垯鏈夎", err.(string))
@@ -277,7 +280,7 @@
if completeFormula != "" {
logger.Info("缁撴灉鍏紡-----------锛�", completeFormula)
expression, err := govaluate.NewEvaluableExpression(completeFormula)
- if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil{
+ if strings.HasPrefix(completeFormula, "&&") || strings.HasPrefix(completeFormula, "||") || err != nil {
panic("瑙勫垯鏈夎锛屽緱鍒扮殑鏁板鍏紡涓嶅彲瑙ｆ瀽")
}
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
@@ -315,7 +318,7 @@
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
for _, areaMap := range sdkData.AreaMapList {
- faces = append(faces, putFaceToResult(areaMap,faces)...)
+ faces = append(faces, putFaceToResult(areaMap, faces)...)
}
}
}
@@ -334,11 +337,11 @@
}
//logger.Debug("------locations鐨勫唴瀹癸細", locations)
if sdkNames != "" {
- args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId,label})
+ args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, locations, polygonId, label})
//logger.Info("-------------------yolo缁撴灉鏍囩闀垮害", len(args.RuleResult["yolo"].([]Result)))
}
if faceFlag {
- args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId,groupRule.DefenceState,groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId,label},faces})
+ args.RuleResult["face"] = append(args.RuleResult["face"].([]FaceResult), FaceResult{Result{taskId, sdkNames, groupRule.GroupId, groupRule.DefenceState, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}, polygonId, label}, faces})
//logger.Info("-------------------face缁撴灉鏍囩", len(args.RuleResult["face"].([]FaceResult)))
}
return true
@@ -357,12 +360,12 @@
}
}
-func putFaceToResult(am *AreaMap,faceList []Arg) []Arg {
+func putFaceToResult(am *AreaMap, faceList []Arg) []Arg {
faces := []Arg{}
if len(am.filterData) > 0 {
for _, data := range am.filterData {
flag := true
- for _,face := range faceList {
+ for _, face := range faceList {
if data.Location.X == face.Location.X && data.Location.Y == face.Location.Y && data.Location.Width == face.Location.Width && data.Location.Height == face.Location.Height {
flag = false
}
@@ -389,7 +392,7 @@
}
// 鑱斿姩浠诲姟鐨勫鐞�
-func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage,label Others) {
+func LinkTask(args *SdkDatas, groupRule *protomsg.GroupRule, taskId string, message *protomsg.SdkMessage, label Others) {
// new涓�涓畾鏃跺櫒锛屽鏋滀互姝roupId涓烘爣蹇楃殑瀹氭椂鍣ㄤ笉瀛樺湪鐨勮瘽
logger.Info("------------------------------------------褰撳墠鏄仈鍔ㄤ换鍔★紝瑙勫垯鏄細", groupRule.GroupText)
var flag bool = true
@@ -414,12 +417,12 @@
}
}
if flag1 {
- TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre,ResultMsg{}})
+ TimeEleList[groupRule.GroupId].RuleResults = append(TimeEleList[groupRule.GroupId].RuleResults, &RuleResult{groupRule.Rules[j].CameraId, groupRule.Rules[j].Sort, "", groupRule.Rules[j].RuleWithPre, ResultMsg{}})
}
}
}
// 寰�鏁扮粍閲岃祴鍊�
- isOk := RunRule(args, groupRule, taskId, message,label)
+ isOk := RunRule(args, groupRule, taskId, message, label)
if isOk {
logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负true")
// 鏍规嵁cameraId鍘绘洿鏂版垨鑰呮彃鍏ョ粨鏋�,鐒跺悗鍒ゆ柇鏄惁鏁扮粍鏄惁鍙互寰楀嚭鎶ヨ鐨勭粨璁�
@@ -428,21 +431,21 @@
if va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
tempMap := make(map[string]interface{})
- for k,result := range args.RuleResult {
+ for k, result := range args.RuleResult {
if k == "yolo" {
tempMap[k] = []Result{}
- for _,res := range result.([]Result) {
- tempMap[k] = append(tempMap[k].([]Result),res)
+ for _, res := range result.([]Result) {
+ tempMap[k] = append(tempMap[k].([]Result), res)
}
}
if k == "face" {
tempMap[k] = []FaceResult{}
- for _,res := range result.([]FaceResult) {
- tempMap[k] = append(tempMap[k].([]FaceResult),res)
+ for _, res := range result.([]FaceResult) {
+ tempMap[k] = append(tempMap[k].([]FaceResult), res)
}
}
}
- va.CacheData = ResultMsg{message,tempMap}
+ va.CacheData = ResultMsg{message, tempMap}
logger.Info("杩欎釜鎽勫儚鏈�--", args.CameraId, "--琚祴浜堜簡result", va.Result)
}
}
@@ -472,15 +475,15 @@
// 鎶婃暟缁勯噷缂撳瓨鐨勬暟鎹彇鍑烘潵涓�璧锋姤璀�
label.LinkCache = []ResultMsg{}
for _, ruleRes := range TimeEleList[groupRule.GroupId].RuleResults {
- label.LinkCache = append(label.LinkCache,ruleRes.CacheData)
+ label.LinkCache = append(label.LinkCache, ruleRes.CacheData)
}
- logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�",len(label.LinkCache))
- for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
+ logger.Debug("鑱斿姩浠诲姟缂撳瓨浜嗗嚑涓暟鎹�", len(label.LinkCache))
+ for i := 0; i < len(args.RuleResult["yolo"].([]Result)); i++ {
if args.RuleResult["yolo"].([]Result)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
args.RuleResult["yolo"].([]Result)[i].Others.LinkCache = label.LinkCache
}
}
- for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
+ for i := 0; i < len(args.RuleResult["face"].([]FaceResult)); i++ {
if args.RuleResult["face"].([]FaceResult)[i].RuleGroupId == groupRule.GroupId { // 鎶婅仈鍔ㄦ暟鎹拷鍔犱笂
args.RuleResult["face"].([]FaceResult)[i].Others.LinkCache = label.LinkCache
}
@@ -498,9 +501,9 @@
// va.Result = strconv.FormatBool(isOk)
// }
//}
- for k,_ := range TimeEleList {
+ for k, _ := range TimeEleList {
if k == groupRule.GroupId {
- delete(TimeEleList,k)
+ delete(TimeEleList, k)
logger.Debug("鍥犱负瀹氭椂鍣ㄧ殑涓�甯ф暟鎹粨鏋滀负false锛屽共鎺夊畾鏃跺櫒")
}
}
@@ -572,7 +575,7 @@
am.targetNum = len(am.filterData) // 鎶婄鍚堟潯浠剁殑鐩爣鏁伴噺鏇存柊鍒皌argetNum瀛楁
}
if am.targetNum > 0 {
- logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
+ logger.Info("锛侊紒锛侊紒锛侊紒锛侊紒锛佷汉鑴告娴嬫垚鍔�")
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "true", rule.Sort}
} else {
return LittleRuleResult{am.sdkName, rule.RuleWithPre + "" + "false", rule.Sort}
--
Gitblit v1.8.0