From 8004e1fc14dd1217ce83044e0a16c7f1d7a64ccd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 10 七月 2019 16:13:49 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 142 +++++++++++++----------------------------------
1 files changed, 39 insertions(+), 103 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index c192ee5..02209d4 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -163,30 +163,17 @@
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
- //var api dbapi.CameraApi
- //data := api.FindAllPolygons()
- ////logger.Info("鏌ュ埌鐨勬墍鏈夊尯鍩燂細", data)
- //// 鏍规嵁id浠巑ap涓嬁鍒板尯鍩�
var cameraPolygons []protomsg.CameraPolygon
- //for _, item := range data {
- // if item.CameraId == cameraId && item.Type != "line" {
- // // 闇�瑕佹牴鎹瘮渚嬫妸鍓嶅彴鐢荤殑鍖哄煙鐨勫潗鏍囪浆鍖栦负鐩稿簲鎽勫儚鏈烘媿鎽勭殑鍥惧儚鐨勫ぇ灏� x鍧愭爣鍒嗗埆*image.width/椤甸潰鍖哄煙瀹� y鍧愭爣鍒嗗埆*image.height/椤甸潰鍖哄煙楂�
- // // 鍓嶅彴瀹介珮鍥哄畾
- // //logger.Println("------------绗﹀悎鏉′欢鐨勫尯鍩燂細",item)
- // cameraPolygons = append(cameraPolygons, item)
- // }
- //}
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
- //logger.Println("鏍规嵁鎽勫儚鏈篿d鏌ュ埌鐨勫尯鍩�", cameraPolygons, "--鍖哄煙鏁伴噺涓猴細", len(cameraPolygons))
return cameraPolygons
}
// 鎶妔dk浠庢暟鎹抚涓婃彁鍙栫殑鎸夌収鍖哄煙鍒嗙被褰掔疆
func SdkDataFormat(cameraId string, arg *SdkData, cameraPolygons []protomsg.CameraPolygon) {
logger.Info("==================================鏈瑂dkData涓В鍑烘潵鐨勭洰鏍囨暟鎹�=======================================")
- for _,photo := range arg.Photo{
- logger.Info("--------鐪嬬湅瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId,arg.IpcId,photo.Rects,photo.Score)
+ for _, photo := range arg.Photo {
+ logger.Info("--------鐪嬬湅瑙ｆ瀽鍑烘潵鐨勬暟鎹�---", cameraId, arg.IpcId, photo.Rects, photo.Score)
}
for _, polygon := range cameraPolygons {
//logger.Println("++++++鍦ㄨ繖鍎跨湅涓�涓嬪尯鍩熷晩:", polygon.Polygon)
@@ -197,7 +184,7 @@
}
}
-// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 鏄垗寮冿紙鎴栬�呰瀵逛簬鏌愪簺闇�姹傚彲浠ユ斁ES鏁版嵁搴撲竴浠斤級杩樻槸杩斿洖
+// 瀵瑰崟甯у浘鍍忕殑鍒ゆ柇 thisSdkDatas 褰撳墠浼犲叆鐨勮繖甯ф暟鎹紝cacheSdkData 瀹氭椂鍣ㄩ噷缂撳瓨鐨勪竴甯ф暟鎹� 娌℃湁灏辫繑鍥瀗il (thisSdkDatas SdkDatas, cacheSdkDatas SdkDatas)
func Judge(args *SdkDatas) {
if len(args.Sdkdata) > 0 {
// 鎷垮埌鏈憚鍍忔満鐨勫尯鍩�
@@ -257,10 +244,10 @@
return
}
for j := 0; j < len(groupRule.Rules); j++ {
- // 鍙湁鏄汉鑴稿姣斿苟涓旈厤缃殑鍙傛暟鏄姣斿簳搴撴墠璧帮紙鑻ラ厤鐨勫姣旈槇鍊煎垯涓嶈蛋锛�
- if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972"{
+ if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
for _, sdkData := range args.Sdkdata {
if sdkData.IpcId == "812b674b-2375-4589-919a-5c1c3278a97e" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
+ logger.Info("_____________________________________________绗竴鍏�")
for _, areaMap := range sdkData.AreaMapList {
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.areaId {
@@ -273,9 +260,10 @@
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
}
for key, val := range m {
- baseinfo,err1 := esutil.Dbpersoninfosbyid(key)
+ logger.Info("_______________________________________瀵规瘮搴撶殑杩斿洖鍊�",key,val)
+ baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊",err1)
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
baseinfo.CompareScore = val
arg.Liker = append(arg.Liker, &baseinfo)
@@ -293,7 +281,7 @@
for key, val := range m {
baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊",err1)
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
baseinfo.CompareScore = val
arg.Liker = append(arg.Liker, &baseinfo)
@@ -404,7 +392,7 @@
ipcId := sdk.IpcId
if ipcId == sdkData.IpcId {
for _, areaMap := range sdkData.AreaMapList {
- duration(groupRule.Rules[j], &areaMap)
+ duration(groupRule.Rules[j], &areaMap, args)
}
}
}
@@ -444,26 +432,26 @@
timeEle.N = timeEle.InitN // 閲嶇疆瀹氭椂鍣�
}
}
- logger.Info("-------------------閲嶇疆瀹氭椂鍣ㄥ苟杩斿洖false---------------")
+ logger.Info("-------------------閲嶇疆鍙兘瀛樺湪鐨勫畾鏃跺櫒骞惰繑鍥瀎alse---------------")
return false
} else {
// 鏈�鍚庢垚鍔熸姤璀︽墠鎶婄鍚堟潯浠剁殑浜鸿劯鏁版嵁濉炶繘缁撴灉鏍囩閲�
faces := []Arg{}
+ faceFlag := false
+ for j := 0; j < len(groupRule.Rules); j++ {
+ if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
+ faceFlag = true
+ }
+ }
for _, sdkData := range args.Sdkdata {
- for _, areaMap := range sdkData.AreaMapList {
- for j := 0; j < len(groupRule.Rules); j++ {
- faces = append(faces, putFaceToResult(groupRule.Rules[j], &areaMap)...)
+ if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" && faceFlag { // sdkData閲屾湁浜鸿劯鏁版嵁涓旈厤缃簡绠楁硶鎵嶆妸绗﹀悎鏉′欢鐨勬暟鎹杩涙爣绛鹃噷鍘�
+ for _, areaMap := range sdkData.AreaMapList {
+ faces = append(faces, putFaceToResult(&areaMap)...)
}
}
}
// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- flag11 := false
- for j := 0; j < len(groupRule.Rules); j++ {
- if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
- flag11 = true
- }
- }
- if flag11 {
+ if faceFlag {
args.RuleResult["face"] = faces
}
// 鍘荤湅姹犲瓙閲屾槸鍚︽湁涓庢湰甯ф暟鎹湁鍏崇殑瀹氭椂鍣紝濡傛灉鏈夛紝鐪嬫鏃舵槸鍚﹁蛋鍒�0锛屾病鏈夋瀹氭椂鍣ㄦ垨鏈夊畾鏃跺櫒璧板埌0鐨勮瘽杩斿洖鎴愬姛鎶ヨ
@@ -481,22 +469,12 @@
// 鎶婁粬浠殑浣嶇疆鏁版嵁涔熶紶涓嬪幓
locations := []Rect{}
for _, sdkData := range args.Sdkdata {
- for _, areaMap := range sdkData.AreaMapList {
- for j := 0; j < len(groupRule.Rules); j++ {
- locations = append(locations, putYolosToResult(groupRule.Rules[j], &areaMap)...)
+ if sdkData.IpcId == "02D54B61-0F16-C604-8567-FC4BE493C523" && sdkNames != "" { // 鎶妝olo鏁版嵁鐨勫悇涓洰鏍囩殑鍧愭爣杈撳嚭鏂逛究鍚庨潰鐢绘
+ for _, areaMap := range sdkData.AreaMapList {
+ locations = append(locations, putYolosToResult(&areaMap)...)
}
}
}
- //// 閰嶄簡浜鸿劯鐨勭畻娉曟墠鎶婁汉鑴哥殑鏁版嵁鐢╁嚭鏉ユ墦鏍囩
- //flag11 := false
- //for j := 0; j < len(groupRule.Rules); j++ {
- // if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a971" {
- // flag11 = true
- // }
- //}
- //if flag11 {
- // args.RuleResult["face"] = faces
- //}
if sdkNames != "" {
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, sdkNames, groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, locations})
logger.Info("-------------------yolo缁撴灉鏍囩", args.RuleResult["yolo"].([]Result))
@@ -514,26 +492,23 @@
}
}
-func putFaceToResult(rule *protomsg.Rule, am *AreaMap) []Arg {
+func putFaceToResult(am *AreaMap) []Arg {
faces := []Arg{}
- if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a97e" || rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
- if len(am.filterData) > 0 {
- for _, data := range am.filterData {
- faces = append(faces, data)
- }
+ if len(am.filterData) > 0 {
+ for _, data := range am.filterData {
+ faces = append(faces, data)
}
}
+
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
return faces
}
-func putYolosToResult(rule *protomsg.Rule, am *AreaMap) []Rect {
+func putYolosToResult(am *AreaMap) []Rect {
locations := []Rect{}
- if rule.SdkId != "812b674b-2375-4589-919a-5c1c3278a97e" && rule.SdkId != "812b674b-2375-4589-919a-5c1c3278a972" {
- if len(am.filterData) > 0 {
- for _, data := range am.filterData {
- locations = append(locations, data.Location)
- }
+ if len(am.filterData) > 0 {
+ for _, data := range am.filterData {
+ locations = append(locations, data.Location)
}
}
//logger.Println("-----------------------------------------------鍚浣犳槸绌虹殑锛�",faces)
@@ -551,12 +526,6 @@
areaPoints := Json2points(a.areaJson)
widthScale := float64(arg.ImageWidth / 960)
heigthScale := float64(arg.ImageHeight / 540)
- // for _, sdkInfo := range arg.SdkMessage.Tasklab.Sdkinfos {
- // if sdkInfo.Sdktype == "yolo" {
- // //sdkInfo.Sdkdata.
- // }
-
- // }
for _, obj := range arg.Photo {
//logger.Info("------------------鐪嬬湅sdkData:", arg.SdkName, "鐨凱hoto鏁版嵁----------------", obj, "----椤轰究鐪嬬湅鍗犳瘮-----锛�", 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) {
@@ -594,17 +563,6 @@
// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
func GetRuleGroup(cameraId string) []*protomsg.TaskGroupArgs {
- // 鏌ヨ鏁版嵁搴�
- // 绗竴姝ユ煡鍑鸿窡杩欎釜鎽勫儚鏈虹浉鍏崇殑group_id(澶ц鍒�)
- //var api dbapi.CameraTaskArgsApi
- //
- ////logger.Info("鎵�鏈夎鍒�:", all)
- //var taskArgs []*protomsg.TaskGroupArgs
- //for _, camArg := range all {
- // if camArg.CameraId == cameraId {
- // taskArgs = camArg.TaskArgs
- // }
- //}
all := cache.GetCameraTaskRulesByCameraId(cameraId)
return all
}
@@ -674,9 +632,9 @@
if result.(bool) {
logger.Info("___________________________________________________________________鑱斿姩浠诲姟鎶ヨ")
args.RuleResult["yolo"] = append(args.RuleResult["yolo"].([]Result), Result{taskId, "", groupRule.GroupId, groupRule.AlarmLevel, groupRule.GroupText, []Rect{}})
- logger.Info("-------------------yolo缁撴灉鏍囩", args.RuleResult["yolo"].([]Result))
+ logger.Info("-------------------yolo缁撴灉鏍囩鏈夊嚑涓�", len(args.RuleResult["yolo"].([]Result)))
if args.RuleResult["face"] != nil {
- logger.Info("-------------------face缁撴灉鏍囩", args.RuleResult["face"].([]Arg))
+ logger.Info("-------------------face缁撴灉鏍囩鏈夊嚑涓�", len(args.RuleResult["face"].([]Arg)))
}
//os.Exit(0)
}
@@ -688,7 +646,7 @@
logger.Info("杩欏抚鍥惧儚鍦ㄤ换鍔′笅鐨勪竴鏁存潯瑙勫垯涓嬶紙鑱斿姩浠诲姟涓嬪氨鏄窡鏈憚鍍忔満鍍忕浉鍏崇殑灏忚鍒欙級鐨勫垽鏂粨鏋滀负false")
// 鎵�浠ヤ篃瑕佸幓缁撴灉鏁扮粍閲屾斁鍊兼垨鏇存柊
for _, va := range timeEle.RuleResults {
- if args.CameraId != "" && va.CameraId == args.CameraId { // arg.CameraId 闅忎究鎵句竴涓暟鎹�
+ if args.CameraId != "" && va.CameraId == args.CameraId {
va.Result = strconv.FormatBool(isOk)
}
}
@@ -752,6 +710,7 @@
}
// 鍏堟竻绌鸿繃婊ゅ悗鐨勬暟鎹紝鍐嶅線閲屽鏈杩囨护鍚庣殑鏁版嵁
am.filterData = am.filterData[0:0]
+ //logger.Info("-----------------------浜鸿劯杩囨护鐨刟rgs锛�", args)
for _, arg := range args {
var formula string
if rule.SdkArgAlias == "score" {
@@ -836,7 +795,7 @@
}
// 閮借繃婊ゅ畬鏉′欢涔嬪悗鐪嬬湅鏄惁瑕佸垱寤轰竴涓畾鏃跺櫒鍏冪礌 鍒涘缓瀹氭椂鍣ㄧ殑鏉′欢锛氭槸鍚︽湁闈犲彸琛岋紝涓綋闈欐绛夎嚜甯﹀畾鏃跺櫒鍚箟鐨勭畻娉曚互鍙婃槸鍚︽湁鎸佺画鏃堕棿
-func duration(rule *protomsg.Rule, am *AreaMap) {
+func duration(rule *protomsg.Rule, am *AreaMap, args *SdkDatas) {
if rule.PolygonId == am.areaId { // 棣栧厛瑙勫垯鎵�瀵瑰簲鐨勫尯鍩焛d瑕佽窡鍖哄煙鏁版嵁鐨刬d瀵圭殑涓� 閰嶇疆鐨勭畻娉曡瀵圭殑涓�
if rule.SdkArgAlias == "duration" { //
// 鍏堢湅鐪嬪畾鏃跺櫒鍏冪礌闃熷垪涓槸鍚︽湁杩欎釜鎽勫儚鏈鸿繖涓尯鍩熺殑瀹氭椂鍣�,濡傛灉鏈夊氨涓嶈兘鍐嶆鍒涘缓浜�
@@ -850,7 +809,7 @@
if flag {
timeLength, _ := strconv.Atoi(rule.SdkArgValue)
- timeEle := TimeElement{N: timeLength, InitN: timeLength} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
+ timeEle := TimeElement{N: timeLength, InitN: timeLength, AlarmFlag: false, CacheSdkData: *args} // 鎵旇繘鍘讳竴涓畾鏃跺櫒鍏冪礌
//TimeEleList = make(map[string]timeElement)
TimeEleList[am.taskId+" "+am.sdkId+" "+am.areaId] = &timeEle // 瀹氭椂鍣ㄥ厓绱犱互鎽勫儚鏈篿d鎷兼帴鍖哄煙id涓洪敭
logger.Info("鍒涘缓浜嗚鏁板櫒骞朵笖璁℃暟鍣ㄩ泦鍚堜负锛�", TimeEleList)
@@ -858,21 +817,6 @@
}
}
}
-
-//// 鍐椾綑鎷兼帴涓�涓洰鏍囨暟閲忓ぇ浜�0
-//func splice1(am *AreaMap) string {
-// var num int = 0
-// for _, data := range am.filterData {
-// if data.isYolo {
-// num++
-// }
-// }
-// logger.Println("鐪嬬湅鍖哄煙鍐呯鍚堟潯浠剁殑鐩爣鏁伴噺锛�----------", num)
-// formula := strconv.Itoa(num) + " " + ">" + "0"
-// expression, _ := govaluate.NewEvaluableExpression(formula) // 寰楀埌鏁板鍏紡
-// result, _ := expression.Evaluate(nil) // 寰楀埌鏁板鍏紡鐨勭粨鏋�
-// return strconv.FormatBool(result.(bool))
-//}
// 缁欐暟鎹簱鐨勮鍒欒〃杈惧紡浠ｅ弬 args: 涓�鏉″瓙瑙勫垯锛屽尯鍩熸暟鎹�
func transferParameters(rule *protomsg.Rule, am *AreaMap) LittleRuleResult {
@@ -989,14 +933,6 @@
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
func GetTimeById(id string, index int) []TimeRange {
- //var cameraTimeRule protomsg.CameraTimerule
- //var api dbapi.CameraApi
- //_, rules := api.FindAllTimeRules()
- //for _, rule := range rules {
- // if rule.Id == id {
- // cameraTimeRule = rule
- // }
- //}
_, cameraTimeRule := cache.GetTimeRuleById(id)
var timeRangeList []day
err := json.Unmarshal([]byte(cameraTimeRule.TimeRule), &timeRangeList)
--
Gitblit v1.8.0