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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/router/router.go b/router/router.go
index 5234b24..3d42f1c 100644
--- a/router/router.go
+++ b/router/router.go
@@ -43,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")
{
@@ -102,7 +102,8 @@
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)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -144,6 +145,8 @@
task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)
+
+ task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
}
// 妫�绱� 鏌ヨ 鑺傜偣鎿嶄綔
@@ -193,6 +196,8 @@
vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
+ vdbperson.POST("/move", dbPersonCont.Move)
+ vdbperson.POST("/copy", dbPersonCont.Copy)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -213,6 +218,8 @@
vsset.GET("/sysThresholds", ssController.GetSysThresholds)
vsset.GET("/reboot", ssController.RebootOS)
+ vsset.GET("/rebootTask", ssController.GetRebootTask)
+ vsset.POST("/rebootTask", ssController.SetRebootTask)
}
//绠楁硶搴撴搷浣�
--
Gitblit v1.8.0