From eae74e6153a4c93f99639d8a4471bd8a0863a3ae Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 09 七月 2019 18:16:55 +0800
Subject: [PATCH] 查询底库人员信息，加一个detectScore字段
---
insertdata/insertDataToEs.go | 5 ++++-
ruleserver/ruleToformula.go | 13 +++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index 9a54e1c..b0c730a 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -59,6 +59,7 @@
AnalyServerName string `json:"analyServerName"`
AnalyServerIp string `json:"analyServerIp"`
ClusterId string `json:"clusterId"`
+ DetectScore float64 `json:"detectScore"`
IsAlarm int `json:"isAlarm"`
IsAckAlarm int `json:"isAckAlarm"`
IsCollect int `json:"isCollect"`
@@ -174,6 +175,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
@@ -193,7 +195,7 @@
}
//logger.Info(err.Error())
} else {
- // 浜鸿劯鎻愬彇
+ // 浜鸿劯姣斿
localConfig, err := cache.GetServerInfo()
if err != nil {
logger.Info("鏌ヨ鏈満淇℃伅澶辫触锛�")
@@ -250,6 +252,7 @@
localConfig.ServerName,
serverIp,
"",
+ face.Score,
1,
0,
0,
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index 0497a8e..9549d5e 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -11,6 +11,7 @@
"time"
bigCache "basic.com/pubsub/cache.git"
+ "basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/protomsg.git"
"github.com/knetic/govaluate"
)
@@ -268,8 +269,10 @@
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
}
for key, val := range m {
- fmt.Println(key)
- baseinfo := protomsg.Baseinfo{}
+ baseinfo,err1 := esutil.Dbpersoninfosbyid(key)
+ if err1 != nil {
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊",err1)
+ }
baseinfo.CompareScore = val
arg.Liker = append(arg.Liker, &baseinfo)
}
@@ -284,8 +287,10 @@
logger.Error("getBaseInfo瑙ｅ帇閿欒", err1)
}
for key, val := range m {
- fmt.Println(key)
- baseinfo := protomsg.Baseinfo{}
+ baseinfo, err1 := esutil.Dbpersoninfosbyid(key)
+ if err1 != nil {
+ logger.Error("鏌ヨ搴曞簱浜哄憳淇℃伅鍑洪敊",err1)
+ }
baseinfo.CompareScore = val
arg.Liker = append(arg.Liker, &baseinfo)
}
--
Gitblit v1.8.0