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

liuxiaolong

2019-06-28 5e31a32f6ce2572cb01388150ddb325724ff15b8

 router/router.go

@@ -30,19 +30,19 @@
   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)
   userController :=new(controllers.UserController)
   eventPushController :=new(controllers.EventPushController)
   pollConfigController :=new(controllers.PollConfigController)
   polygonController := new(controllers.CameraPolygonController)
   cameraTaskController := new(controllers.CameraTaskController)
   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")
   userApi := r.Group(urlPrefix + "/user")
   {
      userApi.POST("/login",userController.Login)
      userApi.POST("/login", userController.Login)
   }

   //区域管理
@@ -68,33 +68,33 @@

      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)
      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")
   cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
   {
      cameraTaskArgsApi.GET("/deleteByGroup",cameraTaskArgsController.DeleteByGroup)
      cameraTaskArgsApi.POST("/getLinkRulesByCameraIds",cameraTaskArgsController.GetLinkRulesByCameraIds)
      cameraTaskArgsApi.POST("/saveLinkRulesByGroup",cameraTaskArgsController.SaveLinkRulesByGroup)
      cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
      cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
      cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
   }

   cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
   {
      cameraTaskApi.POST("/saveIsDataTrans",cameraTaskController.SaveIsDataTrans)
      cameraTaskApi.POST("/saveAlarmLevelByGroup",cameraTaskController.SaveAlarmLevelByGroup)
      cameraTaskApi.POST("/updateCameraTaskStatus",cameraTaskController.UpdateCameraTaskStatus)
      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)
   }

   // 任务管理
@@ -143,7 +143,7 @@
      vdbperson.POST("/deleteMoreDbPerson", dbPersonCont.DeleteMoreDbPerson)
      vdbperson.PUT("/addDbPerson", dbPersonCont.AddDbPerson)

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

   // 系统设置 操作
@@ -164,8 +164,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")
@@ -174,33 +174,33 @@
      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("/findByParentId",dicController.FindByParentId)
      dicApi.GET("/findByType", dicController.FindByType)
      dicApi.GET("/findByParentId", dicController.FindByParentId)
   }
   eventPushApi :=r.Group(urlPrefix+"/eventPush")
   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)
      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 := r.Group(urlPrefix + "/pollConfig")
   {
      pollCApi.POST("/savePollPeriod",pollConfigController.SavePollPeriod)
      pollCApi.POST("/savePollDelay",pollConfigController.SavePollDelay)
      pollCApi.GET("/getPollConfig",pollConfigController.GetPollConfig)
      pollCApi.POST("/updateEnable",pollConfigController.UpdateEnable)
      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)