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 | 90 +++++++++++++++++++++++++++++----------------
1 files changed, 58 insertions(+), 32 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 14fdec2..863ee4b 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -17,11 +17,13 @@
import com.dji.sample.patches.xml.mode.XMLTemplateModel;
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
import com.dji.sample.territory.model.entity.TbDkjbxxEntity;
+import com.dji.sample.territory.model.entity.param.UploadUrlParam;
import com.dji.sample.territory.service.ITbDkjbxxService;
import com.dji.sample.territory.service.ITbFJService;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.service.IWaylineFileService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.locationtech.jts.geom.Coordinate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -53,7 +55,7 @@
@Autowired
private ITbDkjbxxService tbDkjbxxService;
@Autowired
- private ShpToDataSourceService service;
+ private ShpToDataSourceService shpToDataSourceService;
@Autowired
private IWaylineFileService waylineFileService;
@@ -65,39 +67,63 @@
/**
* 上传文件并保存到数据库
+ *
* @param file 需要上传的文件，通过multipart/form-data方式提交
- * @return 返回上传结果的ResponseResult对象，其中包含上传成功的消息
+ * @return
*/
-// @PostMapping("/upload")
-// public ResponseResult<String> uploadFile(@RequestParam("file") MultipartFile file) {
-// tbDkjbxxService.uploadFile(file);
-// List<TbDkjbxxEntity> list = tbDkjbxxService.list();
-//// service.savaInMysql(list);
-// return tbDkjbxxService.uploadFile(file);
-// }
-
- @PostMapping("/uploadLot")
- public ResponseResult getGeo(@RequestParam String workspaceId,
- @RequestParam String waylineName,
- @RequestParam double airportLat,
- @RequestParam double airportLon,
- HttpServletRequest request) throws Exception {
+ @PostMapping("/upload")
+ 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();
- service.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);
+ shpToDataSourceService.savaInMysql(list, workspaceId,taskId,taskName);
+ return ResponseResult.success("上传成功");
}
+
+ @PostMapping("/uploadUrl")
+ public ResponseResult uploadUrl( @RequestBody UploadUrlParam param){
+ tbDkjbxxService.uploadUrl(param.getDbUrl());
+ String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+ List<TbDkjbxxEntity> list = tbDkjbxxService.list();
+ shpToDataSourceService.savaInMysql(list, workspaceId,param.getTaskId(),param.getTaskName());
+ return ResponseResult.success("上传成功");
+ }
+
+ /**
+ * 将sqlite里的数据入库并生成航线
+ *
+ * @param workspaceId
+ * @param waylineName
+ * @param airportLat
+ * @param airportLon
+ * @param request
+ * @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);
+// }
}
\ No newline at end of file
--
Gitblit v1.9.3