~suntianyu/webserver.git

			@@ -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\"}}]," +

			@@ -56,12 +56,12 @@

			prama := "{\"query\":{\"bool\":{\"should\":[" +
			"{\"bool\":{\"filter\":[" +
			"{\"term\":{\"isAlarm\":\"1\"}}," +
			"{\"term\":{\"isAlarm\":true}}," +
			cameraIdStr +
			analyServerFilterStr +
			"]}}," +
			"{\"bool\":{\"filter\":[" +
			"{\"term\":{\"isAlarm\":\"1\"}}," +
			"{\"term\":{\"isAlarm\":true}}," +
			linkTagInfoCameraIdStr +
			linkTagInfoAnalyServerFilterStr +
			"]}}" +

	controllers/capture.go	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	controllers/initForData.go	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史