From a3a788801fcd2efb16d58e91f393bad8d7730b96 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 26 六月 2019 18:35:19 +0800
Subject: [PATCH] 加上人脸，过完规则的标签区分人脸和yolo
---
go.sum | 6
insertdata/insertDataToEs.go | 144 ++++++++++++-----------
go.mod | 4
ruleserver/ruleToformula.go | 137 ++++++++++++++++------
main.go | 58 ++++-----
5 files changed, 208 insertions(+), 141 deletions(-)
diff --git a/go.mod b/go.mod
index fe6b53c..ced18cc 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@
require (
basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1
- basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502
+ basic.com/pubsub/protomsg.git v0.0.0-20190625090102-59334c91e550
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/ajg/form v1.5.1 // indirect
@@ -17,7 +17,7 @@
github.com/tmthrgd/go-sem v0.0.0-20160607101025-0214dbf53877 // indirect
github.com/tmthrgd/go-shm v0.0.0-20170117044846-90afcfcd5ee9 // indirect
github.com/tmthrgd/shm-go v0.0.0-20170130075737-7207ca97b290 // indirect
- gocv.io/x/gocv v0.20.0 // indirect
+ gocv.io/x/gocv v0.20.0
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed // indirect
nanomsg.org/go-mangos v1.4.0 // indirect
)
diff --git a/go.sum b/go.sum
index 6d2c0b9..2c99a62 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,7 @@
basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1 h1:MAAgMzO1rd9+gYYksrtOWIB4dqQZvZEjwaZImygpSgk=
basic.com/dbapi.git v0.0.0-20190622030047-3ea90a522ec1/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
-basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef h1:gUV9FEa23v+2AY4Rvrwh6omHBlV+qyae58GTU8NAv3Y=
-basic.com/pubsub/protomsg.git v0.0.0-20190622023307-97ef3bf336ef/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
-basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502 h1:H+//LYF4+YwVD2A9GUP0ETL8p5RANgtDHpOgu/421sE=
-basic.com/pubsub/protomsg.git v0.0.0-20190622044013-0d3ee5a9c502/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20190625090102-59334c91e550 h1:sCzugx8u2QCXTirZYM7Rkh/kLn8HYvJH3ly415l2meY=
+basic.com/pubsub/protomsg.git v0.0.0-20190625090102-59334c91e550/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051 h1:9flC2o3kasaM2Y6I+mY+mxmve/pyAY/UzGQZLT3lFHM=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
code.cloudfoundry.org/bytefmt v0.0.0-20180906201452-2aa6f33b730c/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 00fe813..5cc012e 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -93,76 +93,84 @@
// 寰�ES鎻掓暟鎹�
func InsertToEs(msg ruleserver.ResultMsg) {
log.Println("寰�ES鎻掓暟鎹�")
-
- for _, sdkinfo := range msg.Tasklab.Sdkinfos {
- if sdkinfo.Sdktype == "FaceDetect" {
- if len(sdkinfo.Sdkdata) > 1 {
-
- faceParam := protomsg.ParamFacePos{}
- err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err1 != nil {
- log.Println("瑙ｆ瀽FACE sdk鏈夎", err1)
- continue
- }
- for _, face := range faceParam.Faces {
- pervideo := PerVideoPicture{
- uuid.NewV4().String(),
- msg.Cid,
- msg.Caddr,
- time.Now().Format("2006-01-02 15:04:05"),
- "",
- msg.Tasklab.Taskid,
- msg.Tasklab.Taskname,
- sdkinfo.SdkName,
- "",
- "",
- face.Result.Gender,
- face.Result.Age,
- "",
- face.Result.Race,
- face.Result.Smile,
- face.Result.Beauty,
- "涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
- "---",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- 0,
- Base{
- "鏄瘡涓汉鑴哥畻娉曢兘鏈夊悧",
- "",
- 0,
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- },
- }
- requstbody, err := json.Marshal(pervideo)
-
- if err != nil {
- log.Println("json parse error ", err)
- return
-
- }
- err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
- if err != nil {
- log.Println("es can not execute right.")
- }
- }
- } else {
- continue
+ // 鐩存帴浠庤鍒欑殑鏍囩鏁版嵁閲屾嬁绗﹀悎瑙勫垯鐨勪汉鑴哥粨鏋�
+ for _, result := range msg.RuleResult {
+ if !result.IsYolo {
+ for _,face1 := range result.Faces{
+ println(face1)
}
}
+ }
+ for _, sdkinfo := range msg.Tasklab.Sdkinfos {
+ //if sdkinfo.Sdktype == "FaceDetect" {
+ // if len(sdkinfo.Sdkdata) > 1 {
+ //
+ // faceParam := protomsg.ParamFacePos{}
+ // err1 := proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ // if err1 != nil {
+ // log.Println("瑙ｆ瀽FACE sdk鏈夎", err1)
+ // continue
+ // }
+ // for _, face := range faceParam.Faces {
+ // pervideo := PerVideoPicture{
+ // uuid.NewV4().String(),
+ // msg.Cid,
+ // msg.Caddr,
+ // time.Now().Format("2006-01-02 15:04:05"),
+ // "",
+ // msg.Tasklab.Taskid,
+ // msg.Tasklab.Taskname,
+ // sdkinfo.SdkName,
+ // "",
+ // "",
+ // face.Result.Gender,
+ // face.Result.Age,
+ // "",
+ // face.Result.Race,
+ // face.Result.Smile,
+ // face.Result.Beauty,
+ // "涓嶆槸姣忎釜浜鸿劯绠楁硶閮芥湁",
+ // "---",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // 0,
+ // Base{ // 鍙湁浜鸿劯姣斿鏈夎繖涓俊鎭紝浜鸿劯妫�娴嬪苟娌℃湁
+ // "鏄瘡涓汉鑴哥畻娉曢兘鏈夊悧",
+ // "",
+ // 0,
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // "",
+ // },
+ // }
+ // requstbody, err := json.Marshal(pervideo)
+ //
+ // if err != nil {
+ // log.Println("json parse error ", err)
+ // return
+ //
+ // }
+ // err = EsReq("POST", "http://192.168.1.182:9200/videopersons/perVideoPicture", requstbody)
+ // if err != nil {
+ // log.Println("es can not execute right.")
+ // }
+ // }
+ //
+ // } else {
+ // continue
+ // }
+ //}
if sdkinfo.Sdktype == "Yolo" {
if len(sdkinfo.Sdkdata) > 1 {
diff --git a/main.go b/main.go
index e148dff..958e624 100644
--- a/main.go
+++ b/main.go
@@ -82,45 +82,44 @@
arg.KeepRight = false
arg.IsStatic = false
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
- if sdkinfo.Sdktype == "Yolo" {
- if len(sdkinfo.Sdkdata) > 1 {
- // 澶т簬1鎵嶆湁鏁版嵁
- fmt.Println("----------------------------------------------------",m.Caddr)
- yoloParam := protomsg.ParamYoloObj{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- //continue
- }
- for _, info := range yoloParam.Infos {
- if info.Typ == 0 {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100}
- arg.Photo = append(arg.Photo, photoMap)
- }
- }
- } else {
- continue
- }
-
- }
- //if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- // fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+ //if sdkinfo.Sdktype == "Yolo" {
// if len(sdkinfo.Sdkdata) > 1 {
+ // // 澶т簬1鎵嶆湁鏁版嵁
// fmt.Println("----------------------------------------------------",m.Caddr)
- // faceParam := protomsg.ParamFacePos{}
- // err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ // yoloParam := protomsg.ParamYoloObj{}
+ // err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
// if err != nil {
- // fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ // fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
// continue
// }
- // for _, info := range faceParam.Faces {
- // photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
- // arg.Photo = append(arg.Photo, photoMap)
+ // for _, info := range yoloParam.Infos {
+ // if info.Typ == 0 {
+ // photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
+ // arg.Photo = append(arg.Photo, photoMap)
+ // }
// }
// } else {
// continue
// }
+ //
//}
+ if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+ if len(sdkinfo.Sdkdata) > 1 {
+ fmt.Println("----------------------------------------------------",m.Caddr)
+ faceParam := protomsg.ParamFacePos{}
+ err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+ if err != nil {
+ fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ continue
+ }
+ for _, info := range faceParam.Faces {
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false}
+ arg.Photo = append(arg.Photo, photoMap)
+ }
+ } else {
+ continue
+ }
+ }
//if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
//}
@@ -132,7 +131,6 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) ruleserver.Rect {
rect := ruleserver.Rect{}
- fmt.Println("鐪嬩竴涓嬩紶鍏ョ殑鐭╁舰鏁版嵁锛�", rcobj.Left, rcobj.Top, rcobj.Right, rcobj.Bottom)
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
rect.Width = float64(rcobj.Right - rcobj.Left)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 17a066c..07aa2d1 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -57,10 +57,11 @@
// 姣忎釜鐩爣鐨勫弬鏁帮細鐩镐技搴︼紝鍗犳瘮锛屽昂瀵�
type Arg struct {
- id string
score float64 // 鍖哄煙鍐呯殑鐩爣鐨勭浉浼煎害
proportion float64 // 鍖哄煙鍐呯殑鐩爣鐨勫崰姣�
size float64 // 鍖哄煙鍐呯殑鐩爣鐨勫昂瀵�
+ isYolo bool // 鏄惁鏄痽olo鏁版嵁
+ location Rect // 璁颁笅姣忎釜鐩爣鐨勪綅缃弬鏁帮紝鏈�鍚庣粰缁撴灉瑁呴厤浜鸿劯鏁版嵁鐨勬椂鍊欑敤鐨勫埌
liker []LikePerson
}
@@ -80,7 +81,7 @@
triggerLine string
directionLine string
targetNum int // 鍖哄煙鍐呯洰鏍囨暟閲�
- args []Arg // 鍖哄煙鍐呯洰鏍囩殑鍙傛暟闆嗗悎
+ args []Arg // 鍖哄煙鍐呯洰鏍囬泦鍚�
filterData []Arg // 杩囨护鍚庡尯鍩熷唴鐩爣闆嗗悎
time string // 褰撳墠鏃堕棿锛堢敤浠ュ尮閰嶆椂闂磋鍒欙級
keepRight bool // 鏄惁闈犲彸琛�
@@ -89,8 +90,9 @@
// sdk杈撳嚭鐨勫浘鐗囦笂鍗曚釜鐩爣鐨勬暟鎹�
type PhotoMap struct {
- Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
- Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
+ Rects Rect // 鐭╁舰鍖哄煙鍙傛暟
+ Score float64 // 鐩镐技搴﹀緱鍒嗭紙鏈夊澶х▼搴﹀儚涓�涓洰鏍囥�備汉鑴革紝浜轰綋鎴栬溅绛夌瓑锛�
+ IsYolo bool // 鏄惁鏄痽olo鏁版嵁
Liker []LikePerson // 濡傛灉鏄汉鑴哥殑璇濆挨鍏舵槸姣斿锛屽簲瀛樹笅浠栬窡搴曞簱鐨勪汉鍛樼殑鐩镐技鎯呭喌 yolo鐨勮瘽缁檔il灏辫
}
@@ -117,9 +119,17 @@
// 杩囪鍒欏簱鎵撲笂鐨勬爣绛�
type Result struct {
TaskId string // 浠诲姟id
+ IsYolo bool // 鏄惁鏄痽olo瑙﹀彂鐨勮鍒�
RuleGroupId string // 瑙勫垯缁刬d
AlarmLevel int32 // 鎶ヨ绛夌骇
RuleText string // 鏂囧瓧鐗堣鍒欑粍
+ Faces []Face // 瑙﹀彂姝よ鍒欑粍鐨勪汉鑴革紙浜鸿劯绯诲垪瑙勫垯涓撶敤锛寉olo绯诲垪涓嶉渶瑕侊級
+}
+
+//
+type Face struct {
+ Location Rect // 浜鸿劯鍧愭爣妗�
+ liker []LikePerson // 鐩镐技浜哄憳锛堝鏋滄槸鍗曠函鐨勪汉鑴告娴嬪彲鏃犳椤癸級
}
// 鍖呭惈N鏉¤鍒欏厓绱犵殑涓�鏁存潯瑙勫垯
@@ -155,6 +165,7 @@
areaMap.CountAreaObjs(arg)
list.areaMapList = append(list.areaMapList, areaMap)
}
+
//fmt.Println("涓烘瘡涓憚鍍忔満鍖哄煙濉厖鏁版嵁鍚庣殑鍐呭", list.areaMapList)
// 灏嗘甯ф暟鎹寜鎽勫儚鏈哄尯鍩熷垎绫绘墦鍖呭悗鍒ゆ柇鏄惁鎶ヨ
judge(&list, arg)
@@ -178,17 +189,16 @@
// }
for _, obj := range arg.Photo {
- if threshold <= obj.Score &&
- size <= float64(obj.Rects.Width*obj.Rects.Height) &&
- intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
+ if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale){
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.targetNum++
- arg1 := Arg{score: obj.Score, proportion: PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), size: float64(obj.Rects.Width * obj.Rects.Height)}
- log.Println("鏀捐繘鍘荤殑arg锛�-------",arg1)
+ arg1 := Arg{ obj.Score,PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo,obj.Rects, obj.Liker}
+ log.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, arg1)
a.filterData = append(a.filterData, arg1)
}
}
+
a.time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.keepRight = arg.KeepRight
a.isStatic = arg.IsStatic
@@ -309,6 +319,7 @@
// 鐙珛浠诲姟
func singleTask(aml *AreaMapList, arg *ArgsFromSdk, groupRule *protomsg.GroupRule, taskId string) bool {
var completeFormula string = ""
+ var okSdks string = "" // 璁板綍涓嬭Е鍙戣鍒欑殑鏄痽olo杩樻槸face
for _, areaMap := range aml.areaMapList {
//fmt.Println("褰撳墠瑙勫垯缁勪负---------锛�",groupRule)
for j := 0; j < len(groupRule.Rules); j++ {
@@ -317,7 +328,10 @@
}
for j := 0; j < len(groupRule.Rules); j++ {
// 鍐嶈繃鍏朵粬鏁版嵁 杩欐鐩存帴寰楀埌缁撴灉锛堢湡鎴栧亣锛� 杩囩洰鏍囨暟閲�
- flag := transferParameters(groupRule.Rules[j], &areaMap)
+ flag,sdk := transferParameters(groupRule.Rules[j], &areaMap)
+ if flag == "true" {
+ okSdks = okSdks + "," + sdk
+ }
if flag != "" {
fmt.Println("寰楀嚭鐨勭粨鏋�", flag)
completeFormula = completeFormula + groupRule.Rules[j].RuleWithPre + "" + flag
@@ -329,6 +343,7 @@
fmt.Println("寮鸿鎷煎噾涓�涓汉鏁版槸鍚﹀ぇ浜�0鐨勭粨鏋�", flag)
completeFormula = flag
}
+ okSdks = okSdks + "," + "yolo"
}
for j := 0; j < len(groupRule.Rules); j++ {
// 杩欐杩囩殑鏄椂闂磋鍒欙紙鏃堕棿娈电瓑锛�
@@ -359,7 +374,7 @@
}
return false
} else {
- // 鍘荤湅瀹氭椂鍣ㄦ鏃舵槸鍚﹁蛋鍒�0锛岃蛋鍒�0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
+ // 鍘荤湅姹犲瓙閲屾槸鍚︽湁涓庢湰甯ф暟鎹湁鍏崇殑瀹氭椂鍣紝濡傛灉鏈夛紝鐪嬫鏃舵槸鍚﹁蛋鍒�0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
var flag bool = true
for k, timeEle := range TimeEleList {
if strings.Index(k, taskId) != -1 {
@@ -369,9 +384,24 @@
}
}
if flag {
- fmt.Println("瀹氭椂鍣ㄦ姤璀︿簡")
- // 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡
- arg.RuleResult = append(arg.RuleResult, Result{taskId, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText})
+ fmt.Println("鏈抚鏁版嵁绗﹀悎瑙勫垯")
+ // 鍙栧嚭鎵�鏈夊尯鍩熷唴缁忚繃杩囨护鍚庤繕鍓╀笅鐨勪汉鑴革紝鏀捐繘缁撴灉涓�
+ faces := []Face{}
+ for _, areaMap := range aml.areaMapList {
+ if len(areaMap.filterData) > 0 {
+ for _, arg := range areaMap.filterData {
+ faces = append(faces,Face{arg.location,arg.liker})
+ }
+ }
+ }
+ // 濡傛灉瀵箉olo鍜屼汉鑴搁兘鎶ヨ锛岄偅灏辨墦涓ら亶鏍囩
+ if strings.Contains(okSdks,"yolo") {
+ // 杩囧畬瑙勫垯鍚庢墦涓爣绛撅紝鍛婅瘔璋冪敤鑰呮湰甯ф暟鎹拡瀵瑰摢涓换鍔″摢缁勮鍒欐姤璀︿簡 鍚庡姞锛氬彲鑳借繕涓嶅锛岃繕闇�瑕佸尯鍒嗚Е鍙戞姤璀︾殑瀵硅薄锛屽悗闈㈠線es鏁版嵁搴撴彃鏁版嵁鏃惰鐢�
+ arg.RuleResult = append(arg.RuleResult, Result{taskId, true,groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, faces})
+ }
+ if strings.Contains(okSdks,"face") {
+ arg.RuleResult = append(arg.RuleResult, Result{taskId, false,groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, faces})
+ }
return true
} else {
return false
@@ -419,14 +449,12 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
- log.Println("鐪嬩竴涓嬪綋鍓嶅皬瑙勫垯锛�",*rule)
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
formula = strconv.FormatFloat(arg.score, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
} else if rule.SdkArgAlias == "proportion" {
formula = strconv.FormatFloat(arg.proportion, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
- fmt.Println("鍗犳瘮鐨勫瓧绗︿覆鍏紡锛�--------",formula)
} else {
formula = strconv.FormatFloat(arg.size, 'f', -1, 64) + " " + rule.Operator + " " + rule.SdkArgValue // 寰楀埌瀛楃涓插叕寮�
}
@@ -465,57 +493,92 @@
}
}
-// 鍐椾綑鎷兼帴
+// 鍐椾綑鎷兼帴涓�涓洰鏍囨暟閲忓ぇ浜�0
func splice1(am *AreaMap) string {
- args := am.targetNum
- log.Println("鐪嬬湅鍖哄煙鍐呯洰鏍囨暟閲忥細----------",args)
- formula := strconv.Itoa(args) + " " + ">" + "0"
+ var num int = 0
+ for _,data := range am.filterData{
+ if data.isYolo {
+ num++
+ }
+ }
+ log.Println("鐪嬬湅鍖哄煙鍐呯鍚堟潯浠剁殑鐩爣鏁伴噺锛�----------", num)
+ formula := strconv.Itoa(num) + " " + ">" + "0"
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
- result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
+ result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
return strconv.FormatBool(result.(bool))
}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
-func transferParameters(rule *protomsg.Rule, am *AreaMap) string {
+func transferParameters(rule *protomsg.Rule, am *AreaMap) (string,string) {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
- if rule.SdkArgAlias == "targetNum" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo
+ if rule.SdkArgAlias == "targetNum" { // 濡傛灉鍙傛暟鏄鍖哄煙鍐呯洰鏍囨暟閲� 鍗硑olo 浜鸿劯涓嶄細鏈夋暟閲�
//fmt.Println("寰楀嚭缁撴灉闃舵", "姣旇緝鐨勮鍒欐槸锛�", rule)
if rule.Operator == "" {
- return strconv.Itoa(am.targetNum) // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
+ return strconv.Itoa(am.targetNum),"" // 濡傛灉鍚庨潰涓嶈窡鎿嶄綔绗﹀氨鐩存帴杩斿洖鏁伴噺 姣斿瑕佽窡涓嬩竴涓尯鍩熸瘮杈冩暟閲忕殑灏辩洿鎺ヨ繑鍥炴湰鍖哄煙鐨勬暟閲�
}
- args := am.targetNum
- formula := strconv.Itoa(args) + " " + rule.Operator + " " + rule.SdkArgValue
+ //args := am.targetNum targetNum 宸叉垚鎵�鏈夌洰鏍囩殑鎬绘暟閲忥紝杩欓噷鍙畻yolo鐨�
+ var num int = 0
+ for _,data := range am.filterData{
+ if data.isYolo {
+ num++
+ }
+ }
+ formula := strconv.Itoa(num) + " " + rule.Operator + " " + rule.SdkArgValue
expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
- return strconv.FormatBool(result.(bool))
+ return strconv.FormatBool(result.(bool)),""
// 鍔犱笂鍏充簬绠楁硶鐨勫垽鏂潯浠讹紝涓嶈兘鍙湁鍏充簬瑙勫垯鐨勶紝鏈夌殑绠楁硶鏈韩灏辨槸涓�涓鍒欙紝濡備釜浣撻潤姝紝闈犲彸琛�,鎵�浠ワ紝鎷垮埌褰撳墠瀛愯鍒欑殑sdkid鏉ュ垽鏂槸鍚︽槸閭ｄ簺鐗规畩鐨勮鍒�
} else if rule.SdkId == "IsStatic" { // 闈欐绠楁硶
if am.isStatic {
- return "true"
+ return "true","static"
} else {
- return "false"
+ return "false","static"
}
} else if rule.SdkId == "KeepRight" { // 闈犲彸琛岀畻娉�
if am.keepRight {
- return "true"
+ return "true","keepRight"
} else {
- return "false"
+ return "false","keepRight"
}
} else if rule.SdkId == "FaceDetect" { // 浜鸿劯妫�娴�
if rule.Operator == "==" || rule.Operator == ">=" || rule.Operator == "<=" || rule.Operator == "<" || rule.Operator == ">" || rule.Operator == "!=" {
// 濡傛灉鏄笉瑙勭煩鐨勮繛鎺ョ缁熺粺杩斿洖false 瑙勫垯涔熷彧鑳藉垽鏂汉鑴哥殑鐩镐技搴︼紝鎵�浠ヤ笉瀛樺湪鍒殑杩炴帴绗�
- return "false"
+ return "false","face"
} else {
- return "false"
+ return "false","face"
}
- } else if rule.SdkId == "FaceCompare"{
- // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
-
+ } else if rule.SdkId == "FaceCompare" {
+ // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾瑕佽�冭檻濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
+ argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
+ if err != nil {
+ log.Println("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
+ return "false","face"
+ }
+ flag := "false"
+ for _, obj := range am.filterData {
+ if !obj.isYolo { // 浜鸿劯鏁版嵁鎵嶈繃婊ょ浉浼艰��
+ for index := 0; index < len(obj.liker); {
+ // 灏嗚揪涓嶅埌闃堝�肩殑鐩镐技鑰呬粠鐩镐技鑰呮暟缁勪腑鍒犻櫎
+ if obj.liker[index].Score < argValue {
+ // Go 璇█涓垏鐗囧垹闄ゅ厓绱犵殑鏈川鏄細浠ヨ鍒犻櫎鍏冪礌涓哄垎鐣岀偣锛屽皢鍓嶅悗涓や釜閮ㄥ垎鐨勫唴瀛橀噸鏂拌繛鎺ヨ捣鏉ャ�備笉鐢ㄦ��鐤戯紝鏁扮粍鍒犻櫎鍏冪礌灏辫繖涔堝潙鐖�
+ obj.liker = append(obj.liker[:index], obj.liker[index+1:]...)
+ } else {
+ index++
+ }
+ }
+ }
+ }
+ for _,obj2 := range am.filterData {
+ if !obj2.isYolo && len(obj2.liker) > 0 {
+ flag = "true"
+ }
+ }
+ return flag,"face"
}
}
- return ""
+ return "",""
}
func timeRuleResult(rule *protomsg.Rule, am *AreaMap) string {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓�
--
Gitblit v1.8.0