From 3afaf1a21f47b6f9b46dd8e089e15e1e325c810a Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Jul 2024 15:44:51 +0800
Subject: [PATCH] 更新喇叭，图斑解析更新
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 102 +++++++++++++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 43 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 60a880c..0d46446 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -11,6 +11,8 @@
import com.dji.sample.patches.service.GetPatchesService;
import com.dji.sample.patches.service.ShpToDataSourceService;
import com.dji.sample.patches.utils.DistrictCodeUtils;
+import com.dji.sample.patches.utils.GeoToolsUtil;
+import com.dji.sample.patches.utils.PointPO;
import com.dji.sample.patches.utils.TimerUtil;
import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
@@ -119,50 +121,63 @@
@GetMapping("/getWayline")
public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list) {
try {
- MultipartFile file = timerUtil.getFile(waylineName, list, 25.8917266,116.020940643);
+ MultipartFile file = timerUtil.getFile(waylineName, list, 25.8917266, 116.020940643);
return ResponseResult.success(file);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
+ @GetMapping("/getPoint")
+ public List<PointPO> getPoint(@RequestParam List<Integer> list,
+ @RequestParam Double airportLat,
+ @RequestParam Double airportLon) {
+ List<LotInfo> lotInfos = getPatchesService.getLotInfosByIds(list);
+ System.out.println(lotInfos);
+ System.out.println(lotInfos);
+ System.out.println(lotInfos);
+ System.out.println(lotInfos);
+ System.out.println(lotInfos);
+ System.out.println(lotInfos);
+ return GeoToolsUtil.getRoutePointOrder(lotInfos, airportLat, airportLon);
+ }
- @PostMapping("/patchesToWayline")
- public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
- @RequestParam String waylineName,
- @RequestParam String spotInFreckle,
- @RequestParam String workspaceId,
- @RequestParam String patchesId,
- @RequestParam double lat,
- @RequestParam double lon,
- HttpServletRequest request) throws IOException {
- CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
- String creator = customClaim.getUsername();
- MultipartFile file = timerUtil.getFile(waylineName, lotInfos, lat, lon);
- waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, spotInFreckle);
- 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(infoMap);
+ @PostMapping("/patchesToWayline")
+ public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
+ @RequestParam String waylineName,
+ @RequestParam String spotInFreckle,
+ @RequestParam String workspaceId,
+ @RequestParam String patchesId,
+ @RequestParam double lat,
+ @RequestParam double lon,
+ HttpServletRequest request) throws IOException {
+ CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
+ String creator = customClaim.getUsername();
+ MultipartFile file = timerUtil.getFile(waylineName, lotInfos, lat, lon);
+ waylineFileService.importKmzFile(file, workspaceId, creator, patchesId, spotInFreckle);
+ 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(infoMap);
+ }
@GetMapping("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
-// timerUtil.myTask();
+ timerUtil.myTask();
// timerUtil.myTask2();
// timerUtil.myTask3();
- timerUtil.mytask4();
- timerUtil.mytask5();
- timerUtil.mytask6();
- timerUtil.mytask7();
+// timerUtil.mytask4();
+// timerUtil.mytask5();
+// timerUtil.mytask6();
+// timerUtil.mytask7();
} catch (Exception e) {
throw new RuntimeException("db存储发送出现异常" + e);
@@ -170,20 +185,21 @@
return ResponseResult.success();
}
- @GetMapping ("/tests")
- public ResponseResult use() {
- ExecutorService executor = Executors.newSingleThreadExecutor();
- executor.execute(() -> {
- try {
- timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
- "635148ea-0ddb-4b23-945c-8a67abd813c9");
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- });
- executor.shutdown();
- return ResponseResult.success();
+ @GetMapping("/tests")
+ public ResponseResult use() {
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ executor.execute(() -> {
+ try {
+ timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
+ "635148ea-0ddb-4b23-945c-8a67abd813c9");
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ executor.shutdown();
+ return ResponseResult.success();
}
+
@PostMapping("/way")
public void getway(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
--
Gitblit v1.9.3