From b239b3bcb143960e74c29513e64d906b30bc08cd Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期一, 22 七月 2019 13:55:49 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 0d3330f..383a1e5 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -16,11 +16,11 @@
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() {
data, err := ioutil.ReadFile("./config/conf.yml")
@@ -31,14 +31,15 @@
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)
+ logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�",localConfig,serverIp,serverPort)
bigCache.Init(dbTablePersons,serverIp,serverPort,localConfig.ServerId)
}
@@ -77,13 +78,14 @@
}
// 淇濈暀鍥涗綅灏忔暟
-func Retain(f float32)(float32) {
+func Retain(f float32)(float64) {
s:= strconv.FormatFloat(float64(f), 'f', 4, 64)
- v, err := strconv.ParseFloat(s, 32)
+ v, err := strconv.ParseFloat(s, 64)
if err != nil {
logger.Error("淇濈暀鍥涗綅灏忔暟杞崲閿欒")
}
- return float32(v)
+ // float32涓巉loat64浜掕浆浼氭湁浣嶆暟淇濈暀涓嶅噯鐨勯棶棰�
+ return v
}
// 鍙栧嚭鏌愪釜鏃堕棿瑙勫垯鐨勭鍑犲ぉ鐨勮鍒欐闆嗗悎
@@ -163,26 +165,28 @@
if err1 != nil {
logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1)
}
- logger.Debug("----------------++++++++++++++++++++搴曞簱浜哄憳淇℃伅锛�",baseinfos)
for _,baseinfo := range baseinfos {
// 鏍规嵁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鏌ヨ搴曞簱淇℃伅鍑洪敊锛�")
+ 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:float64(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]),PersonId:baseinfo.Id,PersonName:baseinfo.PersonName,PersonPicUrl:baseinfo.PersonPicUrl,PhoneNum:baseinfo.PhoneNum,Sex:baseinfo.Sex,MonitorLevel:baseinfo.MonitorLevel,Content:""}
+ //logger.Debug("鐪嬬湅杩欎釜base鐨勫姣斿�兼槸澶氬皯锛�",base)
+ //os.Exit(1)
arg.Liker = append(arg.Liker, &base)
}
}
+
}
// 浜鸿劯姣斿
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,18 +210,18 @@
//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 {
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
logger.Info("============================================杩涜浜鸿劯瀵规瘮")
for _, areaMap := range sdkData.AreaMapList {
- logger.Info("-------------浜鸿劯姣斿涔嬪墠鐩爣鏁伴噺",len(areaMap.args))
// 鎷垮尯鍩熶腑姣忎釜浜鸿劯鐗瑰緛鍊煎幓瀵规瘮锛屽～鍏呭叾liker
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