update ynSwagger,sync to master

liuxiaolong

2019-11-13 f26a0cab5bca17b7eab57f6330e576271e17a17f

 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"
)
@@ -28,6 +29,7 @@
   ssController := new(controllers.SysSetController)
   sdkController := new(controllers.SdkController)
   esSearchController := new(controllers.EsSearchController)
   esManagementController := new(controllers.EsManagementController)
   realTimeController := new(controllers.RealTimeController)
   cameraTimeRuleController := new(controllers.CameraTimeruleController)
   polygonController := new(controllers.CameraPolygonController)
@@ -40,7 +42,8 @@
   fileController := new(controllers.FileController)
   sysMenuController :=new(controllers.SysMenuController)
   clusterController :=new(controllers.ClusterController)

   sysRoleController := new(controllers.RoleController)
   ptzController := new(controllers.PanTiltZoomController)

   sysApi := r.Group(  "/data/api-u/sys")
   {
@@ -51,10 +54,18 @@
   sysMenuApi := r.Group("/data/api-u/sysmenus")
   {
      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("/findAllUser", userController.FindAllUser)
      userApi.POST("/findById", userController.FindById)
      userApi.POST("/saveAuth", userController.SaveAuth)
   }

   urlPrefix := "/data/api-v" // wp 添加 路径 前缀
@@ -67,6 +78,8 @@
      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)
   }

   //摄像机管理
@@ -87,6 +100,10 @@
      camera.GET("/getCamerasByRunType", cameraController.GetCamerasByRunType)
      camera.POST("/updateRunEnable", cameraController.UpdateRunEnable)
      camera.POST("/changeRunType", cameraController.ChangeRunType)
      camera.GET("/getAllCamerasByServer", cameraController.GetAllCamerasByServer)

      camera.POST("/ptzControl", ptzController.Move)
      camera.GET("/statisticRunInfo", cameraController.StatisticRunInfo)
   }

   cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
@@ -102,6 +119,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 +135,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)
@@ -126,15 +145,21 @@
      task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
      task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
      task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)

      task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
   }

   // 检索 查询
   // 检索 查询 节点操作
   es := r.Group(urlPrefix + "/es")
   {
      es.POST("/tagList", esSearchController.PostEsTagList)
      es.POST("/taskList", esSearchController.PostEsTaskList)
      es.POST("/esSearch", esSearchController.PostEsSearch)
      es.POST("/queryEsCompareData", controllers.PostEsCompareData)
      es.POST("/getEsClusterInfo", esManagementController.GetEsClusterInfo)
      es.POST("/addCluster", esManagementController.AddCluster)
      es.POST("/createNode", esManagementController.CreateNode)
      es.POST("/updateEsHosts", esManagementController.UpdateEsHosts)
   }

   //实时被调数据
@@ -152,13 +177,15 @@
      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)
@@ -167,6 +194,11 @@
      vdbperson.POST("/fileUploadTest", fileController.UploadPersonTest)
      vdbperson.POST("/faceExtract",fileController.FaceExtract)
      vdbperson.POST("/searchByPhoto",fileController.SearchByPhoto)
      vdbperson.POST("/updateFace", dbPersonCont.UpdateFace)

      vdbperson.POST("/joinDbTable", dbPersonCont.JoinDbTable)
      vdbperson.POST("/move", dbPersonCont.Move)
      vdbperson.POST("/copy", dbPersonCont.Copy)
   }

   // 系统设置 操作
@@ -180,6 +212,15 @@
      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)
      vsset.GET("/rebootTask", ssController.GetRebootTask)
      vsset.POST("/rebootTask", ssController.SetRebootTask)
   }

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

   //算法参数
@@ -226,12 +268,15 @@
   }
   clusterApi := r.Group(urlPrefix+"/cluster")
   {
      clusterApi.GET("/findCluster", clusterController.FindCluster)
      clusterApi.GET("/randomPwd", clusterController.RandomPwd)
      clusterApi.POST("/create", clusterController.Create)
      clusterApi.POST("/search", clusterController.Search)
      clusterApi.POST("/stopSearching", clusterController.StopSearching)
      clusterApi.GET("/getSearchNodes", clusterController.GetSearchNodes)
      clusterApi.POST("/joinCluster", clusterController.JoinCluster)
      clusterApi.POST("/updateClusterName", clusterController.UpdateClusterName)
      clusterApi.POST("/leave", clusterController.Leave)
   }

   // 文件 上传