From cbc15bffc95c486ec8fe67270d8d4e08de7b1407 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 06 May 2024 14:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 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 44e4415..30f6619 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.*;
@@ -63,21 +65,33 @@
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
+ */
+ @PostMapping("/upload")
+ public ResponseResult uploadFile(@RequestParam("file") MultipartFile file){
+ String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+ tbDkjbxxService.uploadFile(file);
+ List<TbDkjbxxEntity> list = tbDkjbxxService.list();
+ shpToDataSourceService.savaInMysql(list, workspaceId);
+ 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);
+ return ResponseResult.success("上传成功");
+ }
/**
* 将sqlite里的数据入库并生成航线
+ *
* @param workspaceId
* @param waylineName
* @param airportLat
@@ -93,7 +107,7 @@
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.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