From bb3652e04f5a66172d0a6cd6ec2535b82e7ca2ed Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 04 Jun 2024 17:19:51 +0800
Subject: [PATCH] 修改航线查询、添加方法，图斑查询方法。
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 863ee4b..1b0ad06 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -74,21 +74,33 @@
@PostMapping("/upload")
public ResponseResult uploadFile(@RequestParam("file") MultipartFile file,
@RequestParam String taskName,
- @RequestParam int taskId){
+ @RequestParam String taskId){
String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+ if (file==null){
+ return ResponseResult.error("上传文件为空");
+ }
tbDkjbxxService.uploadFile(file);
List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.savaInMysql(list, workspaceId,taskId,taskName);
+ if (list.size()==0){
+ return ResponseResult.error("上传文件数据为空");
+ }
+ try {
+ shpToDataSourceService.savaInMysql(list, workspaceId,taskId,taskName);
+ }catch (Exception e){
+ return ResponseResult.error("上传db文件的内容格式不匹配");
+ }
return ResponseResult.success("上传成功");
}
+
+
@PostMapping("/uploadUrl")
public ResponseResult uploadUrl( @RequestBody UploadUrlParam param){
- tbDkjbxxService.uploadUrl(param.getDbUrl());
+ 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());
- return ResponseResult.success("上传成功");
+ return ResponseResult.success(200);
}
/**
--
Gitblit v1.9.3