From 3dddd55662df78b3603bd0ab4d0aad4c8cdf3e53 Mon Sep 17 00:00:00 2001 From: sunty <1172534965@qq.com> Date: 星期一, 13 一月 2020 10:55:05 +0800 Subject: [PATCH] fix should --- controllers/esSearch.go | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/controllers/esSearch.go b/controllers/esSearch.go index 161e1ac..2d7a977 100644 --- a/controllers/esSearch.go +++ b/controllers/esSearch.go @@ -34,8 +34,8 @@ var arg models.EsSearch err := c.BindJSON(&arg) - if err !=nil || arg.Page <=0 && arg.Size<=0 { - util.ResponseFormat(c,code.RequestParamError,"鍙傛暟鏈夎") + if err != nil || arg.Page <= 0 && arg.Size <= 0 { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎") return } data := findEsData(&arg) @@ -105,7 +105,7 @@ //鍒ゆ柇鏁版嵁ID idStr := "" - linkTagInfoIdStr :="" + linkTagInfoIdStr := "" //personId := searchBody.Id id := []string{} if id != nil && len(id) > 0 { @@ -165,7 +165,7 @@ //浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉 //璇锋眰澶� localConf, err2 := cache.GetServerInfo() - if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" { + if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" { logger.Debug("localConfig is wrong!!!") return nil } @@ -188,7 +188,7 @@ isCollectStr + esTableIdStr + analyServerFilterStr + - "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+ + "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" + "]}}," + "{\"bool\":{\"filter\":[" + linkTagInfoCameraIdStr + @@ -198,13 +198,13 @@ linkTagInfoIsCollectStr + linkTagInfoEsTableIdStr + linkTagInfoAnalyServerFilterStr + - "{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}"+ + "{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" + "]}}" + - "]}}," + + "],\"minimum_should_match\":1}}," + "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," + "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" + "}" - logger.Debug("findEsData.param:",prama) + logger.Debug("findEsData.param:", prama) //鏁版嵁瑙f瀽 tokenRes := esutil.GetEsDataReq(url, prama, true) //fmt.Println(tokenRes) @@ -219,7 +219,7 @@ if masterInfo["linkTagInfo"] != nil { linkTagInfo := masterInfo["linkTagInfo"].([]interface{}) delete(masterInfo, "linkTagInfo") - if len(linkTagInfo) >0 { + if len(linkTagInfo) > 0 { slaveList := make([]interface{}, 0) slaveList = append(slaveList, masterInfo) slaveList = append(slaveList, linkTagInfo...) @@ -230,7 +230,7 @@ } } } else { - if _,ok := masterInfo["linkTagInfo"];ok { + if _, ok := masterInfo["linkTagInfo"]; ok { delete(masterInfo, "linkTagInfo") } sources["list"] = []interface{}{ -- Gitblit v1.8.0