~suntianyu/webserver.git

			@@ -521,8 +521,9 @@
			} else {
			arg.TableIds = []string{}
			}
			alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
			arg.Source = true // 标识来源是web
			arg.AlarmLevel = searchBody.AlarmLevel
			arg.AlarmLevel = alarmLevelTypes
			arg.Tasks = searchBody.Tasks
			arg.TreeNodes = searchBody.TreeNodes
			arg.Tabs = searchBody.Tabs
			@@ -607,8 +608,9 @@
			}
			localConf, err := cache.GetServerInfo()
			if err ==nil && localConf.AlarmIp != "" && localConf.ServerId != "" {
			alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
			arg.Source = true // 标识来源是web
			arg.AlarmLevel = searchBody.AlarmLevel
			arg.AlarmLevel = alarmLevelTypes
			arg.Tasks = searchBody.Tasks
			arg.TreeNodes = searchBody.TreeNodes
			arg.Tabs = searchBody.Tabs
			@@ -616,7 +618,7 @@
			arg.InputValue = searchBody.InputValue
			arg.Collection = searchBody.Collection
			arg.AnalyServerId = localConf.ServerId
			alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)

			captureIds := esApi.GetAllLocalVideopersonsId(arg, config.EsInfo.EsIndex.AiOcean.IndexName, localConf.AlarmIp, strconv.Itoa(int(localConf.AlarmPort)), alarmLevelTypes)
			logger.Debug("searchPhoto first Result.len:",len(*co.CompareData),"twice len(captureIds):",len(captureIds))
			if captureIds !=nil {

			@@ -8,7 +8,7 @@
			basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b // indirect
			basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 // indirect
			basic.com/pubsub/esutil.git v0.0.0-20191119123930-df4e05af6aee // indirect
			basic.com/pubsub/protomsg.git v0.0.0-20191120023735-365e964f300d // indirect
			basic.com/pubsub/protomsg.git v0.0.0-20191120085128-f0a55188a489 // indirect
			basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c // indirect
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
			basic.com/valib/goffmpeg.git v0.0.0-20191024085028-080acae08ec8 // indirect

			@@ -8,8 +8,8 @@
			basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
			basic.com/pubsub/esutil.git v0.0.0-20191119123930-df4e05af6aee h1:QJQ2Hvu310iz39WZEkFiJ1SUg8XXZZ2b4goncos++0s=
			basic.com/pubsub/esutil.git v0.0.0-20191119123930-df4e05af6aee/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
			basic.com/pubsub/protomsg.git v0.0.0-20191120023735-365e964f300d h1:p4HNkf4NYFiAmeOprQYwn6ZIVE60/P2gueelasBUgVQ=
			basic.com/pubsub/protomsg.git v0.0.0-20191120023735-365e964f300d/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
			basic.com/pubsub/protomsg.git v0.0.0-20191120085128-f0a55188a489 h1:dv7cAPunUZ2yn8GG/hu+31kzq1BtDJ60PyfyNtz+Rtc=
			basic.com/pubsub/protomsg.git v0.0.0-20191120085128-f0a55188a489/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
			basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c h1:aNujtcGxq0cNLSK08cCamAiUYiQ2/ZsUMNXbX2w8Clc=
			basic.com/valib/capture.git v0.0.0-20190924061718-7e98d8c98b3c/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
			basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=

	controllers/fileController.go	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	go.mod	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	go.sum	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史