From 3430a3dd889ba51d06cbdb77014aa63d0a070e48 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 16 Aug 2024 16:38:08 +0800
Subject: [PATCH] 优化国土对接接口
---
src/main/java/com/dji/sample/patches/utils/TimerUtil.java | 136 +++++++++++++++++++++++++++++++--------------
1 files changed, 94 insertions(+), 42 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 662eac6..b8c1fe2 100644
--- a/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.common.model.CustomClaim;
+import com.dji.sample.droneairport.dao.DbUploadMapper;
+import com.dji.sample.droneairport.model.Entity.DbUploadEntity;
import com.dji.sample.manage.dao.IDeviceMapper;
import com.dji.sample.manage.model.entity.DeviceEntity;
import com.dji.sample.media.dao.IFileMapper;
@@ -55,6 +57,7 @@
import static com.dji.sample.patches.utils.MultipartFileTOFileUtil.convert;
import static com.dji.sample.patches.utils.ZipUtil.zipFolder;
+import static com.dji.sample.territory.utils.SM3.sm3;
import static com.dji.sample.wayline.model.enums.WaylineTaskTypeEnum.TIMED;
import static com.dji.sample.wayline.model.enums.WaylineTemplateTypeEnum.WAYPOINT;
@@ -82,6 +85,8 @@
private IWaylineJobBreakPointService jobBreakPointService;
@Autowired
private IDeviceMapper deviceMapper;
+ @Autowired
+ private DbUploadMapper dbUploadMapper;
/**
* 定时器，将没有规划的图斑生成航线，并将航线飞完后的成果数据进行保存推送
*
@@ -252,6 +257,9 @@
String taskId = "";
String dkbh = null;
List<List<LotInfo>> lists = convertToLists(getNoPush(workspaceId));
+ if (lists.isEmpty()){
+ return;
+ }
for (List<LotInfo> lotInfo : lists) {
for (LotInfo lotInfo1 : lotInfo) {
List<MediaFileEntity> media = getPatchesService.listPohto(lotInfo1.getDkbh(), workspaceId);
@@ -276,29 +284,55 @@
}
}
@Scheduled(cron = "0 3 17 * * ?")
- public void GtdbOperation() throws Exception {
- String taskId = "";
- String dkbh = null;
- List<List<LotInfo>> lists = convertToLists(getNoPush());
- for (List<LotInfo> lotInfo : lists) {
- for (LotInfo lotInfo1 : lotInfo) {
- List<MediaFileEntity> media = getPatchesService.listPohto(lotInfo1.getDkbh());
- //清空FJ表
- tbFJService.deleteData();
- for (MediaFileEntity mediaFile : media) {
- //获取媒体文件名里的dkbh和taskId
- dkbh = getDkbh(mediaFile.getFileName());
- //获取该媒体文件的图斑信息
- LotInfo lotInfo2 = getPatchesService.getLotinfo(dkbh);
- taskId = lotInfo2.getTaskId();
- tbFJService.insertOneData(mediaFile, lotInfo2);
- getPatchesService.patchesPushed(taskId, dkbh);
- }
- }
- //存储db到服务器
- dbSaveGt(territoryConfigPojo.getResult(), territoryConfigPojo.getResultGtsave(), taskId);
+ public void GtdbOperation() throws Exception {
+ String taskId = "";
+ String dkbh = null;
+ String code="";
+ int count = 0;
+ Set<String> dkbhSet = new HashSet<>(); // 用于存储不同的dkbh
+ List<List<LotInfo>> lists = convertToLists(getNoPush());
+ if (lists.isEmpty()){
+ return;
}
+ tbFJService.deleteData();
+ for (List<LotInfo> lotInfo : lists) {
+ for (LotInfo lotInfo1 : lotInfo) {
+ List<MediaFileEntity> media = getPatchesService.listPohto(lotInfo1.getDkbh());
+ // 清空FJ表
+ for (MediaFileEntity mediaFile : media) {
+ // 获取媒体文件名里的dkbh和taskId
+ dkbh = getDkbh(mediaFile.getFileName());
+ dkbhSet.add(dkbh); // 添加dkbh到set中
+ // 获取该媒体文件的图斑信息
+ LotInfo lotInfo2 = getPatchesService.getLotinfo(dkbh);
+ taskId = lotInfo2.getTaskId();
+ code=lotInfo2.getXzqdm();
+ count++;
+ // 插入数据到数据库
+ tbFJService.insertOneData(mediaFile, lotInfo2);
+ getPatchesService.patchesPushed(taskId, dkbh);
+ }
+ }
+
+ // 存储db到服务器
+ String dbName = dbSaveGt(territoryConfigPojo.getResult(), territoryConfigPojo.getResultGtsave(), taskId);
+ DbUploadEntity entity = new DbUploadEntity();
+ File file = new File(territoryConfigPojo.getResult());
+ byte[] bytesArray = Files.readAllBytes(file.toPath());
+ long currentTimeMillis = System.currentTimeMillis();
+ entity.setTimestamp(currentTimeMillis);
+ entity.setSize(getFileSize(file)) ;
+ entity.setHash(sm3(bytesArray));
+ entity.setCount(dkbhSet.size());// 统计dkbh的数量
+ entity.setUrl(territoryConfigPojo.getResultGtsave()+"/"+dbName);
+ entity.setRegioncode(code);
+ entity.setExtension(".db");
+ entity.setAttachmentCount(count);
+ entity.setTaskId(taskId);
+ dbUploadMapper.insert(entity);
}
+}
+
/**
* 创建航线
@@ -378,7 +412,7 @@
public List<List<LotInfo>> getNoPush(String workspaceId) {
List<LotInfo> list = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>()
.eq(LotInfo::getIsPush, 0)
- .eq(LotInfo::getType, 1)
+ .eq(LotInfo::getType, 2)
.eq(LotInfo::getInvestigate, 1)
.eq(LotInfo::getWorkspaceId, workspaceId));
return groupTasks(list);
@@ -386,7 +420,7 @@
public List<List<LotInfo>> getNoPush() {
List<LotInfo> list = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>()
.eq(LotInfo::getIsPush, 0)
- .eq(LotInfo::getType, 0)
+ .eq(LotInfo::getType, 1)
.eq(LotInfo::getInvestigate, 1));
return groupTasks(list);
}
@@ -691,30 +725,17 @@
throw new RuntimeException("Db文件复制失败", e); // 捕获并抛出原始异常
}
}
- public void dbSaveGt(String path, String folder, String taskId) {
- String sourceFilePath = path; // 源文件路径
- String targetFolderPath = fileFold(folder,taskId).getPath(); // 目标文件夹路径
-
+ public String dbSaveGt(String path, String folder, String taskId) {
try {
- // 创建目标文件夹
- File targetFolder = new File(targetFolderPath);
- if (!targetFolder.exists()) {
- targetFolder.mkdirs();
- }
-
- // 获取当前时间
- LocalDateTime currentTime = LocalDateTime.now();
-
- // 格式化时间，生成文件名
- String timeName = currentTime.format(DateTimeFormatter.ofPattern("HHmmss"));
- String fileName = timeName + "_" + taskId + ".db";
+ String fileName = taskId + ".db";
// 构建目标文件路径
- String targetFilePath = targetFolderPath + File.separator + fileName;
+ String targetFilePath = folder + File.separator + fileName;
- // 复制文件到目标文件夹
- Path sourcePath = Paths.get(sourceFilePath);
+ // 复制文件到目标位置
+ Path sourcePath = Paths.get(path);
Path targetPath = Paths.get(targetFilePath);
Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
+ return fileName;
} catch (IOException e) {
throw new RuntimeException("Db文件复制失败", e); // 捕获并抛出原始异常
}
@@ -775,6 +796,21 @@
// 将毫秒级时间戳转换为秒级时间戳
return timestamp / 1000;
}
+ public static long getNextDayEightAMTimestamp(int hour) {
+ // 获取当前时间
+ LocalDateTime now = LocalDateTime.now();
+
+ // 获取第二天的日期并设置时间为08:00
+ LocalDateTime nextDayEightAM = now.plusDays(1).withHour(8).withMinute(0).withSecond(0).withNano(0);
+
+ // 根据传入的hour参数增加小时
+ LocalDateTime adjustedTime = nextDayEightAM.plusHours(hour);
+
+ // 转换为时间戳（秒级）
+ ZonedDateTime zonedDateTime = adjustedTime.atZone(ZoneId.systemDefault());
+ return zonedDateTime.toEpochSecond();
+ }
+
public static Long addOneHourToTimestamp(Long timestampInSeconds, long hours, long min) {
// 将输入的秒级时间戳转换为Instant对象
@@ -821,4 +857,20 @@
// 格式化时间，生成当前时间
return currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSSS"));
}
+ public static long getFileSize(File file) {
+ if (file == null || !file.exists() || !file.isFile()) {
+ return -1L; // 文件不存在或不是普通文件
+ }
+ return file.length();
+ }
+
+ public static void main(String[] args) {
+ File file = new File("DB/result_db.db");
+ long size = getFileSize(file);
+ System.out.println("文件大小: " + size + " 字节");
+ }
+ public static void getFileInfo(File file){
+ long size=getFileSize(file);
+
+ }
}
--
Gitblit v1.9.3