Merge remote-tracking branch 'origin/master'

sunty

2019-10-30 a1ef2d42d320f075c75e8cef52a879114441c103

 router/router.go

@@ -1,13 +1,14 @@
package router

import (
   "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/middlewares/auth"

   "github.com/gin-gonic/gin"
   ginSwagger "github.com/swaggo/gin-swagger"
   "github.com/swaggo/gin-swagger/swaggerFiles"
   ginglog "github.com/szuecs/gin-glog"

   _ "webserver/docs"
)
@@ -16,7 +17,7 @@
   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))

@@ -38,23 +39,32 @@
   eventPushController := new(controllers.EventPushController)
   pollConfigController := new(controllers.PollConfigController)
   fileController := new(controllers.FileController)
   sysMenuController :=new(controllers.SysMenuController)
   clusterController :=new(controllers.ClusterController)
   sysMenuController := new(controllers.SysMenuController)
   clusterController := new(controllers.ClusterController)
   sysRoleController := new(controllers.RoleController)
   ptController := new(controllers.PanTiltController)


   sysApi := r.Group(  "/data/api-u/sys")
   sysApi := r.Group("/data/api-u/sys")
   {
      sysApi.POST("/login",userController.Login)
      sysApi.GET("/logout",userController.Logout)
      sysApi.POST("refresh_token",userController.RefreshToken)
      sysApi.POST("/login", userController.Login)
      sysApi.GET("/logout", userController.Logout)
      sysApi.POST("refresh_token", userController.RefreshToken)
   }
   sysMenuApi := r.Group("/data/api-u/sysmenus")
   {
      sysMenuApi.GET("/me",sysMenuController.Me)
      sysMenuApi.GET("/me", sysMenuController.Me)
      sysMenuApi.GET("/tree", sysMenuController.MenuTree)
   }
   roleApi := r.Group("/data/api-v/role")
   {
      roleApi.GET("/findAll", sysRoleController.FindAll)
   }
   userApi := r.Group("/data/api-u/users")
   {
      userApi.GET("/current",userController.Current)
      userApi.GET("/current", userController.Current)
      userApi.GET("/findAllUser", userController.FindAllUser)
      userApi.POST("/findById", userController.FindById)
      userApi.POST("/saveAuth", userController.SaveAuth)
   }

   urlPrefix := "/data/api-v" // wp 添加 路径 前缀
@@ -63,10 +73,12 @@
   area := r.Group(urlPrefix + "/area")
   {
      area.GET("/localmenu", areaController.CameraTree)
      area.GET("/gb28181Tree",areaController.CameraGb28181Tree)
      area.GET("/gb28181Tree", areaController.CameraGb28181Tree)
      area.POST("/add", areaController.AreaAdd)
      area.POST("/del", areaController.AreaDelete)
      area.POST("/update", areaController.AreaUpdate)
      area.POST("/gb28181TreeRefresh", areaController.Gb28181TreeRefresh)
      area.POST("/gb28181TreeDelete", areaController.Gb28181TreeDelete)
   }

   //摄像机管理
@@ -76,7 +88,7 @@
      camera.PUT("/update", cameraController.CameraUpdate)
      camera.DELETE("/del/:cid", cameraController.CameraDel)
      camera.GET("/show/:cid", cameraController.CameraSel)
      camera.GET("/updateSnapshotUrl/:cid",cameraController.UpdateSnapshotUrl)
      camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)

      camera.POST("/alltask", cameraTaskController.FindTasksByCameraIds)
      camera.GET("/task/:cameraId", cameraTaskController.CameraTaskAll)
@@ -87,6 +99,9 @@
      camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
      camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
      camera.POST("/changeRunType", cameraController.ChangeRunType)
      camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)

      camera.POST("/ptControl", ptController.Controlling)
   }

   cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -94,7 +109,7 @@
      cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
      cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
      cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
      cameraTaskArgsApi.POST("/updateDefenceStateByGroup",cameraTaskArgsController.UpdateDefenceStateByGroup)
      cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
   }

   cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
@@ -102,6 +117,7 @@
      cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
      cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
      cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
      cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
   }

   polygon := r.Group(urlPrefix + "/polygon")
@@ -117,6 +133,7 @@
   task := r.Group(urlPrefix + "/task")
   {
      task.GET("/findAll", taskController.FindAll)
      task.GET("/aggregateTaskList", taskController.AggregateTaskList)
      task.POST("/addTask", taskController.AddTask)
      task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
      task.GET("/delete", taskController.DeleteTask)
@@ -152,21 +169,26 @@
      vdbtable.POST("/updateDbTables", tableController.UpdateDbTables)
      vdbtable.POST("/deleteDBtablesById/:id", tableController.DeleteDbTables)
      vdbtable.PUT("/addDbTableInfo", tableController.AddDbTableInfo)
      vdbtable.POST("/updateDbTableStatus", tableController.UpdateDbTableStatus)
      vdbtable.GET("/findAllDbTablesByCurServer", tableController.FindAllDbTablesByCurServer)
   }

   // 底库人员 操作
   vdbperson := r.Group(urlPrefix + "/dbperson")
   {
      vdbperson.POST("/queryDbPersonsByTbId", dbPersonCont.QueryDbPersonsByTbId)
      vdbperson.POST("/queryDbPersonsByCampare", dbPersonCont.QueryDbPersonsByCampare)
      vdbperson.POST("/queryDbPersonsByCompare", dbPersonCont.QueryDbPersonsByCompare)
      vdbperson.POST("/updateDbPerson", dbPersonCont.UpdateDbPerson)
      vdbperson.POST("/deleteDbPersonById/:uuid", dbPersonCont.DeleteDbPerson)
      vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
      vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)

      vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
      vdbperson.POST("/faceExtract",fileController.FaceExtract)
      vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
      vdbperson.POST("/faceExtract", fileController.FaceExtract)
      vdbperson.POST("/searchByPhoto", fileController.SearchByPhoto)
      vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)

      vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
   }

   // 系统设置 操作
@@ -180,6 +202,13 @@
      vsset.POST("/saveDevInfo", ssController.SaveDevInfo)
      vsset.GET("/gb28181ConfigShow", ssController.Gb28181ConfigShow)
      vsset.POST("/gb28181ConfigEdit", ssController.Gb28181ConfigEdit)
      vsset.GET("/clockInfo", ssController.GetClockinfo)
      vsset.POST("/updateClock", ssController.SetSysClock)
      vsset.GET("/ntpTest", ssController.TestNTPServer)
      vsset.GET("/sysinfo", ssController.GetSysInfo)
      vsset.GET("/sysThresholds", ssController.GetSysThresholds)

      vsset.GET("/reboot", ssController.RebootOS)
   }

   //算法库操作
@@ -189,10 +218,11 @@
      sdkApi.GET("/findAllSdk", sdkController.FindAllSdk)
      sdkApi.GET("/findByTaskId", sdkController.FindByTaskId)
      sdkApi.GET("/getById", sdkController.GetById)
      sdkApi.GET("/sdkDownload", sdkController.SdkDownLoad)
   }

   //算法参数
   sdkArgApi :=r.Group(urlPrefix + "/sdkArg")
   sdkArgApi := r.Group(urlPrefix + "/sdkArg")
   {
      sdkArgApi.GET("/getSdkArgs", sdkController.GetSdkArgs)
   }
@@ -224,7 +254,7 @@
      pollCApi.GET("/getPollConfig", pollConfigController.GetPollConfig)
      pollCApi.POST("/updateEnable", pollConfigController.UpdateEnable)
   }
   clusterApi := r.Group(urlPrefix+"/cluster")
   clusterApi := r.Group(urlPrefix + "/cluster")
   {
      clusterApi.GET("/findCluster", clusterController.FindCluster)
      clusterApi.GET("/randomPwd", clusterController.RandomPwd)