liuxiaolong
2020-06-05 7c811247ecf143e08c576986a884bedadc57dd66
controllers/capture.go
@@ -44,9 +44,9 @@
   }
   //请求头
   localConf, err2 := cache.GetServerInfo()
   if err2 !=nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
   if err2 != nil || localConf.AlarmIp == "" || localConf.ServerId == "" {
      logger.Debug("localConfig is wrong!!!")
      util.ResponseFormat(c,code.ComError,"es config err")
      util.ResponseFormat(c, code.ComError, "es config err")
      return
   }
   url := "http://" + localConf.AlarmIp + ":" + strconv.Itoa(int(localConf.AlarmPort)) +
@@ -56,18 +56,22 @@
   linkTagInfoAnalyServerFilterStr := "{\"term\":{\"linkTagInfo.analyServerId\":\"" + localConf.ServerId + "\"}},"
   prama := "{\"query\":{\"bool\":{\"should\":[" +
      "{\"bool\":{\"filter\":[" +
      "{\"term\":{\"isAlarm\":\"1\"}}," +
      "{\"term\":{\"isAlarm\":true}}," +
      cameraIdStr +
      analyServerFilterStr +
      "{\"range\":{\"picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
      "]}}," +
      "{\"bool\":{\"filter\":[" +
      "{\"term\":{\"isAlarm\":\"1\"}}," +
      "{\"term\":{\"isAlarm\":true}}," +
      linkTagInfoCameraIdStr +
      linkTagInfoAnalyServerFilterStr +
      "]}}," +
      "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
      "]}}" +
      "],\"minimum_should_match\":1}}," +
      "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
      "\"size\":\"1000\"," +
      "\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}}"
   tokenRes := esutil.GetEsDataReq(url, prama, true)
   util.ResponseFormat(c, code.Success, tokenRes)
   tmpAllDate := esutil.ResponseData(tokenRes)
   util.ResponseFormat(c, code.Success, tmpAllDate)
}