fix bug

liuxiaolong

2019-05-29 01a2fca7cf04babd139c6fad97c1e937fb1130f6

 esutil/EsClient.go

@@ -100,13 +100,18 @@
            source["race"] = prace
         }

         pGender, exist := source["Gender"]
         if exist {
            source["gender"] = pGender
         }

         source["ageDescription"] = getAgeDesc(source["Age"])

         source["videoNum"] = getVideoUrl(source)
         fmt.Println("BaseName: ", source["BaseName"])
         picDate := source["picDate"].(string)
         lastIdx := strings.LastIndex(picDate,":")
         picDateStr := picDate[lastIdx-1]
         fmt.Println("picDate: ", picDateStr)
         picDateStr := picDate[:lastIdx]
         if err == nil {
            source["picDate"] = picDateStr
         }
@@ -244,18 +249,19 @@
      return ""
   }
   filePath := resp.FilePath

   videoUrl = ""
   if !strings.Contains(filePath, "/cut"){
      return ""
      videoUrl = ""
   } else {
      strArr := strings.Split(filePath, "/cut")
      ngxUrl := ngxMap[indeviceId]
      if ngxUrl !="" && len(strArr) >0 {
         return ngxUrl + strArr[1]
         videoUrl = ngxUrl + strArr[1]
      }
   }

   return ""
   fmt.Println("videoReqUrl: ",reqUrl)
   fmt.Println("video: ",videoUrl)
   return videoUrl
}

type RespVideo struct{
@@ -317,7 +323,7 @@
   seccond := strconv.Itoa(sec)

   prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_source\":[\"baseInfo\",\"Gender\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
      "\"_source\":[\"baseInfo\",\"Gender\",\"BaseName\",\"Age\",\"personId\",\"personPicUrl\",\"indeviceName\",\"imgKey\",\"sdkType\",\"ageDescription\",\"indeviceid\",\"content\",\"Id\",\"picAddress\",\"picMaxUrl\",\"picDate\",\"Race\",\"videoNum\",\"picSmUrl\",\"taskName\",\"personIsHub\",\"idcard\",\"videoIp\",\"videoReqNum\"]" +
      "}"
   err, tokenRes := GetEsDataReq(url, prama, picurl, true)