From 426ab1ff3eb77393746cbe6b26db34058b58e14c Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 05 Jul 2024 14:16:35 +0800
Subject: [PATCH] 完成航线智能生成接口，修改水印图片上传地址
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 5860f0b..7972618 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -6,6 +6,7 @@
import com.dji.sample.common.util.MinioUrlUtils;
import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.media.model.MediaFileEntity;
+import com.dji.sample.media.service.impl.FileServiceImpl;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
@@ -28,6 +29,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -44,6 +47,8 @@
private IWaylineJobService waylineJobService;
@Autowired
private TbDkjbxxServiceImpl tbDkjbxxService;
+ @Autowired
+ private FileServiceImpl fileService;
@Autowired
private TimerUtil timerUtil;
@@ -115,7 +120,7 @@
@GetMapping("/getWayline")
public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list) {
try {
- MultipartFile file = timerUtil.getFile(waylineName, list);
+ MultipartFile file = timerUtil.getFile(waylineName, list, 25.8917266,116.020940643);
return ResponseResult.success(file);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -126,10 +131,12 @@
public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
@RequestParam String waylineName,
@RequestParam String workspaceId,
+ @RequestParam double lat,
+ @RequestParam double lon,
HttpServletRequest request) throws IOException {
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
- MultipartFile file = timerUtil.getFile(waylineName, list);
+ MultipartFile file = timerUtil.getFile(waylineName, list,lat,lon);
waylineFileService.importKmzFileBack(file, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
@@ -151,6 +158,9 @@
// timerUtil.myTask2();
// timerUtil.myTask3();
timerUtil.mytask4();
+ timerUtil.mytask5();
+ timerUtil.mytask6();
+ timerUtil.mytask7();
} catch (Exception e) {
throw new RuntimeException("db存储发送出现异常" + e);
@@ -158,16 +168,20 @@
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();
-// }
+ @GetMapping ("/tests")
+ public ResponseResult use() {
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ executor.execute(() -> {
+ try {
+ timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
+ "635148ea-0ddb-4b23-945c-8a67abd813c9");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ executor.shutdown();
+ return ResponseResult.success();
+ }
@PostMapping("/way")
public void getway(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
@@ -190,7 +204,9 @@
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
@RequestParam String dkbh) {
+
try {
+ fileService.getNoaddFile();
PatchesParam param = PatchesParam.builder()
.page(page)
.workspaceId(workspaceId)
--
Gitblit v1.9.3