From 8a79c35924573ec3617fbff5b3156d6cac632579 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 18 七月 2019 18:08:54 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index b7e6d79..192e3c0 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -8,7 +8,6 @@
"fmt"
"github.com/go-yaml/yaml"
"io/ioutil"
- "os"
"ruleprocess/cache"
"ruleprocess/logger"
"strconv"
@@ -17,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")
@@ -33,9 +32,9 @@
//鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
yaml.Unmarshal(data, &c)
logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�",c)
- serverIp = c.Serverip
- serverPort = c.Serverport
- dbTablePersons = c.Dbtablepersons
+ serverIp = c.ServerIp
+ serverPort = c.ServerPort
+ dbTablePersons = c.DbTablePersons
localConfig, err1 := cache.GetServerInfo()
if err1 != nil {
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
@@ -147,7 +146,6 @@
// 缁欑洰鏍囧～鍏卨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)
@@ -166,21 +164,20 @@
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:""}
arg.Liker = append(arg.Liker, &base)
}
}
- os.Exit(1)
+
}
// 浜鸿劯姣斿
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
@@ -219,9 +216,7 @@
if sdkData.IpcId == "A8B73405-373D-4F23-CED2-A617EBD7EC55" { // 鎼滅储鍒颁汉鑴告娴嬬殑sdkdata 鐜板湪鍏充簬浜鸿劯鐨勫彧鏈変粬涓�涓猻dk锛屽叏鎵句粬
logger.Info("============================================杩涜浜鸿劯瀵规瘮")
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鐨勫�煎拰tableId锛�",compareFlag,tableIds)
for _, arg := range areaMap.args {
--
Gitblit v1.8.0