fix search controllers

sunty

2019-07-12 d42b09cda8b2bc58c43c200f3aabdb0b2a7e9211

 router/router.go

@@ -7,13 +7,16 @@
   "github.com/szuecs/gin-glog"
   "time"
   "webserver/controllers"
   "webserver/middlewares/auth"

   _ "webserver/docs"
)

func NewRouter() *gin.Engine {
   r := gin.Default()
   r.Use(ginglog.Logger(3 * time.Second))

   //r.Use(auth.AuthHandler())//auth过滤器
   r.Use(auth.AuthHandler())//auth过滤器

   r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))

@@ -32,20 +35,37 @@
   cameraTaskArgsController := new(controllers.CameraTaskArgsController)
   dicController := new(controllers.DictionaryController)
   userController := new(controllers.UserController)
   eventPushController := new(controllers.EventPushController)
   pollConfigController := new(controllers.PollConfigController)
   fileController := new(controllers.FileController)
   sysMenuController :=new(controllers.SysMenuController)


   sysApi := r.Group(  "/data/api-u/sys")
   {
      sysApi.POST("/login",userController.Login)
      sysApi.POST("/logout",userController.Logout)
      sysApi.POST("refresh_token",userController.RefreshToken)
   }
   sysMenuApi := r.Group("/data/api-u/sysmenus")
   {
      sysMenuApi.GET("/me",sysMenuController.Me)
   }
   userApi := r.Group("/data/api-u/users")
   {
      userApi.GET("/current",userController.Current)
   }

   urlPrefix := "/data/api-v" // wp 添加 路径 前缀
   userApi := r.Group(urlPrefix + "/user")
   {
      userApi.POST("/login", userController.Login)
   }

   //区域管理
   area := r.Group(urlPrefix + "/area")
   {
      area.GET("/localmenu", areaController.CameraTree)
      area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
      area.POST("/add", areaController.AreaAdd)
      area.GET("/del", areaController.AreaDelete)
      area.PUT("/update/:id", areaController.AreaUpdate)
      area.POST("/del", areaController.AreaDelete)
      area.POST("/update", areaController.AreaUpdate)
   }

   //摄像机管理
@@ -55,14 +75,17 @@
      camera.PUT("/update", cameraController.CameraUpdate)
      camera.DELETE("/del/:cid", cameraController.CameraDel)
      camera.GET("/show/:cid", cameraController.CameraSel)
      camera.GET("/queryCameraAndTaskInfo", cameraController.QueryCameraAndTaskInfo)
      camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl)

      camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
      camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)

      camera.GET("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
      camera.DELETE("/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")
@@ -70,6 +93,7 @@
      cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
      cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
      cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
      cameraTaskArgsApi.POST("/updateDefenceStateByGroup",cameraTaskArgsController.UpdateDefenceStateByGroup)
   }

   cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
@@ -120,7 +144,7 @@
   {
      vdbtable.POST("/queryDbTables/:isSync", tableController.QueryDbTables)
      vdbtable.POST("/updateDbTables", tableController.UpdateDbTables)
      vdbtable.POST("/deleteDBtablesById/:uuid", tableController.DeleteDbTables)
      vdbtable.POST("/deleteDBtablesById/:id", tableController.DeleteDbTables)
      vdbtable.PUT("/addDbTableInfo", tableController.AddDbTableInfo)
   }

@@ -133,6 +157,8 @@
      vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
      vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
      vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)

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

   // 系统设置 操作
@@ -144,8 +170,8 @@
      vsset.POST("/videoLenEdit", ssController.VideoLenEdit)
      vsset.GET("/getDevInfo", ssController.GetDevInfo)
      vsset.POST("/saveDevInfo", ssController.SaveDevInfo)
      vsset.GET("/vSSLocalSettingShow", ssController.VSSLocalSettingShow)
      vsset.POST("/vSSLocalSettingEdit", ssController.VSSLocalSettingEdit)
      vsset.GET("/gb28181ConfigShow", ssController.Gb28181ConfigShow)
      vsset.POST("/gb28181ConfigEdit", ssController.Gb28181ConfigEdit)
   }

   //算法库操作
@@ -166,13 +192,29 @@
   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)