From 7c811247ecf143e08c576986a884bedadc57dd66 Mon Sep 17 00:00:00 2001 From: liuxiaolong <liuxiaolong@aiotlink.com> Date: 星期五, 05 六月 2020 18:29:41 +0800 Subject: [PATCH] add refresh token to resp --- controllers/esSearch.go | 210 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 180 insertions(+), 30 deletions(-) diff --git a/controllers/esSearch.go b/controllers/esSearch.go index 5e6a0fd..194b4d1 100644 --- a/controllers/esSearch.go +++ b/controllers/esSearch.go @@ -1,19 +1,23 @@ package controllers import ( + "basic.com/dbapi.git" + "basic.com/valib/logger.git" "fmt" + "github.com/gin-gonic/gin" "strconv" "strings" - - "github.com/gin-gonic/gin" + "webserver/cache" "webserver/extend/code" "webserver/extend/config" "webserver/extend/esutil" "webserver/extend/util" + "webserver/models" ) type EsSearchController struct{} +// @Security ApiKeyAuth // @Summary 妫�绱� // @Description 淇℃伅妫�绱㈠拰姣斿妫�绱� // @Accept json @@ -24,84 +28,230 @@ // @Failure 500 {string} json "{"code":500, msg:"杩斿洖閿欒淇℃伅", success:false}" // @Router /data/api-v/es/esSearch [POST] func (sc *EsSearchController) PostEsSearch(c *gin.Context) { - searchBody := make(map[string]interface{}, 0) + //searchBody := make(map[string]interface{}, 0) + //c.BindJSON(&searchBody) + //data := findEsData(searchBody) - c.BindJSON(&searchBody) + var arg models.EsSearch + err := c.BindJSON(&arg) + if err != nil || arg.Page <= 0 && arg.Size <= 0 { + util.ResponseFormat(c, code.RequestParamError, "鍙傛暟鏈夎") + return + } + data := findEsData(&arg) - data := findEsData(searchBody) util.ResponseFormat(c, code.Success, data) } -func findEsData(searchBody map[string]interface{}) map[string]interface{} { - webPage := int(searchBody["page"].(float64)) +//鑾峰彇鐩戞帶绛夌骇 +func getAlarmLevel(alarmlevel []int32) []string { + d := dbapi.DicApi{} + res, data := d.FindByType("ALARMLEVEL") + if data == nil { + logger.Debug("data is nil") + } + logger.Debug(res) + // logger.Debug(data) + alarmLevel := make(map[int32]string) + tmp := data.(map[string]interface{}) + for _, value := range tmp["ALARMLEVEL"].([]interface{}) { + // logger.Debug(value.(map[string]interface{})["value"]," ",value.(map[string]interface{})["name"]) + val := value.(map[string]interface{})["value"].(string) + name := value.(map[string]interface{})["name"].(string) + vl, err := strconv.Atoi(val) + if err != nil { + logger.Debug(err) + } + alarmLevel[int32(vl)] = name + } + alarmLevelRes := make([]string, len(alarmlevel)) + for i, v := range alarmlevel { + if v < 0 { + alarmLevelRes[i] = "鎾ら槻" + } else { + alarmLevelRes[i] = alarmLevel[v] + } + } + return alarmLevelRes +} - webSize := int(searchBody["size"].(float64)) +func findEsData(searchBody *models.EsSearch) map[string]interface{} { + webPage := searchBody.Page + + webSize := searchBody.Size from := strconv.Itoa((webPage - 1) * webSize) //esFrom := strconv.Itoa(from) //esSize := strconv.Itoa(webSize) - size := strconv.Itoa(webPage * webSize) + size := strconv.Itoa(webSize) //璇锋眰绱㈠紩 - index := config.EsInfo.EsIndex.VideoPersons.IndexName + "," + config.EsInfo.EsIndex.Personaction.IndexName + index := config.EsInfo.EsIndex.AiOcean.IndexName queryStr := "" - queryBody := searchBody["inputValue"].(string) + queryBody := searchBody.InputValue //妫�绱㈡ if queryBody != "" { - queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"alarmRules.alarmLevel^1.5\",\"ageDescription^1.5\",\"taskName^1.5\",\"tableName^1.5\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"idCard^1.8\",\"cameraAddr^1.0\"]," + + queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"cameraAddr^1.5\",\"taskName^1.5\",\"sdkName^1.5\",\"showLabels^3.0\",\"baseInfo.tableName^1.5\",\"baseInfo.targetName^1.5\",\"baseInfo.labels^1.5\",\"alarmRules.alarmLevel^1.5\",\"linkTag^1.5\",\"linkTagInfo.cameraAddr\",\"linkTagInfo.taskName^1.5\",\"linkTagInfo.sdkName^1.5\",\"linkTagInfo.showLabels^1.5\",\"linkTagInfo.baseInfo.tableName^1.5\",\"linkTagInfo.baseInfo.targetName^1.5\",\"linkTagInfo.baseInfo.labels^1.5\",\"linkTagInfo.alarmRules.alarmLevel^1.5\"]," + "\"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}}]," } - gteDate := searchBody["searchTime"].([]interface{})[0].(string) - lteDate := searchBody["searchTime"].([]interface{})[1].(string) + + searchTime := searchBody.SearchTime + if searchTime == nil || len(searchTime) < 2 { + info := make(map[string]interface{}, 0) + info["err"] = "璇疯緭鍏ユ椂闂磋寖鍥�" + return info + } + + gteDate := searchTime[0] + lteDate := searchTime[1] + + //鍒ゆ柇鏁版嵁ID + idStr := "" + linkTagInfoIdStr := "" + //personId := searchBody.Id + id := []string{} + if id != nil && len(id) > 0 { + esId := strings.Replace(strings.Trim(fmt.Sprint(id), "[]"), " ", "\",\"", -1) + idStr = "{\"terms\":{\"id\":[\"" + esId + "\"]}}," + linkTagInfoIdStr = "{\"terms\":{\"linkTagInfo.id\":[\"" + esId + "\"]}}," + } + //鍒ゆ柇浠诲姟ID taskIdStr := "" - taskId := searchBody["tasks"].([]interface{}) + linkTagInfoTaskIdStr := "" + taskId := searchBody.Tasks if taskId != nil && len(taskId) > 0 { esTaskId := strings.Replace(strings.Trim(fmt.Sprint(taskId), "[]"), " ", "\",\"", -1) taskIdStr = "{\"terms\":{\"taskId\":[\"" + esTaskId + "\"]}}," + linkTagInfoTaskIdStr = "{\"terms\":{\"linkTagInfo.taskId\":[\"" + esTaskId + "\"]}}," } + //鍒ゆ柇鎽勫儚鏈篒D cameraIdStr := "" - cameraId := searchBody["treeNodes"].([]interface{}) + linkTagInfoCameraIdStr := "" + cameraId := searchBody.TreeNodes if cameraId != nil && len(cameraId) > 0 { esCameraId := strings.Replace(strings.Trim(fmt.Sprint(cameraId), "[]"), " ", "\",\"", -1) cameraIdStr = "{\"terms\":{\"cameraId\":[\"" + esCameraId + "\"]}}," + linkTagInfoCameraIdStr = "{\"terms\":{\"linkTagInfo.cameraId\":[\"" + esCameraId + "\"]}}," } //鍒ゆ柇搴撹〃ID - tableId := searchBody["tabs"].([]interface{}) + tableId := searchBody.Tabs esTableId := "" esTableIdStr := "" + linkTagInfoEsTableIdStr := "" if tableId != nil && len(tableId) > 0 { esTableId = strings.Replace(strings.Trim(fmt.Sprint(tableId), "[]"), " ", "\",\"", -1) - index = config.EsInfo.EsIndex.VideoPersons.IndexName - esTableIdStr = "{\"terms\":{\"tableId\":[\"" + esTableId + "\"]}}," + esTableIdStr = "{\"terms\":{\"baseInfo.tableId\":[\"" + esTableId + "\"]}}," + linkTagInfoEsTableIdStr = "{\"terms\":{\"linkTagInfo.baseInfo.tableId\":[\"" + esTableId + "\"]}}," } + //鍒ゆ柇鏀惰棌鐘舵�� isCollectStr := "" - isCollect := searchBody["collection"].(string) + linkTagInfoIsCollectStr := "" + isCollect := searchBody.Collection if isCollect != "" { - isCollectStr = "{\"term\":{\"isCollect\":\"" + isCollect + "\"}}," + isCollectStr = "{\"term\":{\"isCollect\":" + isCollect + "}}," + linkTagInfoIsCollectStr = "{\"term\":{\"linkTagInfo.isCollect\":" + isCollect + "}}," + } + //鍒ゆ柇甯冮槻绛夌骇id + alarmLevelId := searchBody.AlarmLevel + alarmLevelStr := "" + linkTagInfoAlarmLevelStr := "" + if len(alarmLevelId) > 0 { + alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(alarmLevelId)), "[]"), " ", "\",\"", -1) + alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}}," + linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}}," } //浣跨敤es搴曞眰鏈哄埗澶勭悊鍒嗛〉 //璇锋眰澶� - url := "http://" + config.EsInfo.Masterip + ":" + config.EsInfo.Httpport + + localConf, err2 := cache.GetServerInfo() + if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" { + logger.Debug("localConfig is wrong!!!") + return nil + } + url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) + "/" + index + "/_search?search_type=dfs_query_then_fetch" + + analyServerFilterStr := "{\"term\":{\"analyServerId\":\"" + localConf.ServerId + "\"}}," + linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}}," + //璇锋眰浣� prama := "{\"from\":\"" + from + "\"," + "\"size\":\"" + size + "\"," + "\"query\":{\"bool\":{" + queryStr + - "\"filter\":[" + + "\"should\":[" + + "{\"bool\":{\"filter\":[" + cameraIdStr + + alarmLevelStr + + idStr + taskIdStr + isCollectStr + esTableIdStr + - "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}]}}," + - "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," + - "\"_source\":[\"baseInfo\",\"alarmRules\",\"sex\",\"analyServerName\",\"sdkName\",\"ageDescription\",\"content\",\"id\",\"cameraAddr\",\"picMaxUrl\",\"picDate\",\"race\",\"videoUrl\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"isAlarm\",\"analyServerIp\",\"cameraId\"]" + + analyServerFilterStr + + "{\"range\":{\"picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" + + "]}}," + + "{\"bool\":{\"filter\":[" + + linkTagInfoCameraIdStr + + linkTagInfoAlarmLevelStr + + linkTagInfoIdStr + + linkTagInfoTaskIdStr + + linkTagInfoIsCollectStr + + linkTagInfoEsTableIdStr + + linkTagInfoAnalyServerFilterStr + + "{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" + + "]}}" + + "],\"minimum_should_match\":1}}," + + "\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"updateTime\":{\"order\":\"desc\"}}]," + + "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" + "}" - fmt.Println(prama) + logger.Debug("findEsData.param:", prama) //鏁版嵁瑙f瀽 tokenRes := esutil.GetEsDataReq(url, prama, true) - return tokenRes + 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"] + return tmpAllDate } //sdkTYype瀛楀吀"\"_source\":[\"BaseName\",\"Gender\",\"Race\",\"content\",\"idcard\",\"picAddress\",\"picDate\",\"sdkType\",\"Age\",\"personId\",\"personIsHub\",\"personPicUrl\",\"picLocalUrl\",\"picSmUrl\",\"videoIp\",\"videoNum\",\"cameraId\",\"ageDescription\",\"likePer\"]" + @@ -119,7 +269,7 @@ tokenRes := esutil.GetEsDataReq(url, prama, true) personRes := make(map[string]string) - //fmt.Println(tokenRes["datalist"].([]interface{})) + //logger.Debug(tokenRes["datalist"].([]interface{})) result := tokenRes["datalist"].([]interface{}) for _, value := range result { userMap := value.(map[string]interface{}) @@ -141,7 +291,7 @@ // personRes["phoneNum"] = value.(map[string]interface{})["phoneNum"].(string) // personRes["sex"] = value.(map[string]interface{})["sex"].(string) } - //fmt.Println(personRes) + //logger.Debug(personRes) if len(personRes) < 1 { personRes["personName"] = "" personRes["phoneNum"] = "" -- Gitblit v1.8.0