From adb478c329c669f8709593d16dddffc0505e71ee Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期三, 10 七月 2019 16:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
router/router.go | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/router/router.go b/router/router.go
index ae84e3d..d0be2bd 100644
--- a/router/router.go
+++ b/router/router.go
@@ -62,6 +62,7 @@
area := r.Group(urlPrefix + "/area")
{
area.GET("/localmenu", areaController.CameraTree)
+ area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
area.POST("/add", areaController.AreaAdd)
area.POST("/del", areaController.AreaDelete)
area.POST("/update", areaController.AreaUpdate)
@@ -92,6 +93,7 @@
cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
+ cameraTaskArgsApi.POST("/updateDefenceStateByGroup",cameraTaskArgsController.UpdateDefenceStateByGroup)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
--
Gitblit v1.8.0