From fc400ad4be030014144ba2132f2799be81b2711e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 11 七月 2019 14:26:57 +0800
Subject: [PATCH] ---
---
ruleserver/ruleToformula.go | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index d4aab7e..cc9ea22 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -222,6 +222,25 @@
}
}
}
+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瑙ｅ帇閿欒", 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)
+ }
+ //logger.Info("------------------绗竴娆＄湅args:",*arg)
+}
func Compare(args *SdkDatas, groupRule *protomsg.GroupRule) {
compareFlag := 0
tableIds := ""
@@ -253,22 +272,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瑙ｅ帇閿欒", 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 * 100
- arg.Liker = append(arg.Liker, &baseinfo)
- }
+ arg.fillLiker()
}
if compareFlag == 2 {
array := strings.Split(tableIds, ",")
@@ -289,8 +293,9 @@
}
}
}
- logger.Info("-------------------鎴愬姛缁檒iker璧嬪�硷細", arg.Liker)
+ logger.Info("-------------------鎴愬姛缁檒iker璧嬪��,闀垮害涓猴細", len(arg.Liker))
}
+ //logger.Info("=======绗竴娆＄湅args锛�",areaMap.args)
}
}
}
@@ -318,7 +323,7 @@
}
ipcId := sdk.IpcId
sdkName := sdk.SdkName
-
+ logger.Info("瑙勫垯鐨刬pcId涓巗dkData鐨処pcId:",ipcId,"===",sdkData.IpcId)
if ipcId == sdkData.IpcId {
logger.Info("褰撳墠璧扮殑瑙勫垯鐨勭畻娉曟槸--锛�", sdkName, "---")
for _, areaMap := range sdkData.AreaMapList {
@@ -682,7 +687,7 @@
if rule.PolygonId == am.areaId { // 绠楁硶鍜屽尯鍩熼兘寰楀鐨勪笂
if rule.SdkId == "812b674b-2375-4589-919a-5c1c3278a972" && rule.SdkArgAlias != "time_rule" {
- // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾瑕佽�冭檻濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
+ // 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ
argValue, err := strconv.ParseFloat(rule.SdkArgValue, 64)
if err != nil {
logger.Error("瑙勫垯閰嶇疆鐨勯槇鍊奸潪娉�")
--
Gitblit v1.8.0