From de74b2fadf886660ea02a45005374c36382df6bd Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 23 Apr 2024 15:56:18 +0800
Subject: [PATCH] https配置
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 a0f82bb..44e4415 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;
@@ -63,25 +63,37 @@
return ResponseResult.success(list);
}
- /**
- * 上传文件并保存到数据库
- * @param file 需要上传的文件，通过multipart/form-data方式提交
- * @return 返回上传结果的ResponseResult对象，其中包含上传成功的消息
- */
- @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);
- }
+// /**
+// * 上传文件并保存到数据库
+// * @param file 需要上传的文件，通过multipart/form-data方式提交
+// * @return 返回上传结果的ResponseResult对象，其中包含上传成功的消息
+// */
+// @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);
+// }
+ /**
+ * 将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();
--
Gitblit v1.9.3