~suntianyu/webserver.git

parent: bae7a9a3 | 补丁 | 提交 | show whitespace

sunty

2020-01-19 b10a806cbdf05c2e000f33ef82a501b07b3bb1b6

update _source list and struct

4个文件已修改

	controllers/capture.go	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	controllers/esSearch.go	85 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	controllers/initForData.go	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	extend/esutil/EsClient.go	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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)
}

 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
}


 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)
}

 extend/esutil/EsClient.go

@@ -304,8 +304,7 @@
    return sources, nil
}


func HttpGet(str string) ([]byte){
func HttpGet(str string) []byte {
    resp, err :=   http.Get(str)
    if err != nil {
        // handle error
@@ -318,3 +317,49 @@
    }
    return body
}

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
}

			@@ -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)
			}

			@@ -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
			}

			@@ -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)
			}

			@@ -304,8 +304,7 @@
			return sources, nil
			}


			func HttpGet(str string) ([]byte){
			func HttpGet(str string) []byte {
			resp, err := http.Get(str)
			if err != nil {
			// handle error
			@@ -318,3 +317,49 @@
			}
			return body
			}

			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
			}