From 56c5e906cfe795773411df351dd90fcf216d58f7 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 20 十一月 2019 16:58:38 +0800
Subject: [PATCH] update protomsg and change alarmLevel to string
---
controllers/fileController.go | 8 +++++---
go.sum | 4 ++--
go.mod | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index d66b079..ece1355 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -521,8 +521,9 @@
} else {
arg.TableIds = []string{}
}
+ alarmLevelTypes := strings.Replace(strings.Trim(fmt.Sprint(getAlarmLevel(searchBody.AlarmLevel)), "[]"), " ", "\",\"", -1)
arg.Source = true // 鏍囪瘑鏉ユ簮鏄痺eb
- 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 // 鏍囪瘑鏉ユ簮鏄痺eb
- 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 {
diff --git a/go.mod b/go.mod
index 857c505..0ec518d 100644
--- a/go.mod
+++ b/go.mod
@@ -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
diff --git a/go.sum b/go.sum
index 5d0c8ed..31e306e 100644
--- a/go.sum
+++ b/go.sum
@@ -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=
--
Gitblit v1.8.0