From 4ce73562f23f501ac3fd7341a9e2bf3768d0a34b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 18 Jun 2024 11:42:38 +0800
Subject: [PATCH] 航线定时任务，水印工具地址，修改方法注释
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 25 +++++++++++++++----------
1 files changed, 15 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 ab5388a..262ff0a 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -74,19 +74,19 @@
@PostMapping("/upload")
public ResponseResult uploadFile(@RequestParam("file") MultipartFile file,
@RequestParam String taskName,
- @RequestParam String taskId){
- String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
- if (file==null){
+ @RequestParam String taskId) {
+ String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+ if (file == null) {
return ResponseResult.error("上传文件为空");
}
tbDkjbxxService.uploadFile(file);
List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- if (list.size()==0){
+ if (list.size() == 0) {
return ResponseResult.error("上传文件数据为空");
}
try {
- shpToDataSourceService.savaInMysql(list, workspaceId,taskId,taskName);
- }catch (Exception e){
+ shpToDataSourceService.savaInMysql(list, workspaceId, taskId, taskName);
+ } catch (Exception e) {
return ResponseResult.error("上传db文件的内容格式不匹配");
}
return ResponseResult.success("上传成功");
@@ -95,10 +95,15 @@
@PostMapping("/uploadUrl")
public ResponseResult uploadUrl(@RequestBody UploadUrlParam param) {
- tbDkjbxxService.uploadUrl(param.getDbUrl(), param.getTaskName());
- String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
- List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.savaInMysql(list, workspaceId, param.getTaskId(), param.getTaskName());
+ try {
+ tbDkjbxxService.uploadUrl(param.getDbUrl(), param.getTaskName());
+ String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+ List<TbDkjbxxEntity> list = tbDkjbxxService.list();
+ shpToDataSourceService.savaInMysql(list, workspaceId, param.getTaskId(), param.getTaskName());
+ } catch (Exception e) {
+ return ResponseResult.error("文件下载发生错误" + e);
+ }
+
return ResponseResult.success(200);
}
--
Gitblit v1.9.3