From 94a6e4e4bc39153e64f8599e626475c4ce5bdb88 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 16 Jul 2024 13:49:01 +0800
Subject: [PATCH] 修改喊话功能的重新喊话和音频展示接口，新增缩略图展示接口
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 63 ++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 18 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 5860f0b..58b4bd1 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -4,14 +4,15 @@
import com.dji.sample.common.model.PaginationData;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.common.util.MinioUrlUtils;
-import com.dji.sample.log.aspect.SysLogAnnotation;
import com.dji.sample.media.model.MediaFileEntity;
+import com.dji.sample.media.service.impl.FileServiceImpl;
import com.dji.sample.patches.model.Param.PatchesParam;
import com.dji.sample.patches.model.entity.LotInfo;
import com.dji.sample.patches.service.GetPatchesService;
import com.dji.sample.patches.service.ShpToDataSourceService;
-import com.dji.sample.patches.service.impl.ShpToDataSourceServiceImpl;
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;
@@ -28,6 +29,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -44,6 +47,8 @@
private IWaylineJobService waylineJobService;
@Autowired
private TbDkjbxxServiceImpl tbDkjbxxService;
+ @Autowired
+ private FileServiceImpl fileService;
@Autowired
private TimerUtil timerUtil;
@@ -65,6 +70,7 @@
@RequestParam(name = "xmc", required = false) String xmc,
@RequestParam(name = "investigate", required = false) Integer investigate
) {
+ fileService.getNoaddFile();
//调用service分页查询
PatchesParam param = PatchesParam.builder()
.page(page)
@@ -115,22 +121,34 @@
@GetMapping("/getWayline")
public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list) {
try {
- MultipartFile file = timerUtil.getFile(waylineName, list);
+ 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> list,
+ 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, list);
- waylineFileService.importKmzFileBack(file, workspaceId, creator);
+ 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;
@@ -147,10 +165,13 @@
@GetMapping("/useMyTask")
public ResponseResult useMyTask() throws Exception {
try {
-// timerUtil.myTask();
+ timerUtil.myTask();
// timerUtil.myTask2();
// timerUtil.myTask3();
- timerUtil.mytask4();
+// timerUtil.mytask4();
+// timerUtil.mytask5();
+// timerUtil.mytask6();
+// timerUtil.mytask7();
} catch (Exception e) {
throw new RuntimeException("db存储发送出现异常" + e);
@@ -158,16 +179,21 @@
return ResponseResult.success();
}
- // @GetMapping ("/tests")
-// public ResponseResult use() {
-// try {
-// TimerUtil.sendPostWithFileAndParameter("src/main/resources/tmp/20240613/205621_635148ea-0ddb-4b23-945c-8a67abd813c9.db",
-// "635148ea-0ddb-4b23-945c-8a67abd813c9");
-// } catch (IOException e) {
-// throw new RuntimeException(e);
-// }
-// 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,
@@ -190,6 +216,7 @@
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
@RequestParam String dkbh) {
+
try {
PatchesParam param = PatchesParam.builder()
.page(page)
--
Gitblit v1.9.3