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 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 49 insertions(+), 4 deletions(-) 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