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 | 143 ++++++++++++++++++++++++++++++++---------------
1 files changed, 97 insertions(+), 46 deletions(-)
diff --git a/router/router.go b/router/router.go
index 6425bd8..151d3d9 100644
--- a/router/router.go
+++ b/router/router.go
@@ -7,6 +7,7 @@
"github.com/szuecs/gin-glog"
"time"
"webserver/controllers"
+ "webserver/middlewares/auth"
_ "webserver/docs"
)
@@ -15,7 +16,7 @@
r := gin.Default()
r.Use(ginglog.Logger(3 * time.Second))
- //r.Use(auth.AuthHandler())//auth杩囨护鍣�
+ r.Use(auth.AuthHandler())//auth杩囨护鍣�
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
@@ -29,26 +30,43 @@
esSearchController := new(controllers.EsSearchController)
realTimeController := new(controllers.RealTimeController)
cameraTimeRuleController := new(controllers.CameraTimeruleController)
- polygonController :=new (controllers.CameraPolygonController)
- cameraTaskController :=new(controllers.CameraTaskController)
- cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
- dicController :=new(controllers.DictionaryController)
- userController :=new(controllers.UserController)
- eventPushController :=new(controllers.EventPushController)
+ polygonController := new(controllers.CameraPolygonController)
+ cameraTaskController := new(controllers.CameraTaskController)
+ cameraTaskArgsController := new(controllers.CameraTaskArgsController)
+ dicController := new(controllers.DictionaryController)
+ userController := new(controllers.UserController)
+ 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)
}
//鎽勫儚鏈虹鐞�
@@ -58,37 +76,41 @@
camera.PUT("/update", cameraController.CameraUpdate)
camera.DELETE("/del/:cid", cameraController.CameraDel)
camera.GET("/show/:cid", cameraController.CameraSel)
- camera.GET("/queryCameraAndTaskInfo", cameraController.QueryCameraAndTaskInfo)
+ camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl)
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("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
+ camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
+ camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
+ camera.POST("/changeRunType", cameraController.ChangeRunType)
}
- cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
+ cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
{
- cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
- cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
- cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
+ 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")
{
- cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
- cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
- cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
+ cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
+ cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
+ cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
}
- polygon := r.Group(urlPrefix+"/polygon")
+ polygon := r.Group(urlPrefix + "/polygon")
{
polygon.POST("/save", polygonController.Save)
polygon.GET("/findByCameraId", polygonController.FindByCameraId)
//polygon.GET("/delete", polygonController.Delete)
- polygon.GET("/updateDefenceStateByPolygonId",polygonController.UpdateDefenceStateByPolygonId)
- polygon.GET("/updateDefenceStateByCameraId",polygonController.UpdateDefenceStateByCameraId)
+ polygon.GET("/updateDefenceStateByPolygonId", polygonController.UpdateDefenceStateByPolygonId)
+ polygon.GET("/updateDefenceStateByCameraId", polygonController.UpdateDefenceStateByCameraId)
}
// 浠诲姟绠＄悊
@@ -97,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)
}
// 妫�绱� 鏌ヨ
@@ -116,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)
}
@@ -136,6 +163,10 @@
vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
+
+ vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
+ vdbperson.POST("/faceExtract",fileController.FaceExtract)
+ vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -147,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)
}
//绠楁硶搴撴搷浣�
@@ -156,8 +187,14 @@
{
sdkApi.POST("/saveSdk", sdkController.Save)
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
- sdkApi.GET("/findByTaskId",sdkController.FindByTaskId)
- sdkApi.GET("/getById",sdkController.GetById)
+ 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")
@@ -166,26 +203,40 @@
cameraTimeApi.GET("/delete", cameraTimeRuleController.Delete)
cameraTimeApi.GET("/findAll", cameraTimeRuleController.FindAll)
}
- dicApi :=r.Group(urlPrefix+"/dictionary")
+ dicApi := r.Group(urlPrefix + "/dictionary")
{
- dicApi.GET("/findByType",dicController.FindByType)
- dicApi.GET("/findByParentId",dicController.FindByParentId)
+ dicApi.GET("/findByType", dicController.FindByType)
+ dicApi.GET("/findByParentId", dicController.FindByParentId)
}
- eventPushApi :=r.Group(urlPrefix+"/eventPush")
+ eventPushApi := r.Group(urlPrefix + "/eventPush")
{
- eventPushApi.POST("/save",eventPushController.Save)
- eventPushApi.GET("/findByEventTopic",eventPushController.FindByEventTopic)
- eventPushApi.GET("/findAll",eventPushController.FindAll)
- eventPushApi.GET("/getById",eventPushController.GetById)
- eventPushApi.POST("/changeStatus",eventPushController.ChangeStatus)
- eventPushApi.POST("/delete",eventPushController.Delete)
+ eventPushApi.POST("/save", eventPushController.Save)
+ eventPushApi.GET("/findByEventTopic", eventPushController.FindByEventTopic)
+ eventPushApi.GET("/findAll", eventPushController.FindAll)
+ eventPushApi.GET("/getById", eventPushController.GetById)
+ eventPushApi.POST("/changeStatus", eventPushController.ChangeStatus)
+ eventPushApi.POST("/delete", eventPushController.Delete)
+ }
+ pollCApi := r.Group(urlPrefix + "/pollConfig")
+ {
+ pollCApi.POST("/savePollPeriod", pollConfigController.SavePollPeriod)
+ pollCApi.POST("/savePollDelay", pollConfigController.SavePollDelay)
+ 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") // 闈欐�佹枃浠�
//澶栭儴璁块棶swagger.json
r.StaticFile("/swagger.json", "./docs/swagger.json")
- fileController := new(controllers.FileController)
vdbperson.POST("/fileupload", fileController.Fileupload)
vdbperson.POST("/moreFileUpload", fileController.MoreFileUpload)
r.POST(urlPrefix+"/es/ImageUploadReturnPics", fileController.ImageUploadReturnPics)
--
Gitblit v1.8.0