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 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
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