From 1b4337e04bc35c8b6f4931a5896f04884fef69c6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 02 七月 2020 15:18:43 +0800
Subject: [PATCH] fix AggregateTaskList

---
 router/router.go |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/router/router.go b/router/router.go
index 25c3e2b..255aa90 100644
--- a/router/router.go
+++ b/router/router.go
@@ -31,7 +31,7 @@
 	deleteDataController := new(controllers.DeleteDataController)
 	cameraTimeRuleController := new(controllers.CameraTimeruleController)
 	polygonController := new(controllers.CameraPolygonController)
-	//cameraTaskController := new(controllers.CameraTaskController)
+	cameraTaskController := new(controllers.CameraTaskController)
 	//cameraTaskArgsController := new(controllers.CameraTaskArgsController)
 	dicController := new(controllers.DictionaryController)
 	userController := new(controllers.UserController)
@@ -112,7 +112,7 @@
         camera.POST("/updateCameraArea", cameraController.UpdateCameraArea)
 		camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
 
-		//camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
+		camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
 		//camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
 
 		//camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
@@ -138,7 +138,7 @@
 	cameraRuleApi :=r.Group(urlPrefix+"/camera/rule")
 	{
 		cameraRuleApi.GET("/findByCameraId", cameraRuleController.FindByCameraId)
-		cameraRuleApi.GET("/deleteGroup/:groupId",cameraRuleController.DeleteByGroup)
+		cameraRuleApi.DELETE("/deleteGroup/:groupId",cameraRuleController.DeleteByGroup)
 		cameraRuleApi.POST("/getLinkRulesByCameraIds",cameraRuleController.GetLinkRulesByCameraIds)
 		cameraRuleApi.POST("/save", cameraRuleController.Save)
 		cameraRuleApi.POST("/saveLinkRulesByGroup",cameraRuleController.SaveLinkRulesByGroup)
@@ -292,6 +292,7 @@
 		sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
 		sdkApi.GET("/upload", sdkController.Upload)
 		sdkApi.POST("/upload", sdkController.UploadPack)
+		sdkApi.GET("/active", sdkController.Active)
 	}
 
 	//绠楁硶鍙傛暟

--
Gitblit v1.8.0