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 | 180 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 143 insertions(+), 37 deletions(-)
diff --git a/router/router.go b/router/router.go
index 4f3ee1e..ad2d12c 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,21 +1,18 @@
package router
import (
- "time"
"webserver/controllers"
"webserver/middlewares/auth"
"github.com/gin-gonic/gin"
- ginSwagger "github.com/swaggo/gin-swagger"
+ "github.com/swaggo/gin-swagger"
"github.com/swaggo/gin-swagger/swaggerFiles"
- ginglog "github.com/szuecs/gin-glog"
-
_ "webserver/docs"
)
func NewRouter() *gin.Engine {
r := gin.Default()
- r.Use(ginglog.Logger(3 * time.Second))
+ //r.Use(ginglog.Logger(3 * time.Second))
r.Use(auth.AuthHandler()) //auth杩囨护鍣�
@@ -28,12 +25,15 @@
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)
- cameraTaskArgsController := new(controllers.CameraTaskArgsController)
+ //cameraTaskArgsController := new(controllers.CameraTaskArgsController)
dicController := new(controllers.DictionaryController)
userController := new(controllers.UserController)
eventPushController := new(controllers.EventPushController)
@@ -42,7 +42,25 @@
sysMenuController := new(controllers.SysMenuController)
clusterController := new(controllers.ClusterController)
sysRoleController := new(controllers.RoleController)
- ptController := new(controllers.PanTiltController)
+ ptzController := new(controllers.PanTiltZoomController)
+ licenseController := new(controllers.LicenseController)
+ fileAnalysisC := new(controllers.FileAnalysisController)
+ fileSettingC := new(controllers.FileAnalysisSettingController)
+ icController := new(controllers.InfoController)
+ gb28181C := new(controllers.Gb28181Controller)
+ fStackC := new(controllers.FileStackController)
+ cameraRuleController := new (controllers.CameraRuleController)
+ rtc := new(controllers.RuleTemplateController)
+ voiceC := new(controllers.VoiceController)
+
+ urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
+
+ licenseApi := r.Group(urlPrefix + "/license")
+ {
+ licenseApi.POST("/getRegisterCode", licenseController.GetRegisterCode)
+ licenseApi.POST("/save", licenseController.Save)
+ licenseApi.GET("/show", licenseController.Show)
+ }
sysApi := r.Group("/data/api-u/sys")
{
@@ -65,9 +83,8 @@
userApi.GET("/findAllUser", userController.FindAllUser)
userApi.POST("/findById", userController.FindById)
userApi.POST("/saveAuth", userController.SaveAuth)
+ userApi.POST("/updatePwd", userController.UpdatePwd)
}
-
- urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
//鍖哄煙绠＄悊
area := r.Group(urlPrefix + "/area")
@@ -81,6 +98,12 @@
area.POST("/gb28181TreeDelete", areaController.Gb28181TreeDelete)
}
+ gbApi := r.Group(urlPrefix + "/gb28181")
+ {
+ gbApi.GET("/findAreaByParentId", gb28181C.FindAreaByParentId)
+ gbApi.GET("/newGbId", gb28181C.NewGbId)
+ }
+
//鎽勫儚鏈虹鐞�
camera := r.Group(urlPrefix + "/camera")
{
@@ -88,38 +111,58 @@
camera.PUT("/update", cameraController.CameraUpdate)
camera.DELETE("/del/:cid", cameraController.CameraDel)
camera.GET("/show/:cid", cameraController.CameraSel)
+ camera.POST("/updateCameraArea", cameraController.UpdateCameraArea)
camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
- camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
+ //camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
- camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
- camera.POST("/saveTask", cameraController.CameraTaskSave)
- camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
+ //camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
+ //camera.POST("/saveTask", cameraController.CameraTaskSave)
+ //camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
camera.POST("/changeRunType", cameraController.ChangeRunType)
camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
- camera.POST("/ptControl", ptController.Controlling)
+ camera.POST("/ptzControl", ptzController.Move)
camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+ camera.POST("/pasteRules", cameraRuleController.PasteRules)
}
- cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
+ rtcApi := r.Group(urlPrefix + "/template")
{
- cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
- cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
- cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
- cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
+ rtcApi.POST("/rule/save", rtc.Save)
+ rtcApi.GET("/rule/:id", rtc.Show)
+ rtcApi.DELETE("/rule/:id", rtc.Delete)
+ rtcApi.GET("/rule", rtc.FindAll)
+ }
+ cameraRuleApi :=r.Group(urlPrefix+"/camera/rule")
+ {
+ 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)
}
- cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
- {
- cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
- cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
- cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
- cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
- }
+ //cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
+ //{
+ // cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
+ // cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
+ // cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
+ // cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
+ //
+ // cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
+ //}
+
+ //cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
+ //{
+ // cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
+ // cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
+ // cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
+ // cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
+ //}
polygon := r.Group(urlPrefix + "/polygon")
{
@@ -133,26 +176,33 @@
// 浠诲姟绠＄悊
task := r.Group(urlPrefix + "/task")
{
- task.GET("/findAll", taskController.FindAll)
+ //task.GET("/findAll", taskController.FindAll)
task.GET("/aggregateTaskList", taskController.AggregateTaskList)
- task.POST("/addTask", taskController.AddTask)
- task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
- 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)
+ //task.POST("/addTask", taskController.AddTask)
+ //task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
+ //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)
+ //
+ //task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
}
- // 妫�绱� 鏌ヨ
+ // 妫�绱� 鏌ヨ 鑺傜偣鎿嶄綔
es := r.Group(urlPrefix + "/es")
{
es.POST("/tagList", esSearchController.PostEsTagList)
es.POST("/taskList", esSearchController.PostEsTaskList)
es.POST("/esSearch", esSearchController.PostEsSearch)
es.POST("/queryEsCompareData", controllers.PostEsCompareData)
+ es.POST("/getEsClusterInfo", esManagementController.GetEsClusterInfo)
+ es.POST("/addCluster", esManagementController.AddCluster)
+ es.POST("/createNode", esManagementController.CreateNode)
+ es.POST("/updateEsHosts", esManagementController.UpdateEsHosts)
+ es.POST("/getBuckets", bucketsController.GetBuckets)
}
//瀹炴椂琚皟鏁版嵁
@@ -163,6 +213,12 @@
realTime.POST("/initForCaptureData", realTimeController.InitForCaptureData)
realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
}
+ //娓呯悊鏁版嵁
+ deleteData := r.Group(urlPrefix + "/clearData")
+ {
+ deleteData.POST("/deleteEsData", deleteDataController.DeleteEsData)
+ }
+
//搴曞簱 鎿嶄綔
vdbtable := r.Group(urlPrefix + "/dbtable")
{
@@ -190,6 +246,10 @@
vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
+ vdbperson.POST("/move", dbPersonCont.Move)
+ vdbperson.POST("/copy", dbPersonCont.Copy)
+
+ vdbperson.POST("/multiUploadCarNo", dbPersonCont.MultiUploadCarNo)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -212,6 +272,17 @@
vsset.GET("/reboot", ssController.RebootOS)
vsset.GET("/rebootTask", ssController.GetRebootTask)
vsset.POST("/rebootTask", ssController.SetRebootTask)
+
+ vsset.GET("/getResourceConfig", ssController.GetResourceConfig)
+ vsset.POST("/saveResourceConfig", ssController.SaveResourceConfig)
+ vsset.GET("/patchUpdate", ssController.PatchUpdateCheck)
+ vsset.POST("/patchUpdate", ssController.PatchUpdate)
+ vsset.POST("/upgrade", ssController.Upgrade)
+ }
+
+ ic := r.Group(urlPrefix + "/info")
+ {
+ ic.GET("/getServerName", icController.GetServerName)
}
//绠楁硶搴撴搷浣�
@@ -222,6 +293,11 @@
sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
sdkApi.GET("/getById", sdkController.GetById)
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)
}
//绠楁硶鍙傛暟
@@ -256,6 +332,7 @@
pollCApi.POST("/savePollDelay", pollConfigController.SavePollDelay)
pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
+ pollCApi.POST("/updateChannelCount", pollConfigController.UpdateChannelCount)
}
clusterApi := r.Group(urlPrefix + "/cluster")
{
@@ -269,7 +346,36 @@
clusterApi.POST("/updateClusterName", clusterController.UpdateClusterName)
clusterApi.POST("/leave", clusterController.Leave)
}
+ fileAnalyApi := r.Group(urlPrefix + "/fileAnalysis")
+ {
+ fileAnalyApi.GET("/findAllFile", fileAnalysisC.FindAllFile)
+ fileAnalyApi.POST("/updateStatus", fileAnalysisC.UpdateStatus)
+ fileAnalyApi.POST("/delete", fileAnalysisC.Delete)
+ fileAnalyApi.POST("/sortFile", fileAnalysisC.SortFile)
+ fileAnalyApi.GET("/findByStackId", fileAnalysisC.FindByStackId)
+ fileAnalyApi.POST("/move", fileAnalysisC.Move)
+ fileAnalyApi.POST("/rename", fileAnalysisC.Rename)
+ fileAnalyApi.POST("/copy", fileAnalysisC.Copy)
+ }
+ fileSettingApi := r.Group(urlPrefix + "/fileSetting")
+ {
+ fileSettingApi.GET("/show", fileSettingC.Show)
+ fileSettingApi.POST("/changeEnable", fileSettingC.ChangeEnable)
+ }
+
+ fStackApi := r.Group(urlPrefix +"/fileStack")
+ {
+ fStackApi.GET("/findAllByPage",fStackC.FindAllByPage)
+ fStackApi.POST("/save",fStackC.Save)
+ fStackApi.GET("/show/:id", fStackC.Show)
+ 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