From b10a806cbdf05c2e000f33ef82a501b07b3bb1b6 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期日, 19 一月 2020 17:13:48 +0800
Subject: [PATCH] update _source list and struct
---
extend/esutil/EsClient.go | 53 ++++++++++++++++-
controllers/capture.go | 3
controllers/esSearch.go | 85 ++++++++++++++--------------
controllers/initForData.go | 6 +
4 files changed, 98 insertions(+), 49 deletions(-)
diff --git a/controllers/capture.go b/controllers/capture.go
index 9d438a3..fd70180 100644
--- a/controllers/capture.go
+++ b/controllers/capture.go
@@ -72,5 +72,6 @@
"\"size\":\"1000\"," +
"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
tokenRes := esutil.GetEsDataReq(url, prama, true)
- util.ResponseFormat(c, code.Success, tokenRes)
+ tmpAllDate := esutil.ResponseData(tokenRes)
+ util.ResponseFormat(c, code.Success, tmpAllDate)
}
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 5eac425..194b4d1 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -207,49 +207,50 @@
logger.Debug("findEsData.param:", prama)
//鏁版嵁瑙ｆ瀽
tokenRes := esutil.GetEsDataReq(url, prama, true)
+ tmpAllDate := esutil.ResponseData(tokenRes)
//fmt.Println(tokenRes)
- tmpAllDate := make(map[string]interface{})
- tmpDate := make(map[string][]interface{})
- tmpAllDate["total"] = tokenRes["total"]
- data := tokenRes["datalist"]
- for _, masterInfoValues := range data.([]interface{}) {
- masterInfo := masterInfoValues.(map[string]interface{})
- sources := make(map[string]interface{}, 0)
- activateInfo := make(map[string]interface{})
- if masterInfo["linkTagInfo"] != nil {
- linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
- delete(masterInfo, "linkTagInfo")
- if len(linkTagInfo) > 0 {
- slaveList := make([]interface{}, 0)
- slaveList = append(slaveList, masterInfo)
- slaveList = append(slaveList, linkTagInfo...)
- for i, j := 0, len(slaveList)-1; i < j; i, j = i+1, j-1 {
- slaveList[i], slaveList[j] = slaveList[j], slaveList[i]
- }
- sources["list"] = slaveList
- activateInfo = slaveList[0].(map[string]interface{})
- } else {
- sources["list"] = []interface{}{
- masterInfo,
- }
- activateInfo = masterInfo
- }
- } else {
- if _, ok := masterInfo["linkTagInfo"]; ok {
- delete(masterInfo, "linkTagInfo")
- }
- sources["list"] = []interface{}{
- masterInfo,
- }
- activateInfo = masterInfo
-
- }
-
- sources["activeObject"] = activateInfo
-
- tmpDate["datalist"] = append(tmpDate["datalist"], sources)
- }
- tmpAllDate["datalist"] = tmpDate["datalist"]
+ //tmpAllDate := make(map[string]interface{})
+ //tmpDate := make(map[string][]interface{})
+ //tmpAllDate["total"] = tokenRes["total"]
+ //data := tokenRes["datalist"]
+ //for _, masterInfoValues := range data.([]interface{}) {
+ // masterInfo := masterInfoValues.(map[string]interface{})
+ // sources := make(map[string]interface{}, 0)
+ // activateInfo := make(map[string]interface{})
+ // if masterInfo["linkTagInfo"] != nil {
+ // linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
+ // delete(masterInfo, "linkTagInfo")
+ // if len(linkTagInfo) > 0 {
+ // slaveList := make([]interface{}, 0)
+ // slaveList = append(slaveList, masterInfo)
+ // slaveList = append(slaveList, linkTagInfo...)
+ // for i, j := 0, len(slaveList)-1; i < j; i, j = i+1, j-1 {
+ // slaveList[i], slaveList[j] = slaveList[j], slaveList[i]
+ // }
+ // sources["list"] = slaveList
+ // activateInfo = slaveList[0].(map[string]interface{})
+ // } else {
+ // sources["list"] = []interface{}{
+ // masterInfo,
+ // }
+ // activateInfo = masterInfo
+ // }
+ // } else {
+ // if _, ok := masterInfo["linkTagInfo"]; ok {
+ // delete(masterInfo, "linkTagInfo")
+ // }
+ // sources["list"] = []interface{}{
+ // masterInfo,
+ // }
+ // activateInfo = masterInfo
+ //
+ // }
+ //
+ // sources["activeObject"] = activateInfo
+ //
+ // tmpDate["datalist"] = append(tmpDate["datalist"], sources)
+ //}
+ //tmpAllDate["datalist"] = tmpDate["datalist"]
return tmpAllDate
}
diff --git a/controllers/initForData.go b/controllers/initForData.go
index 468e1bb..abd5bbb 100644
--- a/controllers/initForData.go
+++ b/controllers/initForData.go
@@ -71,7 +71,8 @@
"}"
logger.Debug("InitForCaptureData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
- util.ResponseFormat(c, code.Success, tokenRes)
+ tmpAllDate := esutil.ResponseData(tokenRes)
+ util.ResponseFormat(c, code.Success, tmpAllDate)
}
type InitForMonitorArg struct {
@@ -142,5 +143,6 @@
//logger.Debug("url:", url)
//logger.Debug("InitForMonitoringData:", prama)
tokenRes := esutil.GetEsDataReq(url, prama, true)
- util.ResponseFormat(c, code.Success, tokenRes)
+ tmpAllDate := esutil.ResponseData(tokenRes)
+ util.ResponseFormat(c, code.Success, tmpAllDate)
}
diff --git a/extend/esutil/EsClient.go b/extend/esutil/EsClient.go
index 0fb6e16..ba0880c 100644
--- a/extend/esutil/EsClient.go
+++ b/extend/esutil/EsClient.go
@@ -304,9 +304,8 @@
return sources, nil
}
-
-func HttpGet(str string) ([]byte){
- resp, err := http.Get(str)
+func HttpGet(str string) []byte {
+ resp, err := http.Get(str)
if err != nil {
// handle error
}
@@ -317,4 +316,50 @@
// handle error
}
return body
-}
\ No newline at end of file
+}
+
+func ResponseData(tokenRes map[string]interface{}) map[string]interface{} {
+ tmpAllDate := make(map[string]interface{})
+ tmpDate := make(map[string][]interface{})
+ tmpAllDate["total"] = tokenRes["total"]
+ data := tokenRes["datalist"]
+ for _, masterInfoValues := range data.([]interface{}) {
+ masterInfo := masterInfoValues.(map[string]interface{})
+ sources := make(map[string]interface{}, 0)
+ activateInfo := make(map[string]interface{})
+ if masterInfo["linkTagInfo"] != nil {
+ linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
+ delete(masterInfo, "linkTagInfo")
+ if len(linkTagInfo) > 0 {
+ slaveList := make([]interface{}, 0)
+ slaveList = append(slaveList, masterInfo)
+ slaveList = append(slaveList, linkTagInfo...)
+ for i, j := 0, len(slaveList)-1; i < j; i, j = i+1, j-1 {
+ slaveList[i], slaveList[j] = slaveList[j], slaveList[i]
+ }
+ sources["list"] = slaveList
+ activateInfo = slaveList[0].(map[string]interface{})
+ } else {
+ sources["list"] = []interface{}{
+ masterInfo,
+ }
+ activateInfo = masterInfo
+ }
+ } else {
+ if _, ok := masterInfo["linkTagInfo"]; ok {
+ delete(masterInfo, "linkTagInfo")
+ }
+ sources["list"] = []interface{}{
+ masterInfo,
+ }
+ activateInfo = masterInfo
+
+ }
+
+ sources["activeObject"] = activateInfo
+
+ tmpDate["datalist"] = append(tmpDate["datalist"], sources)
+ }
+ tmpAllDate["datalist"] = tmpDate["datalist"]
+ return tmpAllDate
+}
--
Gitblit v1.8.0