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 | 63 +++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 9 deletions(-) diff --git a/router/router.go b/router/router.go index 5234b24..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) @@ -43,7 +41,19 @@ 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) + + 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") { @@ -66,9 +76,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") @@ -102,7 +111,9 @@ 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", cameraTaskController.PasteRules) } cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs") @@ -111,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") @@ -144,6 +157,8 @@ task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk) task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule) task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule) + + task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera) } // 妫�绱� 鏌ヨ 鑺傜偣鎿嶄綔 @@ -156,6 +171,7 @@ es.POST("/getEsClusterInfo", esManagementController.GetEsClusterInfo) es.POST("/addCluster", esManagementController.AddCluster) es.POST("/createNode", esManagementController.CreateNode) + es.POST("/updateEsHosts", esManagementController.UpdateEsHosts) } //瀹炴椂琚皟鏁版嵁 @@ -166,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") { @@ -193,6 +215,8 @@ vdbperson.POST("/updateFace", dbPersonCont.UpdateFace) vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable) + vdbperson.POST("/move", dbPersonCont.Move) + vdbperson.POST("/copy", dbPersonCont.Copy) } // 绯荤粺璁剧疆 鎿嶄綔 @@ -213,6 +237,14 @@ vsset.GET("/sysThresholds", ssController.GetSysThresholds) 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) } //绠楁硶搴撴搷浣� @@ -257,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") { @@ -270,6 +303,18 @@ 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) + } + fileSettingApi := r.Group(urlPrefix + "/fileSetting") + { + fileSettingApi.GET("/show", fileSettingC.Show) + fileSettingApi.POST("/changeEnable", fileSettingC.ChangeEnable) + } // 鏂囦欢 涓婁紶 r.Static("static", "./static") // 闈欐�佹枃浠� -- Gitblit v1.8.0