fix capture and initForData

liuxiaolong

2019-11-20 54db190de94c85def488620ba22efa34595fa3a1

 controllers/capture.go

@@ -56,14 +56,16 @@
   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\"}}}" +
      "]}}" +
      "]}}," +
      "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +