From 4ce73562f23f501ac3fd7341a9e2bf3768d0a34b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 18 Jun 2024 11:42:38 +0800
Subject: [PATCH] 航线定时任务，水印工具地址，修改方法注释
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/PatchesController.java b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
index 6ab99e4..d5ff83f 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -16,6 +16,7 @@
import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.service.IWaylineFileService;
+import com.dji.sample.wayline.service.IWaylineJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -39,6 +40,8 @@
private ShpToDataSourceService shpToDataSourceService;
@Autowired
private IWaylineFileService waylineFileService;
+ @Autowired
+ private IWaylineJobService waylineJobService;
@Autowired
private TbDkjbxxServiceImpl tbDkjbxxService;
@Autowired
@@ -107,11 +110,20 @@
public ResponseResult<LotInfo> wayAndPatchesId(@RequestParam String patchesId) {
return ResponseResult.success(getPatchesService.getPatchesFromId(patchesId));
}
+ @GetMapping("/getWayline")
+ public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list){
+ try {
+ MultipartFile file=timerUtil.getFile(waylineName,list);
+ return ResponseResult.success(file);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
@PostMapping("/patchesToWayline")
- public ResponseResult patchesToWayline(List<LotInfo> list,
- String waylineName,
- String workspaceId,
+ public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
+ @RequestParam String waylineName,
+ @RequestParam String workspaceId,
HttpServletRequest request) throws IOException {
CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
@@ -133,23 +145,23 @@
@GetMapping("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
-// timerUtil.myTask();
- timerUtil.myTask2();
+ timerUtil.myTask();
+// timerUtil.myTask2();
return ResponseResult.success();
} catch (Exception e) {
- throw new RuntimeException("db存储发送出现异常");
+ throw new RuntimeException("db存储发送出现异常"+e);
}
}
- @GetMapping ("/tests")
- public ResponseResult use() {
- try {
- TimerUtil.sendPostWithFileAndParameter("src/main/resources/tmp/20240607/103145_635148ea-0ddb-4b23-945c-8a67abd813c9.db",
- "635148ea-0ddb-4b23-945c-8a67abd813c9");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return ResponseResult.success();
- }
+// @GetMapping ("/tests")
+// public ResponseResult use() {
+// try {
+// TimerUtil.sendPostWithFileAndParameter("src/main/resources/tmp/20240613/205621_635148ea-0ddb-4b23-945c-8a67abd813c9.db",
+// "635148ea-0ddb-4b23-945c-8a67abd813c9");
+// } catch (IOException e) {
+// throw new RuntimeException(e);
+// }
+// return ResponseResult.success();
+// }
/**
* 根据图斑的地块编号获取相对应音视频
--
Gitblit v1.9.3