From 5245fffadd41c6e83b24c6706e6feb54a6a0ca7b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Apr 2024 15:27:38 +0800
Subject: [PATCH] 修改图斑模块的接口信息，修复航线bug
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/controller/PatchesController.java b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
index 7d2f781..2167075 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -8,6 +8,8 @@
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
+//import com.dji.sample.patches.service.DbFileService;
+import com.dji.sample.patches.service.DbFileService;
import com.dji.sample.patches.service.GetPatchesService;
import com.dji.sample.patches.service.impl.ShpToDataSourceServiceImpl;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
@@ -19,6 +21,8 @@
import javax.servlet.http.HttpServletRequest;
import java.net.URL;
import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -31,8 +35,10 @@
private ShpToDataSourceServiceImpl shpToDataSourceServiceImpl;
@Autowired
private IWaylineFileService waylineFileService;
-
- @GetMapping("/getPatches")
+ @Autowired
+ private DbFileService dbFileService;
+ //获取图斑信息
+ @GetMapping("/listPatches")
@SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@@ -45,14 +51,19 @@
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
}
-
- @DeleteMapping("/delPatches")
+ //清空图斑文件
+ @DeleteMapping("/deletePatches")
public ResponseResult del() {
getPatchesService.delPatches();
return ResponseResult.success();
}
-
- @GetMapping("/GetPhoto")
+ @GetMapping("/dbFile")
+ public ResponseResult dbfile(){
+ dbFileService.importDataFromSQLiteToMySQL();
+ return ResponseResult.success();
+ }
+ //根据dkbh获取图斑图片
+ @GetMapping("/listPhoto")
public ResponseResult<PaginationData<MediaFileEntity>> GetPatchesPhoto(@RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
@@ -69,8 +80,8 @@
return ResponseResult.error("未匹配到相关图片"); // 返回错误信息，可以根据实际情况自定义
}
}
-
- @PostMapping("/getGeo")
+ //上传图斑文件并返回航线
+ @PostMapping("/uploadLot")
public ResponseResult getGeo(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
@RequestParam String waylineName,
@@ -82,12 +93,16 @@
String creator = customClaim.getUsername();
waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
+ Map<String, String> infoMap = new HashMap<>();
URL url = null;
try {
url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
+ infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
+ infoMap.put("waylineId", entity.getWaylineId());
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(MinioUrlUtils.getUrl(url));
+ return ResponseResult.success(infoMap);
+// return ResponseResult.success(MinioUrlUtils.getUrl(url));
}
}
--
Gitblit v1.9.3