From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 85fb454..41ca14e 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -155,7 +155,7 @@
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
MultipartFile file = timerUtil.getFile(waylineName, lotInfos, lat, lon);
- waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, isTemp);
+ waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, isTemp,1);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
URL url = null;
@@ -200,14 +200,14 @@
executor.shutdown();
return ResponseResult.success();
}
-
- @PostMapping("/way")
- public void getway(@RequestParam("file") MultipartFile file,
- @RequestParam String workspaceId,
- @RequestParam String waylineName,
- @RequestParam String username) {
- waylineFileService.importKmzFileBack(file, workspaceId, username);
- }
+//
+// @PostMapping("/way")
+// public void getway(@RequestParam("file") MultipartFile file,
+// @RequestParam String workspaceId,
+// @RequestParam String waylineName,
+// @RequestParam String username) {
+// waylineFileService.importKmzFileBack(file, workspaceId, username);
+// }
/**
* 根据图斑的地块编号获取相对应音视频
@@ -263,7 +263,7 @@
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon, creator);
- waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
+ waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator,1);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
URL url = null;
--
Gitblit v1.9.3