From b546de0e19686d9c2890b85449ce664998a092be Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 11 May 2024 10:05:29 +0800
Subject: [PATCH] 接口放权

---
 src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 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..5bf93b6 100644
--- a/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
+++ b/src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java
@@ -74,13 +74,25 @@
     @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){
@@ -88,7 +100,7 @@
         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