From bae7a9a30b89c519460746cfa19cd7e66a0196e2 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期日, 19 一月 2020 17:13:07 +0800
Subject: [PATCH] update _source list and struct
---
router/router.go | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/router/router.go b/router/router.go
index 6012c52..c8165f3 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)
+ clearDataController := new(controllers.ClearDataController)
cameraTimeRuleController := new(controllers.CameraTimeruleController)
polygonController := new(controllers.CameraPolygonController)
cameraTaskController := new(controllers.CameraTaskController)
@@ -50,7 +48,7 @@
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)
@@ -115,6 +113,7 @@
camera.POST("/ptzControl", ptzController.Move)
camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
+ camera.POST("/pasteRules", cameraTaskController.PasteRules)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -123,6 +122,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")
@@ -181,6 +182,12 @@
realTime.POST("/initForCaptureData", realTimeController.InitForCaptureData)
realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
}
+ //娓呯悊鏁版嵁
+ clearData := r.Group(urlPrefix + "/clearData")
+ {
+ clearData.POST("/clearEsData", clearDataController.ClearEsData)
+ }
+
//搴曞簱 鎿嶄綔
vdbtable := r.Group(urlPrefix + "/dbtable")
{
@@ -232,6 +239,12 @@
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)
}
//绠楁硶搴撴搷浣�
@@ -276,6 +289,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")
{
@@ -292,13 +306,13 @@
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.POST("/updateStatus", fileAnalysisC.UpdateStatus)
+ fileAnalyApi.POST("/delete", fileAnalysisC.Delete)
+ fileAnalyApi.POST("/sortFile", fileAnalysisC.SortFile)
}
fileSettingApi := r.Group(urlPrefix + "/fileSetting")
{
- fileSettingApi.GET("/show",fileSettingC.Show)
+ fileSettingApi.GET("/show", fileSettingC.Show)
fileSettingApi.POST("/changeEnable", fileSettingC.ChangeEnable)
}
--
Gitblit v1.8.0