From fb5e5269118bdfbf324b410defcd0831d4ecea27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 23 Apr 2024 16:33:33 +0800
Subject: [PATCH] 完善DB文件上传接口
---
src/main/java/com/dji/sample/territory/pojo/TerritoryConfigPojo.java | 19 +++++++++
src/main/java/com/dji/sample/territory/service/ITbDkjbxxService.java | 14 +++---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 26 ++++++------
src/main/resources/application-dev.yml | 7 +++
src/main/resources/application-prod.yml | 6 ++
5 files changed, 50 insertions(+), 22 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..4e8c897 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -63,21 +63,21 @@
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) {
+ tbDkjbxxService.uploadFile(file);
+ return ResponseResult.success("文件上传成功");
+ }
/**
* 将sqlite里的数据入库并生成航线
+ *
* @param workspaceId
* @param waylineName
* @param airportLat
@@ -93,7 +93,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();
diff --git a/src/main/java/com/dji/sample/territory/pojo/TerritoryConfigPojo.java b/src/main/java/com/dji/sample/territory/pojo/TerritoryConfigPojo.java
new file mode 100644
index 0000000..d5eae34
--- /dev/null
+++ b/src/main/java/com/dji/sample/territory/pojo/TerritoryConfigPojo.java
@@ -0,0 +1,19 @@
+package com.dji.sample.territory.pojo;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @PROJECT_NAME: drone
+ * @DESCRIPTION:
+ * @USER: aix
+ * @DATE: 2024/4/11 11:04
+ */
+
+@Configuration
+@Data
+public class TerritoryConfigPojo {
+ @Value("${db.sqlite.resource}")
+ private String Path;
+}
diff --git a/src/main/java/com/dji/sample/territory/service/ITbDkjbxxService.java b/src/main/java/com/dji/sample/territory/service/ITbDkjbxxService.java
index 5c0c8cb..7686445 100644
--- a/src/main/java/com/dji/sample/territory/service/ITbDkjbxxService.java
+++ b/src/main/java/com/dji/sample/territory/service/ITbDkjbxxService.java
@@ -18,13 +18,13 @@
* @DATE: 2024/4/10 11:19
*/
public interface ITbDkjbxxService extends IService<TbDkjbxxEntity> {
-// /**
-// * 上传DB文件并覆盖之前DB文件，自动读取数据到本地数据库
-// *
-// * @param file
-// * @return
-// */
-// ResponseResult<String> uploadFile(MultipartFile file);
+ /**
+ * 上传DB文件并覆盖之前DB文件，自动读取数据到本地数据库
+ *
+ * @param file
+ * @return
+ */
+ ResponseResult<String> uploadFile(MultipartFile file);
MultipartFile listFile(String workspaceId, String waylineName, double airportLat, double airportLon) throws IOException;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 80e4a08..f0ab298 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -109,4 +109,9 @@
waylines: src/main/resources/template/waylines.xml
target:
template: src/main/resources/template/wpmz/template.kml
- waylines: src/main/resources/template/wpmz/waylines.wpml
\ No newline at end of file
+ waylines: src/main/resources/template/wpmz/waylines.wpml
+
+
+db:
+ sqlite:
+ resource: DB/resource_db.db
\ No newline at end of file
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 655bec5..58a4d4a 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -109,4 +109,8 @@
waylines: /home/drone/server/template/waylines.xml
target:
template: /home/drone/server/template/wpmz/template.kml
- waylines: /home/drone/server/template/wpmz/waylines.wpml
\ No newline at end of file
+ waylines: /home/drone/server/template/wpmz/waylines.wpml
+
+db:
+ sqlite:
+ resource: /home/drone/server/sqlite/resource_db.db
\ No newline at end of file
--
Gitblit v1.9.3