From 6c321434d8f0bc78ae86640653eccbf4cfc2c1d3 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 11 Jun 2024 09:10:13 +0800
Subject: [PATCH] SM3加密，媒体文件存储
---
src/main/java/com/dji/sample/patches/utils/TimerUtil.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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..7336a30 100644
--- a/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
@@ -162,7 +162,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 +181,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 +225,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;
}
@@ -335,10 +337,6 @@
HttpMethod.POST,
requestEntity,
String.class);
- 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