From ecf240e29e0ee8046db32ba1e63cf714155c2e1a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期一, 02 三月 2020 17:42:53 +0800
Subject: [PATCH] fix result
---
router/router.go | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/router/router.go b/router/router.go
index c8165f3..528e738 100644
--- a/router/router.go
+++ b/router/router.go
@@ -28,7 +28,7 @@
esSearchController := new(controllers.EsSearchController)
esManagementController := new(controllers.EsManagementController)
realTimeController := new(controllers.RealTimeController)
- clearDataController := new(controllers.ClearDataController)
+ deleteDataController := new(controllers.DeleteDataController)
cameraTimeRuleController := new(controllers.CameraTimeruleController)
polygonController := new(controllers.CameraPolygonController)
cameraTaskController := new(controllers.CameraTaskController)
@@ -45,6 +45,9 @@
licenseController := new(controllers.LicenseController)
fileAnalysisC := new(controllers.FileAnalysisController)
fileSettingC := new(controllers.FileAnalysisSettingController)
+ icController := new(controllers.InfoController)
+ gb28181C := new(controllers.Gb28181Controller)
+ fStackC := new(controllers.FileStackController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
@@ -91,6 +94,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")
{
@@ -98,6 +107,7 @@
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)
@@ -183,9 +193,9 @@
realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
}
//娓呯悊鏁版嵁
- clearData := r.Group(urlPrefix + "/clearData")
+ deleteData := r.Group(urlPrefix + "/clearData")
{
- clearData.POST("/clearEsData", clearDataController.ClearEsData)
+ deleteData.POST("/deleteEsData", deleteDataController.DeleteEsData)
}
//搴曞簱 鎿嶄綔
@@ -246,6 +256,11 @@
vsset.POST("/patchUpdate", ssController.PatchUpdate)
vsset.POST("/upgrade", ssController.Upgrade)
}
+
+ ic := r.Group(urlPrefix + "/info")
+ {
+ ic.GET("/getServerName", icController.GetServerName)
+ }
//绠楁硶搴撴搷浣�
sdkApi := r.Group(urlPrefix + "/sdk")
@@ -309,6 +324,7 @@
fileAnalyApi.POST("/updateStatus", fileAnalysisC.UpdateStatus)
fileAnalyApi.POST("/delete", fileAnalysisC.Delete)
fileAnalyApi.POST("/sortFile", fileAnalysisC.SortFile)
+ fileAnalyApi.GET("/findByStackId", fileAnalysisC.FindByStackId)
}
fileSettingApi := r.Group(urlPrefix + "/fileSetting")
{
@@ -316,6 +332,15 @@
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)
+ }
+
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
//澶栭儴璁块棶swagger.json
--
Gitblit v1.8.0