From 000e51f17eba47c3502ee8f717f53f1fae3d0bbd Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 19:11:35 +0800
Subject: [PATCH] new files

---
 router/router.go |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/router/router.go b/router/router.go
index ae84e3d..2f08d50 100644
--- a/router/router.go
+++ b/router/router.go
@@ -39,12 +39,13 @@
 	pollConfigController := new(controllers.PollConfigController)
 	fileController := new(controllers.FileController)
 	sysMenuController :=new(controllers.SysMenuController)
+	clusterController :=new(controllers.ClusterController)
 
 
 	sysApi := r.Group(  "/data/api-u/sys")
 	{
 		sysApi.POST("/login",userController.Login)
-		sysApi.POST("/logout",userController.Logout)
+		sysApi.GET("/logout",userController.Logout)
 		sysApi.POST("refresh_token",userController.RefreshToken)
 	}
 	sysMenuApi := r.Group("/data/api-u/sysmenus")
@@ -62,6 +63,7 @@
 	area := r.Group(urlPrefix + "/area")
 	{
 		area.GET("/localmenu", areaController.CameraTree)
+		area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
 		area.POST("/add", areaController.AreaAdd)
 		area.POST("/del", areaController.AreaDelete)
 		area.POST("/update", areaController.AreaUpdate)
@@ -92,6 +94,7 @@
 		cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
 		cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
 		cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
+		cameraTaskArgsApi.POST("/updateDefenceStateByGroup",cameraTaskArgsController.UpdateDefenceStateByGroup)
 	}
 
 	cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
@@ -116,9 +119,13 @@
 		task.GET("/findAll", taskController.FindAll)
 		task.POST("/addTask", taskController.AddTask)
 		task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
-		task.GET("/deleteTask", taskController.DeleteTask)
-		task.GET("/addTaskSdk", taskController.AddTaskSdk)
-		task.GET("/deleteTaskSdk", taskController.DeleteTaskSdk)
+		task.GET("/delete", taskController.DeleteTask)
+		task.POST("/addTaskSdk", taskController.AddTaskSdk)
+		task.GET("/delTaskSdk", taskController.DeleteTaskSdk)
+		task.POST("/updateTaskName", taskController.UpdateTaskName)
+		task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
+		task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
+		task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)
 	}
 
 	// 妫�绱� 鏌ヨ
@@ -135,7 +142,8 @@
 	{
 		realTime.POST("/capture", realTimeController.PostCapture)
 		realTime.POST("/monitoring", realTimeController.PostMonitoring)
-		realTime.POST("/action", realTimeController.PostAction)
+		realTime.POST("/initForCaptureData", realTimeController.InitForCaptureData)
+		realTime.POST("/initForMonitoringData", realTimeController.InitForMonitoringData)
 	}
 	//搴曞簱 鎿嶄綔
 	vdbtable := r.Group(urlPrefix + "/dbtable")
@@ -150,13 +158,15 @@
 	vdbperson := r.Group(urlPrefix + "/dbperson")
 	{
 		vdbperson.POST("/queryDbPersonsByTbId", dbPersonCont.QueryDbPersonsByTbId)
-		vdbperson.POST("/queryDbPersonsByCampare", dbPersonCont.QueryDbPersonsByCampare)
+		//vdbperson.POST("/queryDbPersonsByCampare", dbPersonCont.QueryDbPersonsByCampare)
 		vdbperson.POST("/updateDbPerson", dbPersonCont.UpdateDbPerson)
 		vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
 		vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
 		vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
 
 		vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
+		vdbperson.POST("/faceExtract",fileController.FaceExtract)
+		vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
 	}
 
 	// 绯荤粺璁剧疆 鎿嶄綔
@@ -179,6 +189,12 @@
 		sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
 		sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
 		sdkApi.GET("/getById", sdkController.GetById)
+	}
+
+	//绠楁硶鍙傛暟
+	sdkArgApi :=r.Group(urlPrefix + "/sdkArg")
+	{
+		sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
 	}
 
 	cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -208,6 +224,15 @@
 		pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
 		pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
 	}
+	clusterApi := r.Group(urlPrefix+"/cluster")
+	{
+		clusterApi.GET("/randomPwd", clusterController.RandomPwd)
+		clusterApi.POST("/create", clusterController.Create)
+		clusterApi.POST("/search", clusterController.Search)
+		clusterApi.POST("/stopSearching", clusterController.StopSearching)
+		clusterApi.GET("/getSearchNodes", clusterController.GetSearchNodes)
+		clusterApi.POST("/joinCluster", clusterController.JoinCluster)
+	}
 
 	// 鏂囦欢 涓婁紶
 	r.Static("static", "./static") // 闈欐�佹枃浠�

--
Gitblit v1.8.0