From aaa7697d6ec77e03d96ce36ca66abcbbcf2bb7a3 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 14 七月 2020 12:03:33 +0800
Subject: [PATCH] add ruleSo
---
router/router.go | 90 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/router/router.go b/router/router.go
index 9c87a5f..320484f 100644
--- a/router/router.go
+++ b/router/router.go
@@ -32,7 +32,7 @@
cameraTimeRuleController := new(controllers.CameraTimeruleController)
polygonController := new(controllers.CameraPolygonController)
cameraTaskController := new(controllers.CameraTaskController)
- cameraTaskArgsController := new(controllers.CameraTaskArgsController)
+ //cameraTaskArgsController := new(controllers.CameraTaskArgsController)
dicController := new(controllers.DictionaryController)
userController := new(controllers.UserController)
eventPushController := new(controllers.EventPushController)
@@ -48,6 +48,9 @@
icController := new(controllers.InfoController)
gb28181C := new(controllers.Gb28181Controller)
fStackC := new(controllers.FileStackController)
+ cameraRuleController := new (controllers.CameraRuleController)
+ rtc := new(controllers.RuleTemplateController)
+ voiceC := new(controllers.VoiceController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
@@ -111,11 +114,11 @@
camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)
camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
- camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
+ //camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
- camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
- camera.POST("/saveTask", cameraController.CameraTaskSave)
- camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
+ //camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
+ //camera.POST("/saveTask", cameraController.CameraTaskSave)
+ //camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
camera.POST("/changeRunType", cameraController.ChangeRunType)
@@ -123,26 +126,42 @@
camera.POST("/ptzControl", ptzController.Move)
camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
- camera.POST("/pasteRules", cameraTaskController.PasteRules)
+ //camera.POST("/pasteRules", cameraTaskController.PasteRules)
}
- cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
+ rtcApi := r.Group(urlPrefix + "/template")
{
- cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
- cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
- cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
- cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
-
- cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
+ rtcApi.POST("/rule/save", rtc.Save)
+ rtcApi.GET("/rule/:id", rtc.Show)
+ rtcApi.DELETE("/rule/:id", rtc.Delete)
+ rtcApi.GET("/rule", rtc.FindAll)
}
-
- cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
+ cameraRuleApi :=r.Group(urlPrefix+"/camera/rule")
{
- cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
- cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
- cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
- cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
+ cameraRuleApi.GET("/findByCameraId", cameraRuleController.FindByCameraId)
+ cameraRuleApi.DELETE("/deleteGroup/:groupId",cameraRuleController.DeleteByGroup)
+ cameraRuleApi.POST("/getLinkRulesByCameraIds",cameraRuleController.GetLinkRulesByCameraIds)
+ cameraRuleApi.POST("/save", cameraRuleController.Save)
+ cameraRuleApi.POST("/saveLinkRulesByGroup",cameraRuleController.SaveLinkRulesByGroup)
}
+
+ //cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
+ //{
+ // cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
+ // cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
+ // cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
+ // cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
+ //
+ // cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
+ //}
+
+ //cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
+ //{
+ // cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
+ // cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
+ // cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
+ // cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
+ //}
polygon := r.Group(urlPrefix + "/polygon")
{
@@ -156,19 +175,19 @@
// 浠诲姟绠＄悊
task := r.Group(urlPrefix + "/task")
{
- task.GET("/findAll", taskController.FindAll)
+ //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)
- 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)
-
- task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
+ //task.POST("/addTask", taskController.AddTask)
+ //task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
+ //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)
+ //
+ //task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
}
// 妫�绱� 鏌ヨ 鑺傜偣鎿嶄綔
@@ -272,6 +291,10 @@
sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
sdkApi.GET("/getById", sdkController.GetById)
sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
+ sdkApi.GET("/upload", sdkController.Upload)
+ sdkApi.POST("/upload", sdkController.UploadPack)
+ sdkApi.POST("/install", sdkController.Install)
+ sdkApi.GET("/active", sdkController.Active)
}
//绠楁硶鍙傛暟
@@ -346,6 +369,11 @@
fStackApi.POST("/changeEnable", fStackC.ChangeEnable)
fStackApi.DELETE("/delete/:id", fStackC.Delete)
}
+ voiceApi := r.Group(urlPrefix + "/voice")
+ {
+ voiceApi.GET("/findAll", voiceC.FindAll)
+ }
+
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
--
Gitblit v1.8.0