From f6ca7bb43270474fa876ff6ba62c6b2113b045ad Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 31 五月 2024 14:03:29 +0800
Subject: [PATCH] Optimize day and night algorithm, format date and time, batch process by date.
---
EsClient.go | 73 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/EsClient.go b/EsClient.go
index f63abff..c5b47f1 100644
--- a/EsClient.go
+++ b/EsClient.go
@@ -15,7 +15,6 @@
"time"
)
-
func Parsesources(sources []map[string]interface{}) (multiInfos []*protomsg.MultiFeaCache) {
var ok bool
for _, source := range sources {
@@ -104,7 +103,7 @@
return
}
-//瑙ｆ瀽鎶撴媿搴撲汉鍛樼粨鏋�
+// 瑙ｆ瀽鎶撴媿搴撲汉鍛樼粨鏋�
func AIOceanAnalysis(sources []map[string]interface{}) (tmpinfos []protomsg.AIOcean) {
var ok bool
for _, source := range sources {
@@ -311,7 +310,7 @@
return tmpinfos
}
-//瑙ｆ瀽搴曞簱浜哄憳缁撴瀯
+// 瑙ｆ瀽搴曞簱浜哄憳缁撴瀯
func Dbpersonbyid(sources []map[string]interface{}) (tmpinfos []protomsg.Dbperson) {
var ok bool
@@ -379,7 +378,7 @@
return tmpinfos
}
-//瑙ｆ瀽搴曞簱缁撴瀯
+// 瑙ｆ瀽搴曞簱缁撴瀯
func Dbtablebyid(sources []map[string]interface{}) (tmpinfos []protomsg.Dbtable) {
var ok bool
@@ -548,7 +547,7 @@
return allSource, nil
}
-func SourceDeduplication(buf [] byte) ([]map[string]interface{}, error) {
+func SourceDeduplication(buf []byte) ([]map[string]interface{}, error) {
var info interface{}
json.Unmarshal(buf, &info)
out, ok := info.(map[string]interface{})
@@ -577,8 +576,8 @@
return faceId, nil
}
-//瑙ｆ瀽鑱氬悎璁℃暟缁撴瀯
-func SourceStatistics(buf [] byte) ([]map[string]interface{}, error) {
+// 瑙ｆ瀽鑱氬悎璁℃暟缁撴瀯
+func SourceStatistics(buf []byte) ([]map[string]interface{}, error) {
var info interface{}
json.Unmarshal(buf, &info)
out, ok := info.(map[string]interface{})
@@ -604,7 +603,7 @@
return resultData, nil
}
-func SourceAggregations(buf [] byte, thresholdTime float64, queryUseTime float64) (sources map[string]interface{}, err error) {
+func SourceAggregations(buf []byte, thresholdTime float64, queryUseTime float64) (sources map[string]interface{}, err error) {
s := make(map[string]interface{})
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
@@ -739,7 +738,7 @@
return s, nil
}
-func SourceAggregationsReturnByGrouped(buf [] byte, thresholdTime float64) (sources []map[string]interface{}, err error) {
+func SourceAggregationsReturnByGrouped(buf []byte, thresholdTime float64) (sources []map[string]interface{}, err error) {
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
return nil, errors.New("鏃跺尯璁剧疆閿欒")
@@ -868,7 +867,7 @@
return sources, nil
}
-//瑙ｆ瀽鎶撴媿搴撲汉鍛樼粨鏋�
+// 瑙ｆ瀽鎶撴媿搴撲汉鍛樼粨鏋�
func PerSonAnalysis(preData []map[string]interface{}) (sources []map[string]interface{}, err error) {
loc, err := time.LoadLocation("Asia/Shanghai")
if err != nil {
@@ -1033,9 +1032,44 @@
if !ok {
return -1, errors.New("first total change error!")
}
- tmp := middle["total"].(float64)
- total = int(tmp)
+
+ tmp, b := middle["total"].(map[string]interface{})
+ if b != true {
+ v := middle["total"].(float64)
+ t := int(v)
+ return t, nil
+ }
+ value := tmp["value"].(float64)
+ total = int(value)
return total, nil
+}
+
+func SourceAggregationList(buf []byte) (sources []map[string]interface{}, err error) {
+ var info interface{}
+ json.Unmarshal(buf, &info)
+ out, ok := info.(map[string]interface{})
+ if !ok {
+ return nil, errors.New("http response interface can not change map[string]interface{}")
+ }
+
+ middle, ok := out["aggregations"].(map[string]interface{})
+ if !ok {
+ return nil, errors.New("first hits change error!")
+ }
+ //fmt.Println("鏈鍏卞尮閰嶆潯鏁颁负: ", out["hits"].(map[string]interface{})["total"].(float64))
+ documentAggregations := middle["group_by_documentnumber"].(map[string]interface{})
+ buckets := documentAggregations["buckets"].([]interface{})
+ if len(buckets) == 0 {
+ return nil, nil
+ }
+ for _, in := range buckets {
+ tmpbuf, ok := in.(map[string]interface{})
+ if !ok {
+ return nil, errors.New("")
+ }
+ sources = append(sources, tmpbuf)
+ }
+ return sources, nil
}
func EsReq(method string, url string, parama []byte) (buf []byte, err error) {
@@ -1046,7 +1080,7 @@
}
request, err := http.NewRequest(method, url, bytes.NewBuffer(parama))
request.Header.Set("Content-type", "application/json")
- request.Header.Set("Authorization",Token)
+ request.Header.Set("Authorization", Token)
if err != nil {
fmt.Println("build request fail !")
@@ -1079,15 +1113,14 @@
// 璧嬪�兼椂妫�娴嬫槸鍚﹁兘澶熻祴鍊�
//func //Isnil(key string, ok bool){
// if !ok {
-// fmt.Println(key, "is nil can not asign")
+// fmt.Println(key, "is nil can not asign")
// }
//}
type account struct {
- Username string `mapstructure: "username"`
+ Username string `mapstructure: "username"`
Userpassword string `mapstructure: "userpassword"`
}
-
var Account = &account{}
@@ -1097,12 +1130,14 @@
v := viper.New()
v.SetConfigType("yaml")
v.SetConfigName("pro")
+ v.AddConfigPath("../config/")
+ v.AddConfigPath("./config/")
v.AddConfigPath("/opt/vasystem/config/")
err := v.ReadInConfig()
if err != nil {
- log.Fatal("err on parsing configuration file!",err)
+ log.Fatal("err on parsing configuration file!", err)
}
- v.UnmarshalKey("es.account",Account)
+ v.UnmarshalKey("es.account", Account)
- Token = "Basic "+base64.StdEncoding.EncodeToString([]byte(Account.Username+":"+Account.Userpassword))
+ Token = "Basic " + base64.StdEncoding.EncodeToString([]byte(Account.Username+":"+Account.Userpassword))
}
--
Gitblit v1.8.0