From 6f7b838deadec43e5e30b9ba48f53b77798f7dc2 Mon Sep 17 00:00:00 2001 From: panlei <2799247126@qq.com> Date: 星期四, 11 七月 2019 14:01:44 +0800 Subject: [PATCH] arg指针化 --- ruleserver/ruleToformula.go | 76 +++++++++---------------------------- 1 files changed, 19 insertions(+), 57 deletions(-) diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go index e230984..efc02d6 100644 --- a/ruleserver/ruleToformula.go +++ b/ruleserver/ruleToformula.go @@ -222,6 +222,24 @@ } } } +func (arg *Arg) fillLiker(){ + bytes := bigCache.Getdbpersonmsg("", arg.Feature, true) + var m map[string]float32 + err1 := json.Unmarshal(bytes, &m) + if err1 != nil { + logger.Error("getBaseInfo瑙e帇閿欒", err1) + } + logger.Info("----------------------------------------map鏄�", m) + for key, val := range m { + logger.Info("_______________________________________瀵规瘮搴撶殑杩斿洖鍊�", key, val) + baseinfo, err1 := esutil.Dbpersoninfosbyid(key) + if err1 != nil { + logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1) + } + baseinfo.CompareScore = val + arg.Liker = append(arg.Liker, &baseinfo) + } +} func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) { compareFlag := 0 tableIds := "" @@ -253,22 +271,7 @@ if groupRule.Rules[j].PolygonId == areaMap.areaId { for _, arg := range areaMap.args { if compareFlag == 1 { - bytes := bigCache.Getdbpersonmsg("", arg.Feature, true) - var m map[string]float32 - err1 := json.Unmarshal(bytes, &m) - if err1 != nil { - logger.Error("getBaseInfo瑙e帇閿欒", err1) - } - logger.Info("----------------------------------------map鏄�", m) - for key, val := range m { - logger.Info("_______________________________________瀵规瘮搴撶殑杩斿洖鍊�", key, val) - baseinfo, err1 := esutil.Dbpersoninfosbyid(key) - if err1 != nil { - logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1) - } - baseinfo.CompareScore = val - arg.Liker = append(arg.Liker, &baseinfo) - } + arg.fillLiker() } if compareFlag == 2 { array := strings.Split(tableIds, ",") @@ -292,47 +295,6 @@ logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker)) } logger.Info("=======绗竴娆$湅args锛�",areaMap.args) - for _, arg := range areaMap.filterData { - if compareFlag == 1 { - bytes := bigCache.Getdbpersonmsg("", arg.Feature, true) - var m map[string]float32 - err1 := json.Unmarshal(bytes, &m) - if err1 != nil { - logger.Error("getBaseInfo瑙e帇閿欒", err1) - } - logger.Info("----------------------------------------map鏄�", m) - for key, val := range m { - logger.Info("_______________________________________瀵规瘮搴撶殑杩斿洖鍊�", key, val) - baseinfo, err1 := esutil.Dbpersoninfosbyid(key) - if err1 != nil { - logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1) - } - baseinfo.CompareScore = val - arg.Liker = append(arg.Liker, &baseinfo) - } - } - if compareFlag == 2 { - array := strings.Split(tableIds, ",") - for i := 0; i < len(array)-1; i++ { - bytes := bigCache.Getdbpersonmsg(array[i], arg.Feature, true) - var m map[string]float32 - err1 := json.Unmarshal(bytes, &m) - if err1 != nil { - logger.Error("getBaseInfo瑙e帇閿欒", err1) - } - for key, val := range m { - baseinfo, err1 := esutil.Dbpersoninfosbyid(key) - if err1 != nil { - logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊", err1) - } - baseinfo.CompareScore = val - arg.Liker = append(arg.Liker, &baseinfo) - } - } - } - logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker)) - } - logger.Info("----------------------绗簩娆$湅args锛�",areaMap.filterData) } } } -- Gitblit v1.8.0