From cb707715e4648719a5ab083f0623620079b20f2a Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期四, 20 六月 2019 16:23:42 +0800
Subject: [PATCH] task rules set complete
---
router/router.go | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/router/router.go b/router/router.go
index b29bb37..cabb1e3 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,17 +1,19 @@
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"
)
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 +31,13 @@
cameraTaskController :=new(controllers.CameraTaskController)
cameraTaskArgsController :=new(controllers.CameraTaskArgsController)
dicController :=new(controllers.DictionaryController)
+ userController :=new(controllers.UserController)
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,8 +60,7 @@
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)
}
@@ -65,13 +68,15 @@
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")
--
Gitblit v1.8.0