From f4e8f206a6760bdc31734dfcb1c65916b5b76311 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 22 八月 2019 12:05:58 +0800
Subject: [PATCH] add cluster
---
router/router.go | 66 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/router/router.go b/router/router.go
index ebc84f1..151d3d9 100644
--- a/router/router.go
+++ b/router/router.go
@@ -38,20 +38,35 @@
eventPushController := new(controllers.EventPushController)
pollConfigController := new(controllers.PollConfigController)
fileController := new(controllers.FileController)
+ sysMenuController :=new(controllers.SysMenuController)
+ clusterController :=new(controllers.ClusterController)
+
+
+ sysApi := r.Group( "/data/api-u/sys")
+ {
+ sysApi.POST("/login",userController.Login)
+ sysApi.GET("/logout",userController.Logout)
+ sysApi.POST("refresh_token",userController.RefreshToken)
+ }
+ sysMenuApi := r.Group("/data/api-u/sysmenus")
+ {
+ sysMenuApi.GET("/me",sysMenuController.Me)
+ }
+ userApi := r.Group("/data/api-u/users")
+ {
+ userApi.GET("/current",userController.Current)
+ }
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- userApi := r.Group(urlPrefix + "/user")
- {
- userApi.POST("/login", userController.Login)
- }
//鍖哄煙绠＄悊
area := r.Group(urlPrefix + "/area")
{
area.GET("/localmenu", areaController.CameraTree)
+ area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
area.POST("/add", areaController.AreaAdd)
- area.GET("/del", areaController.AreaDelete)
- area.PUT("/update/:id", areaController.AreaUpdate)
+ area.POST("/del", areaController.AreaDelete)
+ area.POST("/update", areaController.AreaUpdate)
}
//鎽勫儚鏈虹鐞�
@@ -62,12 +77,11 @@
camera.DELETE("/del/:cid", cameraController.CameraDel)
camera.GET("/show/:cid", cameraController.CameraSel)
camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl)
- camera.GET("/queryCameraAndTaskInfo", cameraController.QueryCameraAndTaskInfo)
camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
- camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
+ camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
camera.POST("/saveTask", cameraController.CameraTaskSave)
camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
@@ -80,6 +94,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")
@@ -104,9 +119,13 @@
task.GET("/findAll", taskController.FindAll)
task.POST("/addTask", taskController.AddTask)
task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
- task.GET("/deleteTask", taskController.DeleteTask)
- task.GET("/addTaskSdk", taskController.AddTaskSdk)
- task.GET("/deleteTaskSdk", taskController.DeleteTaskSdk)
+ task.GET("/delete", taskController.DeleteTask)
+ task.POST("/addTaskSdk", taskController.AddTaskSdk)
+ task.GET("/delTaskSdk", taskController.DeleteTaskSdk)
+ task.POST("/updateTaskName", taskController.UpdateTaskName)
+ task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
+ task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
+ task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)
}
// 妫�绱� 鏌ヨ
@@ -123,14 +142,15 @@
{
realTime.POST("/capture", realTimeController.PostCapture)
realTime.POST("/monitoring", realTimeController.PostMonitoring)
- realTime.POST("/action", realTimeController.PostAction)
+ realTime.POST("/initForCaptureData", realTimeController.InitForCaptureData)
+ realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
}
//搴曞簱 鎿嶄綔
vdbtable := r.Group(urlPrefix + "/dbtable")
{
vdbtable.POST("/queryDbTables/:isSync", tableController.QueryDbTables)
vdbtable.POST("/updateDbTables", tableController.UpdateDbTables)
- vdbtable.POST("/deleteDBtablesById/:uuid", tableController.DeleteDbTables)
+ vdbtable.POST("/deleteDBtablesById/:id", tableController.DeleteDbTables)
vdbtable.PUT("/addDbTableInfo", tableController.AddDbTableInfo)
}
@@ -145,6 +165,8 @@
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
+ vdbperson.POST("/faceExtract",fileController.FaceExtract)
+ vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -156,8 +178,8 @@
vsset.POST("/videoLenEdit", ssController.VideoLenEdit)
vsset.GET("/getDevInfo", ssController.GetDevInfo)
vsset.POST("/saveDevInfo", ssController.SaveDevInfo)
- vsset.GET("/vSSLocalSettingShow", ssController.VSSLocalSettingShow)
- vsset.POST("/vSSLocalSettingEdit", ssController.VSSLocalSettingEdit)
+ vsset.GET("/gb28181ConfigShow", ssController.Gb28181ConfigShow)
+ vsset.POST("/gb28181ConfigEdit", ssController.Gb28181ConfigEdit)
}
//绠楁硶搴撴搷浣�
@@ -167,6 +189,12 @@
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
sdkApi.GET("/getById", sdkController.GetById)
+ }
+
+ //绠楁硶鍙傛暟
+ sdkArgApi :=r.Group(urlPrefix + "/sdkArg")
+ {
+ sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
}
cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -196,6 +224,14 @@
pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
}
+ clusterApi := r.Group(urlPrefix+"/cluster")
+ {
+ clusterApi.POST("/create", clusterController.Create)
+ clusterApi.POST("/search", clusterController.Search)
+ clusterApi.POST("/stopSearching", clusterController.StopSearching)
+ clusterApi.GET("/getSearchNodes", clusterController.GetSearchNodes)
+ clusterApi.POST("/joinCluster", clusterController.JoinCluster)
+ }
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
--
Gitblit v1.8.0