From 2caa210098644f51ff46daa33b87ce4b7f862a91 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 10:12:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htxx_dev' into htxx_dev

---
 src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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 0a416e0..0ec0776 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -4,6 +4,7 @@
 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.WaylineJobCountDTO;
 import com.dji.sample.wayline.model.dto.WaylineJobDTO;
 import com.dji.sample.wayline.model.entity.WaylineJobEntity;
 import com.dji.sample.wayline.model.param.*;
@@ -142,6 +143,29 @@
     }
 
     /**
+     * 统计飞行次数
+     */
+    @PostMapping("/{workspace_id}/patrol_statistics")
+    public ResponseResult<WaylineJobCountDTO> patrolStatistics(@PathVariable(name = "workspace_id") String workspaceId){
+
+        WaylineJobCountDTO waylineJobCountDTO = waylineJobService.patrolStatistics(workspaceId);
+
+        return ResponseResult.success(waylineJobCountDTO);
+    }
+
+    /**
+     * 收藏媒体库
+     */
+    @PostMapping("/update_job_collect")
+    public ResponseResult updateJobCollect(HttpServletRequest request, @RequestBody WaylineJobEntity waylineJob){
+        CustomClaim claims = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
+        waylineJob.setUserId(claims.getId());
+        waylineJobService.updateJobCollect(waylineJob);
+
+        return ResponseResult.success();
+    }
+
+    /**
      * 根据区域飞行
      *
      * @return

--
Gitblit v1.9.3