From 2c84a93c4faad5e09900fc71f045a181bdb313a6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 05 三月 2020 18:55:26 +0800
Subject: [PATCH] fix
---
router/router.go | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/router/router.go b/router/router.go
index 05180ce..528e738 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杩囨护鍣�
@@ -31,6 +28,7 @@
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)
@@ -45,10 +43,15 @@
sysRoleController := new(controllers.RoleController)
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)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- licenseApi :=r.Group(urlPrefix+"/license")
+ licenseApi := r.Group(urlPrefix + "/license")
{
licenseApi.POST("/getRegisterCode", licenseController.GetRegisterCode)
licenseApi.POST("/save", licenseController.Save)
@@ -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)
@@ -113,6 +123,7 @@
camera.POST("/ptzControl", ptzController.Move)
camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+ camera.POST("/pasteRules", cameraTaskController.PasteRules)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -121,6 +132,8 @@
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")
@@ -179,6 +192,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")
{
@@ -231,10 +250,17 @@
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)
+ }
//绠楁硶搴撴搷浣�
sdkApi := r.Group(urlPrefix + "/sdk")
@@ -278,6 +304,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")
{
@@ -291,6 +318,28 @@
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)
+ }
+ 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)
+ }
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
--
Gitblit v1.8.0