From aaa7697d6ec77e03d96ce36ca66abcbbcf2bb7a3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 12:03:33 +0800
Subject: [PATCH] add ruleSo

---
 router/router.go |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/router/router.go b/router/router.go
index cb4f029..320484f 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)
@@ -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 娣诲姞 璺緞 鍓嶇紑
 
@@ -112,7 +113,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)
@@ -292,6 +293,8 @@
 		sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
 		sdkApi.GET("/upload", sdkController.Upload)
 		sdkApi.POST("/upload", sdkController.UploadPack)
+		sdkApi.POST("/install", sdkController.Install)
+		sdkApi.GET("/active", sdkController.Active)
 	}
 
 	//绠楁硶鍙傛暟
@@ -366,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") // 闈欐�佹枃浠�

--
Gitblit v1.8.0