From b149d73c29df3170af79d4d85da1be44692b3acc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 30 七月 2019 20:30:36 +0800
Subject: [PATCH] 联动任务缓存数据
---
ruleserver/readyDataForRule.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index f68c182..63c2cd0 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -1,8 +1,8 @@
package ruleserver
import (
- "basic.com/pubsub/cache.git/esutil"
bigCache "basic.com/pubsub/cache.git"
+ "basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/protomsg.git"
"encoding/json"
"fmt"
@@ -73,7 +73,7 @@
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
- logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
+ //logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
return cameraPolygons
}
@@ -159,7 +159,7 @@
ids = append(ids,key)
}
logger.Info("------------------------------------------------------------------------------------------------------------------------")
- logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
+ //logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
baseinfos, err1 := esutil.Dbpersoninfosbyid(ids,dbTablePersons,serverIp,serverPort)
if err1 != nil {
@@ -167,14 +167,14 @@
}
for _,baseinfo := range baseinfos {
// 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
- logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
+ //logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
var tableIds []string
tableIds = append(tableIds,baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
table,err := esutil.Dbtablefosbyid(tableIds,"dbtables",serverIp,serverPort)
if err != nil || len(table) == 0{
logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�",err,"--杩斿洖鍊奸暱搴︿负锛�",len(table))
}
- base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:Retain(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
+ base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:Retain(m[baseinfo.Id])*100,PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,IdCard:baseinfo.IdCard,MonitorLevel:baseinfo.MonitorLevel,Content:baseinfo.Reserved}
//logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�",base)
//os.Exit(1)
arg.Liker = append(arg.Liker, &base)
@@ -221,7 +221,7 @@
for _, areaMap := range sdkData.AreaMapList {
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
if groupRule.Rules[j].PolygonId == areaMap.areaId {
- logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
+ //logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
for _, arg := range areaMap.args {
if compareFlag == 1 {
arg.fillLiker(nil,threshold)
@@ -229,7 +229,7 @@
if compareFlag == 2 {
arg.fillLiker(tableIds,threshold)
}
- logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
+ //logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
areaMap.filterData = areaMap.args
//logger.Info("=======绗竴娆＄湅args锛�",(areaMap.filterData))
--
Gitblit v1.8.0