add refresh token to resp

liuxiaolong

2020-06-05 7c811247ecf143e08c576986a884bedadc57dd66

 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)
@@ -84,12 +84,12 @@
   //esSize := strconv.Itoa(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
   //检索框
   if queryBody != "" {
      queryStr = "\"must\":[{\"multi_match\":{\"query\":\"" + queryBody + "\",\"fields\":[\"baseInfo.sex\",\"baseInfo.phoneNum.raw^1.5\",\"baseInfo.personName.raw^1.5\",\"alarmRules.alarmLevel^1.5\",\"alarmRules.linkInfo^3.0\",\"ageDescription^1.5\",\"taskName^1.5\",\"baseInfo.tableName^1.0\",\"sex^2.0\",\"race^2.0\",\"content^1.0\",\"baseInfo.idCard^1.8\",\"cameraAddr^2.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}}],"
   }

@@ -103,58 +103,69 @@
   gteDate := searchTime[0]
   lteDate := searchTime[1]

   //判断人员ID
   personIdStr := ""
   //判断数据ID
   idStr := ""
   linkTagInfoIdStr := ""
   //personId := searchBody.Id
   personId := []string{}
   if personId != nil && len(personId) > 0 {
      esPersonId := strings.Replace(strings.Trim(fmt.Sprint(personId), "[]"), " ", "\",\"", -1)
      personIdStr = "{\"terms\":{\"id\":[\"" + esPersonId + "\"]}},"
   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 := ""
   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 + "\"]}},"
   }

   //判断摄像机ID
   cameraIdStr := ""
   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
   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\":{\"baseInfo.tableId\":[\"" + esTableId + "\"]}},"
      linkTagInfoEsTableIdStr = "{\"terms\":{\"linkTagInfo.baseInfo.tableId\":[\"" + esTableId + "\"]}},"
   }
   //判断收藏状态
   isCollectStr := ""
   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\":[\"" + alarmLevelTypes + "\"]}},"
      alarmLevelStr = "{\"terms\":{\"alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
      linkTagInfoAlarmLevelStr = "{\"terms\":{\"linkTagInfo.alarmRules.alarmLevel.raw\":[\"" + alarmLevelTypes + "\"]}},"
   }

   //使用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
   }
@@ -162,60 +173,84 @@
      "/" + 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 +
      personIdStr +
      idStr +
      taskIdStr +
      isCollectStr +
      esTableIdStr +
      analyServerFilterStr +
      "{\"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\",\"isAlarm\",\"analyServerIp\",\"cameraId\",\"linkTag\",\"linkTagInfo\"]" +
      "{\"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\"]}" +
      "}"
   //logger.Debug("findEsData.param:",prama)
   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)

      if masterInfo["linkTagInfo"] != nil {
         linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
         if len(linkTagInfo) >0 {
            slaveList := make([]interface{}, 0)
            if _,ok := masterInfo["linkTagInfo"];ok {
               delete(masterInfo, "linkTagInfo")
            }
            slaveList = append(slaveList, masterInfo)
            slaveList = append(slaveList, linkTagInfo...)
            sources["list"] = slaveList
         } else {
            sources["list"] = []interface{}{}
         }
      } else {
         sources["list"] = []interface{}{}
      }
      if _,ok := masterInfo["linkTagInfo"];ok {
         delete(masterInfo, "linkTagInfo")
      }

      sources["activeObject"] = masterInfo

      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
}