From 9a91919fe29d3b2dcb4348c8ac3f34ccab4acf75 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 11:59:56 +0800
Subject: [PATCH] 任务的组规则长度过滤判断
---
ruleserver/readyDataForRule.go | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 4e5f95c..627ccdb 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -16,10 +16,30 @@
bigCache.Init()
}
+type BaseInfo struct {
+ TableId string `json:"tableId"`
+ TableName string `json:"tableName"`
+ BwType string `json:"bwType"`
+ CompareScore float64 `json:"compareScore"`
+ PersonId string `json:"personId"`
+ PersonName string `json:"personName"`
+ PersonPicUrl string `json:"personPicUrl"`
+ PhoneNum string `json:"phoneNum"`
+ Sex string `json:"sex"`
+ IdCard string `json:"idCard"`
+ MonitorLevel string `json:"monitorLevel"`
+ Content string `json:"content"`
+}
// 浠ユ憚鍍忔満id鏌ュ嚭璺熷叾鐩稿叧鐨勬墍鏈変换鍔′笅鐨勬墍鏈夎鍒欑粍
-func GetRuleGroup(cameraId string) []*protomsg.TaskGroupArgs {
+func GetRuleGroup(cameraId string,taskId string) *protomsg.TaskGroupArgs {
all := cache.GetCameraTaskRulesByCameraId(cameraId)
- return all
+ var taskGroup *protomsg.TaskGroupArgs
+ for _,task := range all {
+ if task.TaskId == taskId {
+ taskGroup = task
+ }
+ }
+ return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
@@ -98,7 +118,7 @@
// 缁欑洰鏍囧～鍏卨iker
func (arg *Arg) fillLiker() {
- bytes := sdkcompare.GetComparePersonBaseInfo(nil, arg.Feature, 70)
+ bytes := sdkcompare.GetComparePersonBaseInfo(nil, arg.Feature, 40)
var m map[string]float32
err1 := json.Unmarshal(bytes, &m)
if err1 != nil {
@@ -109,11 +129,16 @@
for key,_ := range m {
ids = append(ids,key)
}
+ logger.Info("------------------------------------------------------------------------------------------------------------------------")
+ logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
+ for _,baseinfo := range baseinfos {
+ logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo)
+ }
//baseinfo.CompareScore = Retain(val)
//arg.Liker = append(arg.Liker, &baseinfo)
//logger.Info("------------------绗竴娆＄湅args:",*arg)
@@ -190,7 +215,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, []*protomsg.Baseinfo{}}
+ 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{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.args = append(a.args, &arg1)
a.filterData = append(a.filterData, &arg1)
--
Gitblit v1.8.0