From a1ef2d42d320f075c75e8cef52a879114441c103 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期三, 30 十月 2019 15:54:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
router/router.go | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/router/router.go b/router/router.go
index 02584e1..abc6ffe 100644
--- a/router/router.go
+++ b/router/router.go
@@ -42,6 +42,7 @@
sysMenuController := new(controllers.SysMenuController)
clusterController := new(controllers.ClusterController)
sysRoleController := new(controllers.RoleController)
+ ptController := new(controllers.PanTiltController)
sysApi := r.Group("/data/api-u/sys")
{
@@ -62,7 +63,8 @@
{
userApi.GET("/current", userController.Current)
userApi.GET("/findAllUser", userController.FindAllUser)
- userApi.POST("/edit", userController.Edit)
+ userApi.POST("/findById", userController.FindById)
+ userApi.POST("/saveAuth", userController.SaveAuth)
}
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
@@ -98,6 +100,8 @@
camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
camera.POST("/changeRunType", cameraController.ChangeRunType)
camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)
+
+ camera.POST("/ptControl", ptController.Controlling)
}
cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -129,6 +133,7 @@
task := r.Group(urlPrefix + "/task")
{
task.GET("/findAll", taskController.FindAll)
+ task.GET("/aggregateTaskList", taskController.AggregateTaskList)
task.POST("/addTask", taskController.AddTask)
task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
task.GET("/delete", taskController.DeleteTask)
@@ -182,6 +187,8 @@
vdbperson.POST("/faceExtract", fileController.FaceExtract)
vdbperson.POST("/searchByPhoto", fileController.SearchByPhoto)
vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)
+
+ vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -199,6 +206,9 @@
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)
}
//绠楁硶搴撴搷浣�
--
Gitblit v1.8.0