From 41dc2ca8393e40e9efb8a6bf05f2ab1400d80215 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 25 Apr 2024 17:25:58 +0800
Subject: [PATCH] 取消返航
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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..4e8c897 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -53,7 +53,7 @@
@Autowired
private ITbDkjbxxService tbDkjbxxService;
@Autowired
- private ShpToDataSourceService service;
+ private ShpToDataSourceService shpToDataSourceService;
@Autowired
private IWaylineFileService waylineFileService;
@@ -65,17 +65,27 @@
/**
* 上传文件并保存到数据库
+ *
* @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("/upload")
+ public ResponseResult uploadFile(@RequestParam("file") MultipartFile file) {
+ tbDkjbxxService.uploadFile(file);
+ 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,
@@ -83,7 +93,7 @@
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- service.savaInMysql(list,workspaceId);
+ shpToDataSourceService.savaInMysql(list, workspaceId);
MultipartFile multipartFile = tbDkjbxxService.listFile(workspaceId, waylineName, airportLat, airportLon);
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
--
Gitblit v1.9.3