From 712ef81c6b8813a498a66cf61ffcd37e5c502c8c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 01 十一月 2019 13:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
router/router.go | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/router/router.go b/router/router.go
index 4f3ee1e..3d42f1c 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,7 +43,7 @@
sysMenuController := new(controllers.SysMenuController)
clusterController := new(controllers.ClusterController)
sysRoleController := new(controllers.RoleController)
- ptController := new(controllers.PanTiltController)
+ ptzController := new(controllers.PanTiltZoomController)
sysApi := r.Group("/data/api-u/sys")
{
@@ -101,7 +102,7 @@
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)
}
@@ -144,15 +145,20 @@
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)
}
//瀹炴椂琚皟鏁版嵁
@@ -190,6 +196,8 @@
vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
+ vdbperson.POST("/move", dbPersonCont.Move)
+ vdbperson.POST("/copy", dbPersonCont.Copy)
}
// 绯荤粺璁剧疆 鎿嶄綔
--
Gitblit v1.8.0