From 9169334afe5385ad41286a99cfd68a6a8fe89e22 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 04 十二月 2019 15:05:04 +0800
Subject: [PATCH] update protomsg and fix GetPollConfig
---
router/router.go | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/router/router.go b/router/router.go
index 6479e41..253b880 100644
--- a/router/router.go
+++ b/router/router.go
@@ -29,6 +29,7 @@
ssController := new(controllers.SysSetController)
sdkController := new(controllers.SdkController)
esSearchController := new(controllers.EsSearchController)
+ esManagementController := new(controllers.EsManagementController)
realTimeController := new(controllers.RealTimeController)
cameraTimeRuleController := new(controllers.CameraTimeruleController)
polygonController := new(controllers.CameraPolygonController)
@@ -42,6 +43,19 @@
sysMenuController := new(controllers.SysMenuController)
clusterController := new(controllers.ClusterController)
sysRoleController := new(controllers.RoleController)
+ 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")
{
@@ -64,9 +78,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")
@@ -99,6 +112,9 @@
camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
camera.POST("/changeRunType", cameraController.ChangeRunType)
camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
+
+ camera.POST("/ptzControl", ptzController.Move)
+ camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -140,15 +156,21 @@
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)
}
//瀹炴椂琚皟鏁版嵁
@@ -184,6 +206,10 @@
vdbperson.POST("/faceExtract", fileController.FaceExtract)
vdbperson.POST("/searchByPhoto", fileController.SearchByPhoto)
vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
+
+ vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
+ vdbperson.POST("/move", dbPersonCont.Move)
+ vdbperson.POST("/copy", dbPersonCont.Copy)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -201,6 +227,11 @@
vsset.POST("/updateClock", ssController.SetSysClock)
vsset.GET("/ntpTest", ssController.TestNTPServer)
vsset.GET("/sysinfo", ssController.GetSysInfo)
+ vsset.GET("/sysThresholds", ssController.GetSysThresholds)
+
+ vsset.GET("/reboot", ssController.RebootOS)
+ vsset.GET("/rebootTask", ssController.GetRebootTask)
+ vsset.POST("/rebootTask", ssController.SetRebootTask)
}
//绠楁硶搴撴搷浣�
@@ -245,6 +276,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")
{
@@ -258,6 +290,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