From f98b25a34d04c2acb9bf93e6cbd4e72fa2d81ba0 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 13 Apr 2024 11:40:29 +0800
Subject: [PATCH] 航线规划修改
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 7d2f781..1ac6321 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -19,6 +19,8 @@
import javax.servlet.http.HttpServletRequest;
import java.net.URL;
import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -32,7 +34,8 @@
@Autowired
private IWaylineFileService waylineFileService;
- @GetMapping("/getPatches")
+ //获取图斑信息
+ @GetMapping("/listPatches")
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@@ -45,14 +48,14 @@
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
}
-
- @DeleteMapping("/delPatches")
+ //清空图斑文件
+ @DeleteMapping("/deletePatches")
public ResponseResult del() {
getPatchesService.delPatches();
return ResponseResult.success();
}
-
- @GetMapping("/GetPhoto")
+ //根据dkbh获取图斑图片
+ @GetMapping("/listPhoto")
public ResponseResult<PaginationData<MediaFileEntity>> GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
@@ -69,8 +72,8 @@
return ResponseResult.error("未匹配到相关图片"); // 返回错误信息，可以根据实际情况自定义
}
}
-
- @PostMapping("/getGeo")
+ //上传图斑文件并返回航线
+ @PostMapping("/uploadLot")
public ResponseResult getGeo(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
@RequestParam String waylineName,
@@ -82,12 +85,16 @@
String creator = customClaim.getUsername();
waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
+ Map<String, String> infoMap = new HashMap<>();
URL url = null;
try {
url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
+ infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
+ infoMap.put("waylineId", entity.getWaylineId());
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(MinioUrlUtils.getUrl(url));
+ return ResponseResult.success(infoMap);
+// return ResponseResult.success(MinioUrlUtils.getUrl(url));
}
}
--
Gitblit v1.9.3