From 86384846e317381e7bb9e31ee76760e4ecb3ee67 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 29 Jul 2024 11:49:57 +0800
Subject: [PATCH] 新增2m压缩图，修改喇叭功能，修改面状航线的修改接口
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 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 fba9968..1d4494e 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;
@@ -66,8 +68,11 @@
@RequestParam(name = "xzqdm", required = false) String xzqdm,
@RequestParam(name = "bsm", required = false) String bsm,
@RequestParam(name = "xmc", required = false) String xmc,
- @RequestParam(name = "investigate", required = false) Integer investigate
- ) {
+ @RequestParam(name = "investigate", required = false) Integer investigate,
+ @RequestParam(name = "dkmj", required = false) Double dkmj,
+ @RequestParam(name = "isPlan",required = false) Integer isPlan
+ ) {
+ fileService.getNoaddFile();
//调用service分页查询
PatchesParam param = PatchesParam.builder()
.page(page)
@@ -78,6 +83,8 @@
.bsm(bsm)
.xmc(xmc)
.investigate(investigate)
+ .dkmj(dkmj)
+ .isPlan(isPlan)
.build();
PaginationData<LotInfo> data = getPatchesService.limitGet(param);
return ResponseResult.success(data);
@@ -118,56 +125,79 @@
@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);
+ 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;
+ @PostMapping("/patchesToWayline")
+ public ResponseResult patchesToWayline(@RequestBody List<LotInfo> lotInfos,
+ @RequestParam String waylineName,
+ @RequestParam String workspaceId,
+ @RequestParam(required = false) String patchesId,
+ @RequestParam double lat,
+ @RequestParam double lon,
+ @RequestParam(defaultValue = "1", required = false) String isTemp,
+ 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, isTemp);
+ 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.mytask10();
+// timerUtil.myTask2();
+// timerUtil.myTask3();
+// timerUtil.mytask4();
+// timerUtil.mytask5();
+// timerUtil.mytask6();
+// timerUtil.mytask7();
+
+ } catch (Exception e) {
+ throw new RuntimeException("db存储发送出现异常" + e);
+ }
+ return ResponseResult.success();
+ }
+
+ @GetMapping("/tests")
+ public ResponseResult use() {
+ ExecutorService executor = Executors.newSingleThreadExecutor();
+ executor.execute(() -> {
try {
- url = waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
- infoMap.put("url", String.valueOf(MinioUrlUtils.getUrl(url)));
- infoMap.put("waylineId", entity.getWaylineId());
- } catch (SQLException e) {
+ timerUtil.sendPostWithFileAndParameter("DB/result_db.db",
+ "635148ea-0ddb-4b23-945c-8a67abd813c9");
+ } catch (Exception e) {
throw new RuntimeException(e);
}
- return ResponseResult.success(infoMap);
- }
-
-
-
- @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();
+ });
+ executor.shutdown();
+ return ResponseResult.success();
}
+
@PostMapping("/way")
public void getway(@RequestParam("file") MultipartFile file,
@RequestParam String workspaceId,
@@ -192,7 +222,6 @@
@RequestParam String dkbh) {
try {
- fileService.getNoaddFile();
PatchesParam param = PatchesParam.builder()
.page(page)
.workspaceId(workspaceId)
@@ -224,9 +253,9 @@
@RequestParam double airportLat,
@RequestParam double airportLon,
HttpServletRequest request) throws Exception {
- MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon);
CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
+ MultipartFile multipartFile = shpToDataSourceService.insertGeo(file, workspaceId, waylineName, airportLat, airportLon, creator);
waylineFileService.importKmzFileBack(multipartFile, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
--
Gitblit v1.9.3