From 9d88c7c467f8d93af4aab9ba0b6d6c01c2ffc546 Mon Sep 17 00:00:00 2001 From: sunty <1172534965@qq.com> Date: 星期四, 20 八月 2020 20:35:30 +0800 Subject: [PATCH] add get buckets contrl --- router/router.go | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/router/router.go b/router/router.go index 8b84be7..ad2d12c 100644 --- a/router/router.go +++ b/router/router.go @@ -25,13 +25,14 @@ dbPersonCont := new(controllers.DbPersonController) ssController := new(controllers.SysSetController) sdkController := new(controllers.SdkController) + bucketsController := new(controllers.Buckers) esSearchController := new(controllers.EsSearchController) esManagementController := new(controllers.EsManagementController) realTimeController := new(controllers.RealTimeController) 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 +51,7 @@ fStackC := new(controllers.FileStackController) cameraRuleController := new (controllers.CameraRuleController) rtc := new(controllers.RuleTemplateController) + voiceC := new(controllers.VoiceController) urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑 @@ -96,11 +98,11 @@ area.POST("/gb28181TreeDelete", areaController.Gb28181TreeDelete) } - gbApi := r.Group(urlPrefix + "/gb28181") - { - gbApi.GET("/findAreaByParentId", gb28181C.FindAreaByParentId) - gbApi.GET("/newGbId",gb28181C.NewGbId) - } + gbApi := r.Group(urlPrefix + "/gb28181") + { + gbApi.GET("/findAreaByParentId", gb28181C.FindAreaByParentId) + gbApi.GET("/newGbId", gb28181C.NewGbId) + } //鎽勫儚鏈虹鐞� camera := r.Group(urlPrefix + "/camera") @@ -109,10 +111,10 @@ camera.PUT("/update", cameraController.CameraUpdate) camera.DELETE("/del/:cid", cameraController.CameraDel) camera.GET("/show/:cid", cameraController.CameraSel) - camera.POST("/updateCameraArea", cameraController.UpdateCameraArea) + 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) @@ -125,7 +127,7 @@ camera.POST("/ptzControl", ptzController.Move) camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo) - //camera.POST("/pasteRules", cameraTaskController.PasteRules) + camera.POST("/pasteRules", cameraRuleController.PasteRules) } rtcApi := r.Group(urlPrefix + "/template") @@ -137,8 +139,8 @@ } cameraRuleApi :=r.Group(urlPrefix+"/camera/rule") { - cameraRuleApi.GET("/:cameraId", cameraRuleController.FindByCameraId) - cameraRuleApi.GET("/deleteGroup/:groupId",cameraRuleController.DeleteByGroup) + cameraRuleApi.GET("/findByCameraId", cameraRuleController.FindByCameraId) + cameraRuleApi.DELETE("/deleteGroup/:groupId",cameraRuleController.DeleteByGroup) cameraRuleApi.POST("/getLinkRulesByCameraIds",cameraRuleController.GetLinkRulesByCameraIds) cameraRuleApi.POST("/save", cameraRuleController.Save) cameraRuleApi.POST("/saveLinkRulesByGroup",cameraRuleController.SaveLinkRulesByGroup) @@ -200,6 +202,7 @@ es.POST("/addCluster", esManagementController.AddCluster) es.POST("/createNode", esManagementController.CreateNode) es.POST("/updateEsHosts", esManagementController.UpdateEsHosts) + es.POST("/getBuckets", bucketsController.GetBuckets) } //瀹炴椂琚皟鏁版嵁 @@ -277,10 +280,10 @@ vsset.POST("/upgrade", ssController.Upgrade) } - ic := r.Group(urlPrefix + "/info") - { - ic.GET("/getServerName", icController.GetServerName) - } + ic := r.Group(urlPrefix + "/info") + { + ic.GET("/getServerName", icController.GetServerName) + } //绠楁硶搴撴搷浣� sdkApi := r.Group(urlPrefix + "/sdk") @@ -292,6 +295,9 @@ sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad) sdkApi.GET("/upload", sdkController.Upload) sdkApi.POST("/upload", sdkController.UploadPack) + sdkApi.POST("/showInstallInfo", sdkController.ShowInstallInfo) + sdkApi.POST("/install", sdkController.Install) + sdkApi.GET("/active", sdkController.Active) } //绠楁硶鍙傛暟 @@ -366,7 +372,10 @@ 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") // 闈欐�佹枃浠� //澶栭儴璁块棶swagger.json -- Gitblit v1.8.0