From 6260cd81f96790acf7805684d901611d7524bb09 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 13 七月 2020 17:36:48 +0800
Subject: [PATCH] SDK rules use new SdkSet
---
vo/cameraRule.go | 31 +++++++++++++++++++------------
go.sum | 8 ++++----
go.mod | 4 ++--
router/router.go | 6 ++++++
4 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/go.mod b/go.mod
index a61fde1..fc65dfe 100644
--- a/go.mod
+++ b/go.mod
@@ -3,12 +3,12 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20200629113928-48f75270f4e1 // indirect
+ basic.com/dbapi.git v0.0.0-20200713073800-5e7865c0c5eb // indirect
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b
basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777
- basic.com/pubsub/protomsg.git v0.0.0-20200706101104-913697091eb8 // indirect
+ basic.com/pubsub/protomsg.git v0.0.0-20200713085214-77b39d234dcc // indirect
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051
basic.com/valib/godraw.git v0.0.0-20191122082247-26e9987cd183
diff --git a/go.sum b/go.sum
index 0aa331c..c3036b6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-basic.com/dbapi.git v0.0.0-20200629113928-48f75270f4e1 h1:oLvAJwTd0jRQnfs39bNjoaaKoesBjS/yNjAjXt+ZPNk=
-basic.com/dbapi.git v0.0.0-20200629113928-48f75270f4e1/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
+basic.com/dbapi.git v0.0.0-20200713073800-5e7865c0c5eb h1:jfnAwVU85zmkcbPjyJe3Qw9EqrHXBOPa/o8CJ9vP0hc=
+basic.com/dbapi.git v0.0.0-20200713073800-5e7865c0c5eb/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb h1:fM6DojeInFSCFO+wkba1jtyPiSDqw0jYKi4Tk+e+ka4=
basic.com/fileServer/WeedFSClient.git v0.0.0-20190919054037-0182b6c3f5cb/go.mod h1:FTryK8BsVLfUplx8a3+l8hJWub6VbAWZCUH7sPRZaso=
basic.com/gb28181api.git v0.0.0-20191028082253-472438a8407b h1:Qh7x2PY3HA9B404Llq+olY5/YlGYrM58bpOHa2CGcro=
@@ -10,8 +10,8 @@
basic.com/pubsub/esutil.git v0.0.0-20191120125514-865efa73a9ae/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777 h1:gTeuhepfLgOchD6bqydsGGV6KCj/UaseQQgo4DFyhGQ=
basic.com/pubsub/esutil.git v0.0.0-20200114073900-ad9de8362777/go.mod h1:yIvppFPFGC61DOdm71ujnsxZBMFUu2yKjr5O43bMWCw=
-basic.com/pubsub/protomsg.git v0.0.0-20200706101104-913697091eb8 h1:lTaBOcOUHJ9ewFy/n4Q5eKm4t3VqP4MljjSgtS+DFPk=
-basic.com/pubsub/protomsg.git v0.0.0-20200706101104-913697091eb8/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
+basic.com/pubsub/protomsg.git v0.0.0-20200713085214-77b39d234dcc h1:fk0XKrb+m14UVRRA2T9sHhL+7KoT5AN5lPyL3NY4QsY=
+basic.com/pubsub/protomsg.git v0.0.0-20200713085214-77b39d234dcc/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe h1:uh3u7DuSOw6AwzvPC1EM19sw1Skks1EUJddcbHDKI9M=
basic.com/valib/capture.git v0.0.0-20191204103802-89c923cf2abe/go.mod h1:y+h7VUnoSQ3jOtf2K3twXNA8fYDfyUsifSswcyKLgNw=
basic.com/valib/deliver.git v0.0.0-20190531095353-25d8c3b20051/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
diff --git a/router/router.go b/router/router.go
index 744da1b..320484f 100644
--- a/router/router.go
+++ b/router/router.go
@@ -50,6 +50,7 @@
fStackC := new(controllers.FileStackController)
cameraRuleController := new (controllers.CameraRuleController)
rtc := new(controllers.RuleTemplateController)
+ voiceC := new(controllers.VoiceController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
@@ -368,6 +369,11 @@
fStackApi.POST("/changeEnable", fStackC.ChangeEnable)
fStackApi.DELETE("/delete/:id", fStackC.Delete)
}
+ voiceApi := r.Group(urlPrefix + "/voice")
+ {
+ voiceApi.GET("/findAll", voiceC.FindAll)
+ }
+
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
diff --git a/vo/cameraRule.go b/vo/cameraRule.go
index a1cd61d..24040cf 100644
--- a/vo/cameraRule.go
+++ b/vo/cameraRule.go
@@ -31,10 +31,10 @@
CameraNames string `json:"camera_names"`
Id string `json:"id" example:"缁勮鍒欑殑id"`
- GroupText string `json:"group_text" binding:"required"`
- AlarmLevel int `json:"alarm_level"`
- Rules []CameraRuleBase `json:"rules" binding:"required"`
- SetType string `json:"set_type"`
+ GroupText string `json:"group_text" binding:"required"`
+ AlarmLevel int `json:"alarm_level"`
+ Rules []CameraRuleBaseVo `json:"rules" binding:"required"`
+ SetType string `json:"set_type"`
TemplateId string `json:"template_id"`
TimeRuleId string `json:"time_rule_id"` //鏃堕棿娈�
@@ -43,15 +43,22 @@
Enable bool `json:"enable"`
}
-type CameraRuleBase struct {
- CameraId string `json:"camera_id"` //鎽勫儚鏈篿d
+type CameraRuleBaseVo struct {
+ CameraId string `json:"camera_id"` //鎽勫儚鏈篿d
PolygonId string `json:"polygon_id"` //澶氳竟褰d
- SdkId string `json:"sdk_id"` //绠楁硶id
- SdkArgAlias string `json:"sdk_arg_alias"` //绠楁硶鍙傛暟鍒悕
- Operator string `json:"operator"` //璁＄畻鏂瑰紡=,>,>=绛夌瓑
- OperatorType string `json:"operator_type"` //璁＄畻鐨勫�肩被鍨�
- SdkArgValue string `json:"sdk_arg_value"` //绠楁硶鍙傛暟鍊艰缃�
- Sort int `json:"sort"` //鎺掑簭
+ SdkId string `json:"sdk_id"` //绠楁硶閰嶇疆
+ SdkSet []TemplateArg `json:"sdk_set"`
+
RuleWithPre string `json:"rule_with_pre"` //涓庝笂涓�鏉¤褰曠殑閫昏緫杩愮畻瑙勫垯锛�&&,||锛�
+ IsSaveAnyhow bool `json:"is_save_anyhow"`
GroupId string `json:"group_id"` //鍒嗙粍id
+ Sort int `json:"sort"` //鎺掑簭
+}
+
+type TemplateArg struct {
+ SdkArgAlias string `json:"sdk_arg_alias"` //绠楁硶鍙傛暟鍒悕
+ Operator string `json:"operator"` //璁＄畻鏂瑰紡=,>,>=绛夌瓑
+ OperatorType string `json:"operator_type"` //璁＄畻鐨勫�肩被鍨�
+ SdkArgValue string `json:"sdk_arg_value"` //绠楁硶鍙傛暟鍊艰缃�
+ Sort int `json:"sort"` //鎺掑簭
}
\ No newline at end of file
--
Gitblit v1.8.0