From 68f80a7451a126335153ec00bb6cb520a5ae1f8d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Nov 2023 17:02:45 +0800
Subject: [PATCH] 定时任务逻辑修改
---
src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 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..5e66deb 100644
--- a/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
+++ b/src/main/java/com/dji/sample/wayline/controller/WaylineJobController.java
@@ -1,13 +1,18 @@
package com.dji.sample.wayline.controller;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.dao.IWaylineJobMapper;
+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.*;
import com.dji.sample.wayline.service.IWaylineJobService;
+import com.dji.sample.wayline.service.impl.WaylineJobServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -15,6 +20,7 @@
import javax.validation.Valid;
import java.sql.SQLException;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -88,6 +94,20 @@
}
/**
+ * 子查询
+ * @param workspaceId
+ * @return
+ */
+ @GetMapping("/{workspace_id}/getChildrenJobs")
+ @SysLogAnnotation(operModul = "计划库", operType = "查询", operDesc = "分页查询")
+ public ResponseResult<List<WaylineJobDTO>> getChildrenJobs(
+ @PathVariable(name = "workspace_id") String workspaceId, WaylineJobQueryParam waylineJobQueryParam) {
+ List<WaylineJobDTO> data = waylineJobService.getChildrenJobs(workspaceId, waylineJobQueryParam);
+ return ResponseResult.success(data);
+ }
+
+
+ /**
* 查询最新的记录
*
* @return
@@ -142,6 +162,29 @@
}
/**
+ * 统计飞行次数
+ */
+ @PostMapping("/{workspace_id}/patrol_statistics")
+ public ResponseResult<WaylineJobCountDTO> patrolStatistics(@PathVariable(name = "workspace_id") String workspaceId,String queryTime) {
+
+ WaylineJobCountDTO waylineJobCountDTO = waylineJobService.patrolStatistics(workspaceId,queryTime);
+
+ 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
@@ -149,6 +192,6 @@
@PostMapping("/{sn}/jobs/flyByArea")
@SysLogAnnotation(operModul = "根据区域飞行", operType = "根据区域飞行", operDesc = "根据区域飞行")
public ResponseResult flyByArea(@PathVariable(name = "sn") String sn, @RequestBody FlyAreaParam flyAreaParam) {
- return waylineJobService.flyByArea(sn,flyAreaParam );
+ return waylineJobService.flyByArea(sn, flyAreaParam);
}
}
--
Gitblit v1.9.3