From 7b8c8077af714c808ae7a51ed5d3abbd407cc620 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 26 Jun 2024 17:15:29 +0800
Subject: [PATCH] 修改成果展示查询接口名字为空时的错误bug，加上按拍照时间倒叙。修改定时器时间
---
src/main/java/com/dji/sample/patches/controller/PatchesController.java | 73 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 24 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 7651ead..1a845ad 100644
--- a/src/main/java/com/dji/sample/patches/controller/PatchesController.java
+++ b/src/main/java/com/dji/sample/patches/controller/PatchesController.java
@@ -16,6 +16,7 @@
import com.dji.sample.territory.service.impl.TbDkjbxxServiceImpl;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.service.IWaylineFileService;
+import com.dji.sample.wayline.service.IWaylineJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -27,6 +28,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;
@@ -39,6 +42,8 @@
private ShpToDataSourceService shpToDataSourceService;
@Autowired
private IWaylineFileService waylineFileService;
+ @Autowired
+ private IWaylineJobService waylineJobService;
@Autowired
private TbDkjbxxServiceImpl tbDkjbxxService;
@Autowired
@@ -53,7 +58,6 @@
* @return
*/
@GetMapping("/listPatches")
- @SysLogAnnotation(operModul = "图斑", operType = "查询", operDesc = "查询图斑的全部信息")
public ResponseResult<PaginationData<LotInfo>> page(@RequestParam Integer page,
@RequestParam(name = "page_size", defaultValue = "10") Integer pageSize,
@RequestParam String workspaceId,
@@ -86,14 +90,15 @@
*/
@DeleteMapping("/deletePatches")
public ResponseResult del(String workspaceId) {
- int count=getPatchesService.delPatches(workspaceId);
- return ResponseResult.success("删除的图斑数量是"+count);
+ int count = getPatchesService.delPatches(workspaceId);
+ return ResponseResult.success("删除的图斑数量是" + count);
}
+
@DeleteMapping("/deleteOne")
- public ResponseResult deleteOne(int id){
- int count= getPatchesService.deleteOne(id);
- if (count!=0){
- return ResponseResult.success("图斑删除成功id为"+id);
+ public ResponseResult deleteOne(int id) {
+ int count = getPatchesService.deleteOne(id);
+ if (count != 0) {
+ return ResponseResult.success("图斑删除成功id为" + id);
}
return ResponseResult.error("图斑删除失败");
}
@@ -103,14 +108,16 @@
String xzq = DistrictCodeUtils.nameToCode(code);
return ResponseResult.success(xzq);
}
+
@GetMapping("/getInfoById")
public ResponseResult<LotInfo> wayAndPatchesId(@RequestParam String patchesId) {
return ResponseResult.success(getPatchesService.getPatchesFromId(patchesId));
}
+
@GetMapping("/getWayline")
- public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list){
+ public ResponseResult getWayline(@RequestParam String waylineName, @RequestBody List<LotInfo> list) {
try {
- MultipartFile file=timerUtil.getFile(waylineName,list);
+ MultipartFile file = timerUtil.getFile(waylineName, list);
return ResponseResult.success(file);
} catch (IOException e) {
throw new RuntimeException(e);
@@ -118,13 +125,13 @@
}
@PostMapping("/patchesToWayline")
- public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
+ public ResponseResult patchesToWayline(@RequestBody List<LotInfo> list,
@RequestParam String waylineName,
@RequestParam String workspaceId,
HttpServletRequest request) throws IOException {
- CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
+ CustomClaim customClaim = (CustomClaim) request.getAttribute(TOKEN_CLAIM);
String creator = customClaim.getUsername();
- MultipartFile file=timerUtil.getFile(waylineName,list);
+ MultipartFile file = timerUtil.getFile(waylineName, list);
waylineFileService.importKmzFileBack(file, workspaceId, creator);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
Map<String, String> infoMap = new HashMap<>();
@@ -143,23 +150,41 @@
public ResponseResult useMyTask() throws Exception {
try {
// timerUtil.myTask();
- timerUtil.myTask2();
- return ResponseResult.success();
+// timerUtil.myTask2();
+// timerUtil.myTask3();
+ timerUtil.mytask4();
+ timerUtil.mytask5();
+ timerUtil.mytask6();
+ timerUtil.mytask7();
+
} catch (Exception e) {
- throw new RuntimeException("db存储发送出现异常"+e);
- }
- }
- @GetMapping ("/tests")
- public ResponseResult use() {
- try {
- TimerUtil.sendPostWithFileAndParameter("src/main/resources/1.db",
- "635148ea-0ddb-4b23-945c-8a67abd813c9");
- } catch (IOException e) {
- throw new RuntimeException(e);
+ throw new RuntimeException("db存储发送出现异常" + 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,
+ @RequestParam String waylineName,
+ @RequestParam String username) {
+ waylineFileService.importKmzFileBack(file, workspaceId, username);
+ }
+
/**
* 根据图斑的地块编号获取相对应音视频
*
--
Gitblit v1.9.3