From b871bc358a94e255e38e122dc86f16fb48361232 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期五, 28 六月 2019 11:09:46 +0800
Subject: [PATCH] test
---
router/router.go | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/router/router.go b/router/router.go
index b29bb37..475bf0e 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,17 +1,21 @@
package router
import (
- "webserver/controllers"
"github.com/gin-gonic/gin"
"github.com/swaggo/gin-swagger"
"github.com/swaggo/gin-swagger/swaggerFiles"
"github.com/szuecs/gin-glog"
"time"
+ "webserver/controllers"
+
+ _ "webserver/docs"
)
func NewRouter() *gin.Engine {
r := gin.Default()
r.Use(ginglog.Logger(3 * time.Second))
+
+ //r.Use(auth.AuthHandler())//auth杩囨护鍣�
r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
@@ -29,11 +33,16 @@
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 娣诲姞 璺緞 鍓嶇紑
-
- r.POST("/signup", controllers.Signup)
- r.POST("/signin", controllers.Login)
+ userApi :=r.Group(urlPrefix+"/user")
+ {
+ userApi.POST("/login",userController.Login)
+ }
//鍖哄煙绠＄悊
area := r.Group(urlPrefix + "/area")
@@ -56,22 +65,26 @@
camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
- camera.GET("/delTask/:cid", cameraController.CameraDelTask)
- camera.DELETE("/task/del/:cid/:tid", cameraController.CameraDelTask)
+ 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)
}
cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
{
cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
- cameraTaskArgsApi.GET("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
- cameraTaskArgsApi.POST("saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
+ cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
+ cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
}
cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
{
- cameraTaskApi.POST("/saveTransAndAlarmLevel",cameraTaskController.SaveTransAndAlarmLevel)
+ cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
+ cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
+ cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
}
polygon := r.Group(urlPrefix+"/polygon")
@@ -128,6 +141,8 @@
vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)
+
+ vdbperson.POST("/fileUploadTest",fileController.UploadPersonTest)
}
// 绯荤粺璁剧疆 鎿嶄綔
@@ -161,13 +176,30 @@
dicApi :=r.Group(urlPrefix+"/dictionary")
{
dicApi.GET("/findByType",dicController.FindByType)
+ dicApi.GET("/findByParentId",dicController.FindByParentId)
+ }
+ 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)
+ }
+ 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)
}
// 鏂囦欢 涓婁紶
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