From 5e31a32f6ce2572cb01388150ddb325724ff15b8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 19:29:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver
---
router/router.go | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/router/router.go b/router/router.go
index 812b254..184334d 100644
--- a/router/router.go
+++ b/router/router.go
@@ -30,19 +30,19 @@
esSearchController := new(controllers.EsSearchController)
realTimeController := new(controllers.RealTimeController)
cameraTimeRuleController := new(controllers.CameraTimeruleController)
- polygonController :=new (controllers.CameraPolygonController)
- cameraTaskController :=new(controllers.CameraTaskController)
- cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
- dicController :=new(controllers.DictionaryController)
- userController :=new(controllers.UserController)
- eventPushController :=new(controllers.EventPushController)
- pollConfigController :=new(controllers.PollConfigController)
+ polygonController := new(controllers.CameraPolygonController)
+ cameraTaskController := new(controllers.CameraTaskController)
+ cameraTaskArgsController := new(controllers.CameraTaskArgsController)
+ dicController := new(controllers.DictionaryController)
+ userController := new(controllers.UserController)
+ eventPushController := new(controllers.EventPushController)
+ pollConfigController := new(controllers.PollConfigController)
fileController := new(controllers.FileController)
urlPrefix := "/data/api-v" // wp 娣诲姞 璺緞 鍓嶇紑
- userApi :=r.Group(urlPrefix+"/user")
+ userApi := r.Group(urlPrefix + "/user")
{
- userApi.POST("/login",userController.Login)
+ userApi.POST("/login", userController.Login)
}
//鍖哄煙绠＄悊
@@ -68,33 +68,33 @@
camera.GET("/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)
+ camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
+ camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
+ camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
+ camera.POST("/changeRunType", cameraController.ChangeRunType)
}
- cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
+ cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
{
- cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
- cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
- cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
+ cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
+ cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
+ cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
{
- cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
- cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
- cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
+ cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
+ cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
+ cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
}
- polygon := r.Group(urlPrefix+"/polygon")
+ polygon := r.Group(urlPrefix + "/polygon")
{
polygon.POST("/save", polygonController.Save)
polygon.GET("/findByCameraId", polygonController.FindByCameraId)
//polygon.GET("/delete", polygonController.Delete)
- polygon.GET("/updateDefenceStateByPolygonId",polygonController.UpdateDefenceStateByPolygonId)
- polygon.GET("/updateDefenceStateByCameraId",polygonController.UpdateDefenceStateByCameraId)
+ polygon.GET("/updateDefenceStateByPolygonId", polygonController.UpdateDefenceStateByPolygonId)
+ polygon.GET("/updateDefenceStateByCameraId", polygonController.UpdateDefenceStateByCameraId)
}
// 浠诲姟绠＄悊
@@ -143,7 +143,7 @@
vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
- vdbperson.POST("/fileUploadTest",fileController.UploadPersonTest)
+ vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -164,8 +164,8 @@
{
sdkApi.POST("/saveSdk", sdkController.Save)
sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
- sdkApi.GET("/findByTaskId",sdkController.FindByTaskId)
- sdkApi.GET("/getById",sdkController.GetById)
+ sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
+ sdkApi.GET("/getById", sdkController.GetById)
}
cameraTimeApi := r.Group(urlPrefix + "/cameraTimerule")
@@ -174,33 +174,33 @@
cameraTimeApi.GET("/delete", cameraTimeRuleController.Delete)
cameraTimeApi.GET("/findAll", cameraTimeRuleController.FindAll)
}
- dicApi :=r.Group(urlPrefix+"/dictionary")
+ dicApi := r.Group(urlPrefix + "/dictionary")
{
- dicApi.GET("/findByType",dicController.FindByType)
- dicApi.GET("/findByParentId",dicController.FindByParentId)
+ dicApi.GET("/findByType", dicController.FindByType)
+ dicApi.GET("/findByParentId", dicController.FindByParentId)
}
- eventPushApi :=r.Group(urlPrefix+"/eventPush")
+ eventPushApi := r.Group(urlPrefix + "/eventPush")
{
- eventPushApi.POST("/save",eventPushController.Save)
- eventPushApi.GET("/findByEventTopic",eventPushController.FindByEventTopic)
- eventPushApi.GET("/findAll",eventPushController.FindAll)
- eventPushApi.GET("/getById",eventPushController.GetById)
- eventPushApi.POST("/changeStatus",eventPushController.ChangeStatus)
- eventPushApi.POST("/delete",eventPushController.Delete)
+ eventPushApi.POST("/save", eventPushController.Save)
+ eventPushApi.GET("/findByEventTopic", eventPushController.FindByEventTopic)
+ eventPushApi.GET("/findAll", eventPushController.FindAll)
+ eventPushApi.GET("/getById", eventPushController.GetById)
+ eventPushApi.POST("/changeStatus", eventPushController.ChangeStatus)
+ eventPushApi.POST("/delete", eventPushController.Delete)
}
- pollCApi :=r.Group(urlPrefix+"/pollConfig")
+ pollCApi := r.Group(urlPrefix + "/pollConfig")
{
- pollCApi.POST("/savePollPeriod",pollConfigController.SavePollPeriod)
- pollCApi.POST("/savePollDelay",pollConfigController.SavePollDelay)
- pollCApi.GET("/getPollConfig",pollConfigController.GetPollConfig)
- pollCApi.POST("/updateEnable",pollConfigController.UpdateEnable)
+ pollCApi.POST("/savePollPeriod", pollConfigController.SavePollPeriod)
+ pollCApi.POST("/savePollDelay", pollConfigController.SavePollDelay)
+ pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
+ pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
}
// 鏂囦欢 涓婁紶
r.Static("static", "./static") // 闈欐�佹枃浠�
//澶栭儴璁块棶swagger.json
r.StaticFile("/swagger.json", "./docs/swagger.json")
-
+ fileController := new(controllers.FileController)
vdbperson.POST("/fileupload", fileController.Fileupload)
vdbperson.POST("/moreFileUpload", fileController.MoreFileUpload)
r.POST(urlPrefix+"/es/ImageUploadReturnPics", fileController.ImageUploadReturnPics)
--
Gitblit v1.8.0