From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/patches/utils/TimerUtil.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/dji/sample/patches/utils/TimerUtil.java b/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
index 8aba2a2..4ec1d62 100644
--- a/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
@@ -146,10 +146,12 @@
//更新媒体文件的是否添加状态
updateMediaStatu(mediaFile);
}
- //发送请求给第三方接口
- sendPostWithFileAndParameter(territoryConfigPojo.getResult(), taskId);
//存储db到服务器
dbSave(territoryConfigPojo.getResult(), territoryConfigPojo.getResultsave(), taskId);
+
+ //发送请求给第三方接口
+ sendPostWithFileAndParameter(territoryConfigPojo.getResult(), taskId);
+
}
}
@@ -162,7 +164,7 @@
* @throws IOException
*/
public MultipartFile getFile(String waylineName, List<LotInfo> list) throws IOException {
- List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, 28.62703, 115.867719);
+ List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, 28.62452712442823, 115.85666327144976);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
// 压缩文件夹中的内容
@@ -181,7 +183,7 @@
* @return
*/
public String backWayline(MultipartFile multipartFile, String waylineName, String workspaceId, String username) {
- waylineFileService.importKmzFile(multipartFile, workspaceId, username);
+ waylineFileService.importKmzFileBack(multipartFile, workspaceId, username);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
try {
waylineFileService.getObjectUrl(workspaceId, entity.getWaylineId());
@@ -225,7 +227,9 @@
public List<List<MediaFileEntity>> getNoadd() {
List<MediaFileEntity> list = fileMapper.selectList(new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getIsadd, 0).like(MediaFileEntity::getFileName, "~"));
+ .eq(MediaFileEntity::getIsadd, 0)
+ .eq(MediaFileEntity::getExamine, 1)
+ .like(MediaFileEntity::getFileName, "~"));
List<List<MediaFileEntity>> groupedFilenames = groupTasks(list);
return groupedFilenames;
}
@@ -339,6 +343,17 @@
System.out.println(response);
System.out.println(response);
System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
+ System.out.println(response);
} catch (Exception e) {
throw new IllegalArgumentException("db推送失败" + e.getMessage());
}
--
Gitblit v1.9.3