From 224fd8bd81a690e31ba196da58154866d67c171f Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 17:22:41 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index a2ae4a1..7a0acda 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -8,6 +8,7 @@
"fmt"
"github.com/go-yaml/yaml"
"io/ioutil"
+ "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strconv"
@@ -16,13 +17,13 @@
var serverIp,serverPort,dbTablePersons string
type conf struct {
PhotoUrl string `yaml:"photoUrl"`
- Videopersons string `yaml:"videoPersons"`
- Personaction string `yaml:"personAction"`
- Serverip string `yaml:"serverIp"`
- Serverport string `yaml:"serverPort"`
- Dbtablepersons string `yaml:"dbTablePersons"`
+ VideoPersons string `yaml:"videoPersons"`
+ PersonAction string `yaml:"personAction"`
+ ServerIp string `yaml:"serverIp"`
+ ServerPort string `yaml:"serverPort"`
+ DbTablePersons string `yaml:"dbTablePersons"`
}
-func init() {
+func Init() {
data, err := ioutil.ReadFile("./config/conf.yml")
if err != nil {
fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
@@ -31,15 +32,16 @@
c := conf{}
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
- serverIp = c.Serverip
- serverPort = c.Serverport
- dbTablePersons = c.Dbtablepersons
+ logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�",c)
+ serverIp = c.ServerIp
+ serverPort = c.ServerPort
+ dbTablePersons = c.DbTablePersons
localConfig, err1 := cache.GetServerInfo()
if err1 != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
- logger.Debug("鏈満淇℃伅锛�",localConfig)
- bigCache.Init(dbTablePersons,serverIp,serverPort,"")
+ logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�",localConfig,serverIp,serverPort)
+ bigCache.Init(dbTablePersons,serverIp,serverPort,localConfig.ServerId)
}
type BaseInfo struct {
@@ -145,6 +147,7 @@
// 缁欑洰鏍囧～鍏卨iker
func (arg *Arg) fillLiker(tableId []string,compareThreshold float32) {
+ fmt.Println("---------------------------------鐪嬬湅閭ｄ笁涓贩铔嬶細",dbTablePersons,serverIp,serverPort)
bytes := bigCache.GetComparePersonBaseInfo(tableId,arg.Feature,compareThreshold)
var m map[string]float32
err1 := json.Unmarshal(bytes, &m)
@@ -177,12 +180,13 @@
arg.Liker = append(arg.Liker, &base)
}
}
+ os.Exit(1)
}
// 浜鸿劯姣斿
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
var tableIds []string
- var threshold float32
+ var threshold float32 = 0.2
// 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
@@ -206,8 +210,9 @@
//compareFlag = 1
if compareFlag == 0 {
logger.Info("娌℃湁閰嶇疆瀵规瘮搴曞簱鍙傛暟")
- return
+ //return
}
+ logger.Debug("=====閰嶇疆鐨勯槇鍊间负锛�",threshold)
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" {
for _, sdkData := range args.Sdkdata {
@@ -216,8 +221,9 @@
for _, areaMap := range sdkData.AreaMapList {
logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
+ logger.Debug("----鐪嬬湅涓や釜鍖哄煙id鏄惁涓�鑷达細",groupRule.Rules[j].PolygonId,areaMap.areaId)
if groupRule.Rules[j].PolygonId == areaMap.areaId {
- logger.Info("--------------鐪嬬湅compareFlag鐨勫�硷細",compareFlag)
+ logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId锛�",compareFlag,tableIds)
for _, arg := range areaMap.args {
if compareFlag == 1 {
arg.fillLiker(nil,threshold)
--
Gitblit v1.8.0