ruleTemplate instead of task

liuxiaolong

2020-06-24 dff98ff959934d17b8222b06e827231374be55eb

 router/router.go

@@ -31,8 +31,8 @@
   deleteDataController := new(controllers.DeleteDataController)
   cameraTimeRuleController := new(controllers.CameraTimeruleController)
   polygonController := new(controllers.CameraPolygonController)
   cameraTaskController := new(controllers.CameraTaskController)
   cameraTaskArgsController := new(controllers.CameraTaskArgsController)
   //cameraTaskController := new(controllers.CameraTaskController)
   //cameraTaskArgsController := new(controllers.CameraTaskArgsController)
   dicController := new(controllers.DictionaryController)
   userController := new(controllers.UserController)
   eventPushController := new(controllers.EventPushController)
@@ -48,6 +48,8 @@
    icController := new(controllers.InfoController)
    gb28181C := new(controllers.Gb28181Controller)
    fStackC := new(controllers.FileStackController)
   cameraRuleController := new (controllers.CameraRuleController)
   rtc := new(controllers.RuleTemplateController)

   urlPrefix := "/data/api-v" // wp 添加 路径 前缀

@@ -110,12 +112,12 @@
        camera.POST("/updateCameraArea", cameraController.UpdateCameraArea)
      camera.GET("/updateSnapshotUrl/:cid", cameraController.UpdateSnapshotUrl)

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

      camera.DELETE("/delTask/:cameraId/:taskId", cameraController.CameraDelTask)
      camera.POST("/saveTask", cameraController.CameraTaskSave)
      camera.GET("/getRulesByCameraAndTask", cameraTaskArgsController.FindByCameraAndTask)
      //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)
@@ -123,26 +125,42 @@

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

   cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
   rtcApi := r.Group(urlPrefix + "/template")
   {
      cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
      cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
      cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
      cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)

      cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
      rtcApi.POST("/rule/save", rtc.Save)
      rtcApi.GET("/rule/:id", rtc.Show)
      rtcApi.DELETE("/rule/:id", rtc.Delete)
      rtcApi.GET("/rule", rtc.FindAll)
   }

   cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
   cameraRuleApi :=r.Group(urlPrefix+"/camera/rule")
   {
      cameraTaskApi.POST("/saveIsDataTrans", cameraTaskController.SaveIsDataTrans)
      cameraTaskApi.POST("/saveAlarmLevelByGroup", cameraTaskController.SaveAlarmLevelByGroup)
      cameraTaskApi.POST("/updateCameraTaskStatus", cameraTaskController.UpdateCameraTaskStatus)
      cameraTaskApi.POST("/addTask", cameraTaskController.AddTask)
      cameraRuleApi.GET("/:cameraId", cameraRuleController.FindByCameraId)
      cameraRuleApi.GET("/deleteByGroup",cameraRuleController.DeleteByGroup)
      cameraRuleApi.POST("/getLinkRulesByCameraIds",cameraRuleController.GetLinkRulesByCameraIds)
      cameraRuleApi.POST("/save", cameraRuleController.Save)
      cameraRuleApi.POST("/saveLinkRulesByGroup",cameraRuleController.SaveLinkRulesByGroup)
   }

   //cameraTaskArgsApi := r.Group(urlPrefix + "/cameraTaskArgs")
   //{
   //   cameraTaskArgsApi.GET("/deleteByGroup", cameraTaskArgsController.DeleteByGroup)
   //   cameraTaskArgsApi.POST("/getLinkRulesByCameraIds", cameraTaskArgsController.GetLinkRulesByCameraIds)
   //   cameraTaskArgsApi.POST("/saveLinkRulesByGroup", cameraTaskArgsController.SaveLinkRulesByGroup)
   //   cameraTaskArgsApi.POST("/updateDefenceStateByGroup", cameraTaskArgsController.UpdateDefenceStateByGroup)
   //
   //   cameraTaskArgsApi.POST("/ruleApply2All", cameraTaskArgsController.RuleApply2All)
   //}

   //cameraTaskApi := r.Group(urlPrefix + "/cameraTask")
   //{
   //   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")
   {
@@ -156,19 +174,19 @@
   // 任务管理
   task := r.Group(urlPrefix + "/task")
   {
      task.GET("/findAll", taskController.FindAll)
      //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)
      task.POST("/addTaskSdk", taskController.AddTaskSdk)
      task.GET("/delTaskSdk", taskController.DeleteTaskSdk)
      task.POST("/updateTaskName", taskController.UpdateTaskName)
      task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
      task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
      task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)

      task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
      //task.POST("/addTask", taskController.AddTask)
      //task.POST("/updateTaskStatus", taskController.UpdateTaskStatus)
      //task.GET("/delete", taskController.DeleteTask)
      //task.POST("/addTaskSdk", taskController.AddTaskSdk)
      //task.GET("/delTaskSdk", taskController.DeleteTaskSdk)
      //task.POST("/updateTaskName", taskController.UpdateTaskName)
      //task.GET("/getRulesByTaskSdk", taskController.GetRulesByTaskSdk)
      //task.POST("/deleteTaskSdkRule", taskController.DeleteTaskSdkRule)
      //task.POST("/saveTaskSdkRule", taskController.SaveTaskSdkRule)
      //
      //task.GET("/statisticTaskCamera", taskController.StatisticTaskCamera)
   }

   // 检索 查询 节点操作