From e320f5c14d9833ba2c7f6bdcc62ffda866ad7fdc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 16:40:54 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 100ba1e..a92fa05 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -4,16 +4,43 @@
"basic.com/pubsub/cache.git/esutil"
bigCache "basic.com/pubsub/cache.git"
"basic.com/pubsub/protomsg.git"
- "basic.com/pubsub/sdkcompare.git"
"encoding/json"
+ "fmt"
+ "github.com/go-yaml/yaml"
+ "io/ioutil"
+ "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strconv"
- "strings"
"time"
)
-func init() {
- bigCache.Init()
+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"`
+}
+func Init() {
+ data, err := ioutil.ReadFile("./config/conf.yml")
+ if err != nil {
+ fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
+ logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
+ }
+ c := conf{}
+ //鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
+ yaml.Unmarshal(data, &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,localConfig.ServerId)
}
type BaseInfo struct {
@@ -118,8 +145,9 @@
}
// 缁欑洰鏍囧～鍏卨iker
-func (arg *Arg) fillLiker() {
- bytes := sdkcompare.GetComparePersonBaseInfo(nil, arg.Feature, 40)
+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)
if err1 != nil {
@@ -133,32 +161,47 @@
logger.Info("------------------------------------------------------------------------------------------------------------------------")
logger.Info("=====================浜哄憳id鐨勯泦鍚堜负锛�",ids)
if len(ids) > 0 {
- baseinfos, err1 := esutil.Dbpersoninfosbyid(ids)
+ baseinfos, err1 := esutil.Dbpersoninfosbyid(ids,dbTablePersons,serverIp,serverPort)
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
for _,baseinfo := range baseinfos {
- logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo)
+ // 鏍规嵁tableId鏌ヨ搴曞簱淇℃伅缁檒iker璧嬪��
+ logger.Info("---------鐪嬬湅姣忎釜搴曞簱浜哄憳鐨勪俊鎭細",baseinfo.Id,baseinfo.PersonName)
+ var tableIds []string
+ tableIds = append(tableIds,baseinfo.TableId) // 铏界劧鏄紶鍏ユ暟缁勮繑鍥炴暟缁勭殑鎺ュ彛锛屼絾鎴戞寜鍗曚釜鐨勪娇鐢ㄤ簡
+ table,err := esutil.Dbtablefosbyid(tableIds,dbTablePersons,serverIp,serverPort)
+ if err != nil {
+ logger.Error("鏍规嵁id鏌ヨ搴曞簱淇℃伅鍑洪敊锛�")
+ }
+ base := BaseInfo{TableId:baseinfo.TableId,TableName:table[0].TableName,BwType:table[0].BwType,CompareScore:float64(m[baseinfo.Id]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
+ arg.Liker = append(arg.Liker, &base)
}
}
- //baseinfo.CompareScore = Retain(val)
- //arg.Liker = append(arg.Liker, &baseinfo)
- //logger.Info("------------------绗竴娆＄湅args:",*arg)
+ os.Exit(1)
}
// 浜鸿劯姣斿
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
- tableIds := ""
+ var tableIds []string
+ var threshold float32 = 50
// 鐪嬬湅鏄惁鏈夊彧閰嶄汉鑴告瘮瀵圭畻娉曚絾娌℃湁閰嶅姣斿簱鐨勮鍒欙紝濡傛灉鏈夛紝鍒欐瘮瀵瑰璞′负鍏ㄩ儴搴曞簱
for j := 0; j < len(groupRule.Rules); j++ {
if groupRule.Rules[j].SdkId == "812b674b-2375-4589-919a-5c1c3278a972" { // 閰嶄簡浜鸿劯姣斿
if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue != "" { // 閰嶄簡姣斿搴曞簱鐨勫弬鏁颁絾娌℃湁閰嶅叏閮ㄥ簳搴�
compareFlag = 2
- tableIds = groupRule.Rules[j].SdkArgValue + "," // 鏈�鍚庝細澶氫竴涓猼ableId锛屽垏鍑烘潵鐨勬暟缁勫彇len-1灏卞彲浠�
+ tableIds = append(tableIds,groupRule.Rules[j].SdkArgValue)// 鏈�鍚庝細澶氫竴涓猼ableId锛屽垏鍑烘潵鐨勬暟缁勫彇len-1灏卞彲浠�
}
if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue == "" { // 閰嶇殑鍙傛暟鏄瘮瀵瑰叏閮ㄥ簳搴�
compareFlag = 1
+ }
+ if groupRule.Rules[j].SdkArgAlias == "threshold" {
+ v2, err := strconv.ParseFloat(groupRule.Rules[j].SdkArgValue, 32)
+ if err != nil {
+ logger.Error("string杞琭loat32澶辫触锛�")
+ }
+ threshold = float32(v2)
}
}
}
@@ -166,8 +209,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 {
@@ -176,18 +220,15 @@
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)
for _, arg := range areaMap.args {
if compareFlag == 1 {
- arg.fillLiker()
+ arg.fillLiker(nil,threshold)
}
if compareFlag == 2 {
- array := strings.Split(tableIds, ",")
- logger.Info("--------------------------鐪嬬湅瀵规瘮搴曞簱鐨勫��;",array)
- for i := 0; i < len(array)-1; i++ {
- arg.fillLiker()
- }
+ arg.fillLiker(tableIds,threshold)
}
logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
--
Gitblit v1.8.0