liuxiaolong
2019-08-02 3fe28541b4c4d0ed35ff0d301367981729df4c9d
Merge branch 'master' of http://192.168.1.14:10010/r/webserver
1个文件已修改
15 ■■■■ 已修改文件
controllers/esSearch.go 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/esSearch.go
@@ -84,6 +84,7 @@
        queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"baseInfo.sex\",\"baseInfo.phoneNum.raw^1.5\",\"baseInfo.personName.raw^1.5\",\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^1.0\"]," +
            "\"type\":\"cross_fields\",\"operator\":\"OR\",\"slop\":0,\"prefix_length\":0,\"max_expansions\":50,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"fuzzy_transpositions\":true,\"boost\":1}}],"
    }
    searchTime := searchBody["searchTime"].([]interface{})
    if searchBody["searchTime"] == nil || len(searchTime) < 2 {
        info := make(map[string]interface{}, 0)
@@ -157,15 +158,17 @@
    //logger.Debug("findEsData.param:",prama)
    //数据解析
    tokenRes := esutil.GetEsDataReq(url, prama, true)
    fmt.Println(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)
        sources = append(sources, masterInfo)
        sources := make(map[string]interface{}, 0)
        sources["activeObject"] = masterInfo
        source := make([]map[string]interface{}, 0)
        source = append(source, masterInfo)
        linkId := ""
        if masterInfo["linkId"] != nil {
            linkId = masterInfo["linkId"].(string)
@@ -175,14 +178,12 @@
            linkInfo := GetLinkInfo(linkId, id)
            for _, slaveInfoValues := range linkInfo {
                slaveInfo := slaveInfoValues
                sources = append(sources, slaveInfo)
                source = append(source, slaveInfo)
            }
            fmt.Println(linkInfo)
        }
        sources["list"] = source
        tmpDate["datalist"] = append(tmpDate["datalist"], sources)
        fmt.Println(sources)
    }
    tmpAllDate["datalist"] = tmpDate["datalist"]
    return tmpAllDate