From 1e5aefcfe44ed8570d58cb810e798803186a2a79 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 07 May 2024 10:39:29 +0800
Subject: [PATCH] 修改上传接口
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 56 +++++++++++++++++++++++++++++---------------------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
index 30f6619..863ee4b 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -72,11 +72,13 @@
* @return
*/
@PostMapping("/upload")
- public ResponseResult uploadFile(@RequestParam("file") MultipartFile file){
+ public ResponseResult uploadFile(@RequestParam("file") MultipartFile file,
+ @RequestParam String taskName,
+ @RequestParam int taskId){
String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
tbDkjbxxService.uploadFile(file);
List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.savaInMysql(list, workspaceId);
+ shpToDataSourceService.savaInMysql(list, workspaceId,taskId,taskName);
return ResponseResult.success("上传成功");
}
@@ -85,7 +87,7 @@
tbDkjbxxService.uploadUrl(param.getDbUrl());
String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.savaInMysql(list, workspaceId);
+ shpToDataSourceService.savaInMysql(list, workspaceId,param.getTaskId(),param.getTaskName());
return ResponseResult.success("上传成功");
}
@@ -100,28 +102,28 @@
* @return
* @throws Exception
*/
- @PostMapping("/uploadLot")
- public ResponseResult getGeo(@RequestParam String workspaceId,
- @RequestParam String waylineName,
- @RequestParam double airportLat,
- @RequestParam double airportLon,
- HttpServletRequest request) throws Exception {
- List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.savaInMysql(list, workspaceId);
- MultipartFile multipartFile = tbDkjbxxService.listFile(workspaceId, waylineName, airportLat, airportLon);
- CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
- 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(infoMap);
- }
+// @PostMapping("/uploadLot")
+// public ResponseResult getGeo(@RequestParam String workspaceId,
+// @RequestParam String waylineName,
+// @RequestParam double airportLat,
+// @RequestParam double airportLon,
+// HttpServletRequest request) throws Exception {
+// List<TbDkjbxxEntity> list = tbDkjbxxService.list();
+// shpToDataSourceService.savaInMysql(list, workspaceId);
+// MultipartFile multipartFile = tbDkjbxxService.listFile(workspaceId, waylineName, airportLat, airportLon);
+// CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
+// 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(infoMap);
+// }
}
\ No newline at end of file
--
Gitblit v1.9.3