From e60ea14897e4512efe505b8b3aea7cb2e49df39f Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 17 Oct 2023 18:10:31 +0800
Subject: [PATCH] 用户操作日志

---
 src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
index 29277d0..788dee3 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -3,6 +3,7 @@
 import com.dji.sample.common.model.CustomClaim;
 import com.dji.sample.common.model.PaginationData;
 import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.log.aspect.SysLogAnnotation;
 import com.dji.sample.wayline.model.dto.WaylineJobDTO;
 import com.dji.sample.wayline.model.param.CreateJobParam;
 import com.dji.sample.wayline.model.param.UpdateJobParam;
@@ -39,12 +40,32 @@
      * @throws SQLException
      */
     @PostMapping("/{workspace_id}/flight-tasks")
+    @SysLogAnnotation(operModul = "计划库", operType = "新增", operDesc = "创建计划")
     public ResponseResult createJob(HttpServletRequest request, @Valid @RequestBody CreateJobParam param,
                                     @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
         CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
         customClaim.setWorkspaceId(workspaceId);
 
         return waylineJobService.publishFlightTask(param, customClaim);
+    }
+
+
+    /**
+     * 创建航路任务(重复定时和连续执行)
+     * @param request
+     * @param param
+     * @param workspaceId
+     * @return
+     * @throws SQLException
+     */
+    @PostMapping("/{workspace_id}/flight-tasks-condition")
+    @SysLogAnnotation(operModul = "计划库", operType = "新增", operDesc = "创建航路任务(重复定时和连续执行)")
+    public ResponseResult createJobCondition(HttpServletRequest request, @Valid @RequestBody CreateJobParam param,
+                                    @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
+        CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
+        customClaim.setWorkspaceId(workspaceId);
+
+        return waylineJobService.publishFlightTaskCondition(param, customClaim);
     }
 
     /**
@@ -55,6 +76,7 @@
      * @return
      */
     @GetMapping("/{workspace_id}/jobs")
+    @SysLogAnnotation(operModul = "计划库", operType = "查询", operDesc = "分页查询")
     public ResponseResult<PaginationData<WaylineJobDTO>> getJobs(@RequestParam(defaultValue = "1") Long page,
                                                                  @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
                                                                  @PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam){
@@ -70,6 +92,7 @@
      * @throws SQLException
      */
     @DeleteMapping("/{workspace_id}/jobs")
+    @SysLogAnnotation(operModul = "计划库", operType = "删除", operDesc = "发送命令取消作业")
     public ResponseResult publishCancelJob(@RequestParam(name = "job_id") Set<String> jobIds,
                                      @PathVariable(name = "workspace_id") String workspaceId) throws SQLException {
         waylineJobService.cancelFlightTask(workspaceId, jobIds);
@@ -83,6 +106,7 @@
      * @return
      */
     @PostMapping("/{workspace_id}/jobs/{job_id}/media-highest")
+    @SysLogAnnotation(operModul = "计划库", operType = "修改", operDesc = "将此作业的媒体文件设置为立即上传")
     public ResponseResult uploadMediaHighestPriority(@PathVariable(name = "workspace_id") String workspaceId,
                                              @PathVariable(name = "job_id") String jobId) {
         waylineJobService.uploadMediaHighestPriority(workspaceId, jobId);
@@ -90,6 +114,7 @@
     }
 
     @PutMapping("/{workspace_id}/jobs/{job_id}")
+    @SysLogAnnotation(operModul = "计划库", operType = "修改", operDesc = "修改")
     public ResponseResult updateJobStatus(@PathVariable(name = "workspace_id") String workspaceId,
                                           @PathVariable(name = "job_id") String jobId,
                                           @Valid @RequestBody UpdateJobParam param) {

--
Gitblit v1.9.3