| go.mod | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| go.sum | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| router/router.go | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vo/cameraRule.go | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 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= 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") // 静态文件 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"` //摄像机id type CameraRuleBaseVo struct { CameraId string `json:"camera_id"` //摄像机id PolygonId string `json:"polygon_id"` //多边形id 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"` //排序 }
