From 9adc54d7d40a48a50ae04db81ae4fa58c9699742 Mon Sep 17 00:00:00 2001 From: liuxiaolong <736321739@qq.com> Date: 星期二, 18 六月 2019 14:28:16 +0800 Subject: [PATCH] add rules of cameraTaskArgs and linkTaskArgs --- controllers/cameraTask.go | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/controllers/cameraTask.go b/controllers/cameraTask.go index 4080663..7417413 100644 --- a/controllers/cameraTask.go +++ b/controllers/cameraTask.go @@ -6,6 +6,7 @@ "webserver/extend/util" "fmt" "github.com/gin-gonic/gin" + "webserver/models" ) type CameraTaskController struct { @@ -19,7 +20,7 @@ type CameraTaskVo struct { Id string `json:"id"` - CameraIds string `json:"camera_ids"` + CameraId string `json:"camera_id"` TaskId string `json:"task_id"` //浠诲姟id 鏉ヨ嚜浜庝换鍔¤〃 TimeRule string `json:"time_rule"` ReactRule string `json:"react_rule"` @@ -29,7 +30,7 @@ Enable int `json:"enable"` //榛樿鍚敤 Sort int `json:"sort"` //浠诲姟鎺掑簭 IsFull int `json:"is_full"` //鍙傛暟鏄惁璁剧疆瀹屾暣 - LinkGroupId string `json:"link_group_id"` //鑱斿姩浠诲姟缁� + LinkTaskId string `json:"link_task_id"` //鑱斿姩浠诲姟缁� } type CameraTaskSaveArg struct { @@ -63,6 +64,16 @@ GroupId string `json:"group_id"` } +type LinkCameraTasksVo struct { + +} + +type CameraTaskInfoVo struct { + Camera models.Camera `json:"camera"` + Tasks []models.Task `json:"tasks"` + Polygon CameraPolygonVo `json:"polygon"` +} + // @Summary 鏌ヨ鎵�鏈変换鍔� // @Description "鏌ヨ鎵�鏈変换鍔�" // @Accept json -- Gitblit v1.8.0