From d5843f7c2586dbdbe9dea1265af2632696bf3f27 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期三, 17 七月 2019 17:42:38 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 6a3718e..100ba1e 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -31,9 +31,16 @@
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
+ //logger.Info("==================鎵�鏈夌殑浠诲姟鐨勮鍒欑粍锛�",all)
+ var taskGroup *protomsg.TaskGroupArgs
+ for _,task := range all {
+ if task.TaskId == taskId {
+ taskGroup = task
+ }
+ }
+ return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
@@ -112,7 +119,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 {
@@ -123,11 +130,18 @@
for key,_ := range m {
ids = append(ids,key)
}
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
- if err1 != nil {
- logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
+ logger.Info("------------------------------------------------------------------------------------------------------------------------")
+ logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
+ if len(ids) > 0 {
+ baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
+ if err1 != nil {
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
+ }
+ logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
+ for _,baseinfo := range baseinfos {
+ logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo)
+ }
}
- logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
//baseinfo.CompareScore = Retain(val)
//arg.Liker = append(arg.Liker, &baseinfo)
//logger.Info("------------------绗竴娆＄湅args:",*arg)
--
Gitblit v1.8.0