Merge branch 'master' of http://192.168.1.14:10010/r/webserver

sunty

2019-06-28 88d229d880079db1d31af1d4cbed3b8eb12fd47d

 router/router.go

@@ -7,6 +7,8 @@
   "github.com/szuecs/gin-glog"
   "time"
   "webserver/controllers"

   _ "webserver/docs"
)

func NewRouter() *gin.Engine {
@@ -32,6 +34,9 @@
   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")
@@ -63,6 +68,9 @@
      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")
@@ -133,6 +141,8 @@
      vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
      vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
      vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)

      vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
   }

   // 系统设置 操作
@@ -166,6 +176,23 @@
   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)
   }

   // 文件 上传