~suntianyu/webserver.git

派生自 webserver

parent: de3917c9 | 补丁 | 提交 | ignore whitespace

liuxiaolong

2019-11-20 c070c02f3fcb8c2c8dfa1ffcadf72a4fb827a43a

back

3个文件已修改

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

 controllers/capture.go

@@ -64,6 +64,7 @@
        "{\"term\":{\"isAlarm\":\"1\"}}," +
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +

 controllers/initForData.go

@@ -64,6 +64,7 @@
        "{\"term\":{\"isAlarm\":\"1\"}}," +
        linkTagInfoCameraIdStr +
        linkTagInfoAnalyServerFilterStr +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"20\",\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +

 controllers/monitoring.go

@@ -72,6 +72,7 @@
        linkTagInfoTaskIdStr +
        linkTagInfoAnalyServerFilterStr +
        "{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
        "]}}" +
        "]}}," +
        "\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
        "\"size\":\"1000\"," +

			@@ -64,6 +64,7 @@
			"{\"term\":{\"isAlarm\":\"1\"}}," +
			linkTagInfoCameraIdStr +
			linkTagInfoAnalyServerFilterStr +
			"]}}" +
			"]}}," +
			"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
			"\"size\":\"1000\"," +

			@@ -72,6 +72,7 @@
			linkTagInfoTaskIdStr +
			linkTagInfoAnalyServerFilterStr +
			"{\"range\":{\"linkTagInfo.picDate\":{\"gte\":\"now+8h-15s\",\"lt\":\"now+8h\"}}}" +
			"]}}" +
			"]}}," +
			"\"sort\":[{\"picDate\":{\"order\":\"desc\"}}]," +
			"\"size\":\"1000\"," +