change time to [-60s,-40s]

liuxiaolong

2019-05-30 a27f1d9078dba3b11f0a3c1e536a2f98b64d250d

 esutil/EsClient.go

@@ -100,12 +100,17 @@
            source["race"] = prace
         }

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

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

         source["videoNum"] = getVideoUrl(source)

         picDateStr := (source["picDate"].(time.Time)).Format("2006-01-02 15:04:05")
         fmt.Println("picDate: ", picDateStr)
         picDate := source["picDate"].(string)
         lastIdx := strings.LastIndex(picDate,":")
         picDateStr := picDate[:lastIdx]
         if err == nil {
            source["picDate"] = picDateStr
         }
@@ -211,7 +216,7 @@

func getVideoUrl(source map[string]interface{}) (videoUrl string){
   imgKey := source["imgKey"].(string)
   picDte := source["picDate"].(string)//抓拍日期
   picDate := source["picDate"].(string)//抓拍日期
   cameraId := source["videoReqNum"].(string)//摄像机id
   indeviceId := source["indeviceid"].(string)//分析设备id
   deviceMap := make(map[string]string,0)
@@ -230,31 +235,41 @@
   reqUrl := deviceMap[indeviceId]
   paramMap := make(map[string]interface{},0)
   paramMap["imgKey"] = imgKey
   paramMap["picDate"] = picDte
   paramMap["picDate"] = picDate
   paramMap["videoNum"] = cameraId

   respBytes, err := doPostRequest(reqUrl, "application/json", paramMap, nil, nil)
   if err !=nil{
      return ""
   }

   var resp RespVideo
   err = json.Unmarshal(respBytes, &resp)
   if err !=nil {
      return ""
   }
   filePath := resp.FilePath

   filePath := resp.FilePath
   videoUrl = ""
   if !strings.Contains(filePath, "/cut"){
      return ""
      videoUrl = ""
      fmt.Printf("videoReqUrl:%s ,imgKey:%s ,picDate:%s ,cameraId:%s ,filePath:%s \n ",reqUrl,imgKey,picDate,cameraId,filePath)
   } else {
      strArr := strings.Split(filePath, "/cut")
      ngxUrl := ngxMap[indeviceId]
      if ngxUrl !="" && len(strArr) >0 {
         return ngxUrl + strArr[1]
         videoUrl = ngxUrl + strArr[1]
      }
   }

   return ""
   if videoUrl == ""{
      respMap := make(map[string]interface{},0)
      err := json.Unmarshal(respBytes, &respMap)
      if err !=nil {
         fmt.Println("resp UnmarshalToMap err: ",err)
      }
      fmt.Println("resp: ",respMap)
   }
   return videoUrl
}

type RespVideo struct{
@@ -267,11 +282,13 @@
      var err error
      bodyJson, err = json.Marshal(body)
      if err != nil {
         log.Log.Errorln("doPostRequestMarshal err:",err)
         return resultBytes, err
      }
   }
   request, err := http.NewRequest("POST", url, bytes.NewBuffer(bodyJson))
   if err != nil {
      log.Log.Errorln("NewRequest ERR:",err)
      return resultBytes, err
   }
   request.Header.Set("Content-type", contentType)
@@ -289,14 +306,19 @@
         request.Header.Add(key, val)
      }
   }
   client := &http.Client{}
   timeOut:= time.Duration(8*time.Second)//set request timeout
   client := &http.Client{
      Timeout:timeOut,
   }
   resp, err := client.Do(request)
   if err != nil {
      log.Log.Errorln("DoRequest ERR:",err)
      return resultBytes, err
   }
   defer resp.Body.Close()
   resultBytes, err = ioutil.ReadAll(resp.Body)
   if err != nil {
      log.Log.Errorln("ReadAll ERR:",err)
      return resultBytes, err
   }
   return resultBytes, nil
@@ -314,9 +336,12 @@
   url := fmt.Sprintf("%s%s%s", Eurl, index, "/_search")

   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\"]" +
   preSec := ""
   if sec > 40 {
      preSec = "-40s"
   }
   prama := "{\"query\":{\"bool\":{\"filter\":[{\"range\":{\"picDate\":{\"gte\":\"now+8h-" + seccond + "s\",\"lt\":\"now+8h"+preSec+"\"}}}]}},\"size\":\"1000\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"_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)