From 086ef5ab15ebd71f8e454868503c6d29b6c5eb98 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 26 Jul 2024 15:48:37 +0800
Subject: [PATCH] 新增图斑上传者
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 da5a457..e20ce42 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -139,16 +139,16 @@
@PostMapping("/patchesToWayline")
public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
@RequestParam String waylineName,
- @RequestParam String spotInFreckle,
@RequestParam String workspaceId,
- @RequestParam String patchesId,
+ @RequestParam (required = false) String patchesId,
@RequestParam double lat,
@RequestParam double lon,
+ @RequestParam(defaultValue = "1",required = false) String isTemp,
HttpServletRequest request) throws IOException {
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, spotInFreckle);
+ waylineFileService.importKmzFile(file, workspaceId, creator, patchesId,isTemp);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
URL url = null;
@@ -165,7 +165,7 @@
@GetMapping("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
- TimerUtil.mytask10();
+// TimerUtil.mytask10();
// timerUtil.myTask2();
// timerUtil.myTask3();
// timerUtil.mytask4();
@@ -249,9 +249,9 @@
@RequestParam double airportLat,
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
- MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
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);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
--
Gitblit v1.9.3