From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/territory/controller/TbDkjbxxController.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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..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,21 +74,37 @@
@PostMapping("/upload")
public ResponseResult uploadFile(@RequestParam("file") MultipartFile file,
@RequestParam String taskName,
- @RequestParam int taskId){
- String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+ @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());
- String workspaceId="4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
- List<TbDkjbxxEntity> list = tbDkjbxxService.list();
- shpToDataSourceService.savaInMysql(list, workspaceId,param.getTaskId(),param.getTaskName());
- return ResponseResult.success("上传成功");
+ public ResponseResult uploadUrl(@RequestBody UploadUrlParam param) {
+ 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