From f2d60f4a96b77cf3ae924f9d479bd40dd8fbd13c Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期五, 28 六月 2019 14:27:21 +0800
Subject: [PATCH] 修改结构体和相关成员
---
router/router.go | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/router/router.go b/router/router.go
index 84fa94c..145b718 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))
@@ -25,15 +27,17 @@
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)
+ polygonController := new(controllers.CameraPolygonController)
+ 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,29 +60,32 @@
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("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
}
- cameraTaskArgsApi :=r.Group(urlPrefix + "/cameraTaskArgs")
+ cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
{
- cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
+ cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
+ 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")
+ 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)
}
// 浠诲姟绠＄悊
@@ -146,8 +153,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")
@@ -156,9 +163,9 @@
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("/findByType", dicController.FindByType)
}
// 鏂囦欢 涓婁紶
--
Gitblit v1.8.0