From 75e6eea8cd3fac9cc888e2ffc9cdb126fab8429d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 14 Aug 2024 15:45:55 +0800
Subject: [PATCH] 任务下发、更新、取消，优化图斑逻辑
---
src/main/java/com/dji/sample/patches/utils/TimerUtil.java | 315 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 276 insertions(+), 39 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 cc0a795..662eac6 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.manage.dao.IDeviceMapper;
+import com.dji.sample.manage.model.entity.DeviceEntity;
import com.dji.sample.media.dao.IFileMapper;
import com.dji.sample.media.model.MediaFileEntity;
import com.dji.sample.patches.config.pojo.PatchesConfigPojo;
@@ -24,6 +26,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.http.*;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -62,8 +66,7 @@
private PatchesConfigPojo patchesConfigPojo;
@Autowired
public IWaylineFileService waylineFileService;
- @Autowired
- private IFileMapper fileMapper;
+
@Autowired
private ITbFJService tbFJService;
@Autowired
@@ -77,7 +80,8 @@
private TerritoryConfigPojo territoryConfigPojo;
@Autowired
private IWaylineJobBreakPointService jobBreakPointService;
-
+ @Autowired
+ private IDeviceMapper deviceMapper;
/**
* 定时器，将没有规划的图斑生成航线，并将航线飞完后的成果数据进行保存推送
*
@@ -86,7 +90,7 @@
*/
@Scheduled(cron = "0 0 0 * * ?")
public void myTask() throws Exception {
- Long time = getCurrentTimestampPlus8Hours();
+ Long time = getCurrentTimestampPlus8Hours(14);
String taskId = "";
String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
// 获取未规划的图斑集合
@@ -97,10 +101,11 @@
//根据获取的图斑集合获得kmz航线文件
MultipartFile multipartFile = null;
try {
- multipartFile = getFile(waylineName, list);
+ multipartFile = getFile(waylineName, list, 28.62452712442823, 115.85666327144976);
} catch (IOException e) {
throw new RuntimeException(e);
}
+ taskId = list.get(0).getTaskId();
//上传航线文件
WaylineFileEntity waylineFile = backWayline(multipartFile, waylineName, workspaceId, backclaim().getUsername());
//将为规划的图斑状态更新为已规划
@@ -113,12 +118,12 @@
String times = convertTimestampToFormattedString(time);
sendPostWithParameters(waylineName, waylineFile.getWaylineId(), times, lists1, listOfLists);
updatePatchesStatu(list);
- time = addOneHourToTimestamp(time);
+ time = addOneHourToTimestamp(time, 1, 0);
}
}
- @Scheduled(cron = "0 0 0 * * ?")
+ @Scheduled(cron = "0 1 0 * * ?")
public void myTask2() {
ExecutorService executor = Executors.newSingleThreadExecutor();
executor.execute(() -> {
@@ -131,16 +136,110 @@
executor.shutdown();
}
- public void myTask3() throws SQLException {
- String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
- String name = getNowDay();
- List<String> jobs = waylineJobService.selectJobIdByName(name);
- List<String> jobIds = jobBreakPointService.selectHaveBreak(jobs);
- for (String jobid : jobIds) {
- Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(workspaceId, jobid, true);
- waylineJobService.publishOneFlightTask(waylineJobDTO.get());
- }
- }
+ // public void myTask3() throws SQLException {
+// String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
+// String name = getNowDay();
+// List<String> jobs = waylineJobService.selectJobIdByName(name);
+// List<String> jobIds = jobBreakPointService.selectHaveBreak(jobs);
+// for (String jobid : jobIds) {
+// Optional<WaylineJobDTO> waylineJobDTO = waylineJobService.getJobByJobId(workspaceId, jobid, true);
+// waylineJobService.publishOneFlightTask(waylineJobDTO.get());
+// }
+// }
+// @Scheduled(cron = "0 0 1 * * ?")
+// public void mytask4() throws IOException {
+// Long time = getCurrentTimestampPlus8Hours(8);
+// List<List<Long>> listOfLists = new ArrayList<>();
+// List<Long> sublist = new ArrayList<>();
+// sublist.add(time); // 添加整数值
+// listOfLists.add(sublist);
+// List<Long> lists1 = new ArrayList<>();
+// lists1.add(time);
+// String times = convertTimestampToFormattedString(time);
+// sendPostWithParameters("别墅巡查一段", "2a44748a-1500-406f-80cf-ad92186fe8d2", times, lists1, listOfLists);
+// }
+//
+// @Scheduled(cron = "0 50 0 * * ?")
+// public void mytask5() throws IOException {
+// Long time = getCurrentTimestampPlus8Hours(9);
+// List<List<Long>> listOfLists = new ArrayList<>();
+// List<Long> sublist = new ArrayList<>();
+// sublist.add(time); // 添加整数值
+// listOfLists.add(sublist);
+// List<Long> lists1 = new ArrayList<>();
+// lists1.add(time);
+// String times = convertTimestampToFormattedString(time);
+// sendPostWithParameters("别墅巡查二段", "a07229af-471a-4058-9da6-5a2b84308b9e", times, lists1, listOfLists);
+// }
+//
+// @Scheduled(cron = "0 40 1 * * ?")
+// public void mytask6() throws IOException {
+// Long time = getCurrentTimestampPlus8Hours(9);
+// List<List<Long>> listOfLists = new ArrayList<>();
+// List<Long> sublist = new ArrayList<>();
+// sublist.add(time); // 添加整数值
+// listOfLists.add(sublist);
+// List<Long> lists1 = new ArrayList<>();
+// lists1.add(time);
+// String times = convertTimestampToFormattedString(time);
+// sendPostWithParameters("九洲巡河一段", "9f471686-a73a-4e90-8f37-92eed8ed5929", times, lists1, listOfLists);
+// }
+//
+// @Scheduled(cron = "0 40 2 * * ?")
+// public void mytask7() throws IOException {
+// Long time = getCurrentTimestampPlus8Hours(9);
+// List<List<Long>> listOfLists = new ArrayList<>();
+// List<Long> sublist = new ArrayList<>();
+// sublist.add(time); // 添加整数值
+// listOfLists.add(sublist);
+// List<Long> lists1 = new ArrayList<>();
+// lists1.add(time);
+// String times = convertTimestampToFormattedString(time);
+// sendPostWithParameters("九洲巡河二段", "58cd4261-02d7-4c4e-b876-25a4a2630c18", times, lists1, listOfLists);
+// }
+//
+// @Scheduled(cron = "0 30 2 * * ?")
+// public void mytask8() throws IOException {
+// Long time = getCurrentTimestampPlus8Hours(12);
+// List<List<Long>> listOfLists = new ArrayList<>();
+// List<Long> sublist = new ArrayList<>();
+// sublist.add(time); // 添加整数值
+// listOfLists.add(sublist);
+// List<Long> lists1 = new ArrayList<>();
+// lists1.add(time);
+// String times = convertTimestampToFormattedString(time);
+// sendPostWithParameters("定时任务2:30", "c3a7b125-bc0b-49d4-96ed-80743200ab80", times, lists1, listOfLists);
+// }
+// @Scheduled(cron = "0 30 2 * * ?")
+// public void mytask9() throws IOException {
+// Long time = getCurrentTimestampPlus8Hours(14);
+// List<List<Long>> listOfLists = new ArrayList<>();
+// List<Long> sublist = new ArrayList<>();
+// sublist.add(time); // 添加整数值
+// listOfLists.add(sublist);
+// List<Long> lists1 = new ArrayList<>();
+// lists1.add(time);
+// String times = convertTimestampToFormattedString(time);
+// sendPostWithParameters("定时任务4:30", "c3a7b125-bc0b-49d4-96ed-80743200ab80", times, lists1, listOfLists);
+// }
+// @Scheduled(cron = "0 0 6 * * ?")
+// public static void mytask10() {
+// File directory = new File("/tmp");
+// String[] partialFileNames = {"temp", "mark"}; // 要匹配的部分文件名
+// if (directory.isDirectory()) {
+// File[] files = directory.listFiles();
+// if (files != null) {
+// for (File file : files) {
+// for (String partialFileName : partialFileNames) {
+// if (file.isFile() && file.getName().contains(partialFileName)) {
+// file.delete();
+// break; // 跳出内层循环，以免重复删除同一个文件
+// }
+// }
+// }
+// }
+// }
+// }
/**
* 完成对未推送的图斑数据进行整合发送
@@ -172,8 +271,32 @@
dbSave(territoryConfigPojo.getResult(), territoryConfigPojo.getResultsave(), taskId);
//发送请求给第三方接口
- sendPostWithFileAndParameter(territoryConfigPojo.getResult(), taskId, dkbh, workspaceId);
+ sendPostWithFileAndParameter(territoryConfigPojo.getResult(), taskId);
+ }
+ }
+ @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);
}
}
@@ -185,8 +308,9 @@
* @return
* @throws IOException
*/
- public MultipartFile getFile(String waylineName, List<LotInfo> list) throws IOException {
- List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, 28.62452712442823, 115.85666327144976);
+ public MultipartFile getFile(String waylineName, List<LotInfo> list, double lat, double lon) throws IOException {
+ //南昌28.62452712442823, 115.85666327144976 瑞金 25.8917266，116.020940643
+ List<PointPO> coordinates = GeoToolsUtil.getRoutePointOrder(list, lat, lon);
XMLTemplateModel xmlModel = XMLTemplateModel.init(coordinates, list);
CreateWaylineFileUtils.createWaylineFile(xmlModel, patchesConfigPojo.getTemplate(), patchesConfigPojo.getTargetTemplate(), patchesConfigPojo.getWaylines(), patchesConfigPojo.getTargetWaylines());
// 压缩文件夹中的内容
@@ -194,6 +318,7 @@
zipFolder(patchesConfigPojo.getSourceDir(), destKMZFile);
return convert(new File(destKMZFile));
}
+
/**
* 将航线上传Oss
@@ -253,8 +378,16 @@
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::getInvestigate, 1)
.eq(LotInfo::getWorkspaceId, workspaceId));
+ return groupTasks(list);
+ }
+ public List<List<LotInfo>> getNoPush() {
+ List<LotInfo> list = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>()
+ .eq(LotInfo::getIsPush, 0)
+ .eq(LotInfo::getType, 0)
+ .eq(LotInfo::getInvestigate, 1));
return groupTasks(list);
}
@@ -338,7 +471,7 @@
* @param taskId
* @throws IOException
*/
- public void sendPostWithFileAndParameter(String filePath, String taskId, String dkbh, String workspaceId) throws IOException {
+ public void sendPostWithFileAndParameter(String filePath, String taskId) throws IOException {
// 创建 RestTemplate 实例
try {
RestTemplate restTemplate = new RestTemplate();
@@ -360,12 +493,11 @@
// 发送请求
ResponseEntity<String> response = restTemplate.exchange(
- "http://39.98.48.180:8087/landCloudWork/artifact/media/upload.action",
+ "http://39.98.49.177:8083/landCloudWork/artifact/media/upload.action",
// "http://localhost:6789/territory/tbdkjbxx/upload",
HttpMethod.POST,
requestEntity,
String.class);
- System.out.println(response);
} catch (Exception e) {
throw new IllegalArgumentException("db推送失败" + e.getMessage());
}
@@ -396,6 +528,40 @@
return Files.readAllBytes(path);
}
+ public void sendPostWithParameters(String name, String fileId, String time, List<Long> taskDays, List<List<Long>> taskPeriods, String jobId,String docksn) throws IOException {
+ try {
+ RestTemplate restTemplate = new RestTemplate();
+
+ // 构建请求体
+ String jsonBody = buildRequestBody(name, fileId, time, taskDays, taskPeriods, jobId,docksn);
+ String workspaceId =getWorkspaceIdByDocksn(docksn);
+ // 设置请求头
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ headers.setAccept(List.of(MediaType.APPLICATION_JSON, MediaType.TEXT_PLAIN, MediaType.ALL));
+ headers.set("Accept-Language", "zh-CN,zh;q=0.9");
+ headers.setConnection("keep-alive");
+ headers.set("x-auth-token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MTg1ODUxNTQsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDQ5ODUxNTQsImlhdCI6MTcxODU4NTE1NCwidXNlcm5hbWUiOiJhZG1pbkRQIn0.eTi9DTYGwcTvnIZasKTFq9OHQgMFS1-m840terb7ss0");
+
+ // 构建请求实体
+ HttpEntity<String> requestEntity = new HttpEntity<>(jsonBody, headers);
+
+ // 发送请求
+ ResponseEntity<String> response = restTemplate.exchange(
+// "https://wrj.shuixiongit.com/drone-api/wayline/api/v1/workspaces/4a574db8-4ad3-48f7-9f16-3edbcd8056e1/flight-tasks",
+ "http://localhost:6789/wayline/api/v1/workspaces/"+workspaceId+"/flight-tasks",
+ HttpMethod.POST,
+ requestEntity,
+ String.class);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Request failed: " + e.getMessage());
+ }
+ }
+
+ public String getWorkspaceIdByDocksn(String docksn){
+ DeviceEntity entity= deviceMapper.selectOne(new LambdaQueryWrapper<DeviceEntity>().eq(DeviceEntity::getDeviceSn,docksn));
+ return entity.getWorkspaceId();
+ }
public static void sendPostWithParameters(String name, String fileId, String time, List<Long> taskDays, List<List<Long>> taskPeriods) throws IOException {
try {
RestTemplate restTemplate = new RestTemplate();
@@ -442,7 +608,7 @@
+ "\"dock_sn\":\"4TADKCM0010016\","
+ "\"task_type\":1,"
+ "\"select_execute_time\":\"%s\","
- + "\"rth_altitude\":80,"
+ + "\"rth_altitude\":100,"
+ "\"out_of_control_action\":0,"
+ "\"executeTimeContinuousArr\":[{\"index\":1,\"value\":[]}],"
+ "\"executeTimeRepeatArr\":[{\"index\":1,\"value\":\"\"}],"
@@ -450,6 +616,7 @@
+ "\"rep_fre_type\":3,"
+ "\"rep_rule_type\":1,"
+ "\"time_range\":[],"
+ + "\"rth_mode\":1,"
+ "\"1conValue\":[],"
+ "\"1repValue\":\"\","
+ "\"task_days\":%s,"
@@ -457,6 +624,37 @@
+ "\"wayline_type\":0"
+ "}", name, fileId, select_execute_time, taskDays, taskPeriods);
}
+
+ private static String buildRequestBody(String name, String fileId, String select_execute_time, List<Long> taskDays, List<List<Long>> taskPeriods, String jobid, String dockSn) {
+ // 将 List 和 String 类型的参数格式化为 JSON 字符串
+ String taskDaysJson = taskDays != null ? taskDays.toString() : "[]";
+ String taskPeriodsJson = taskPeriods != null ? taskPeriods.toString() : "[]";
+
+ // 使用 String.format 来生成 JSON 字符串
+ return String.format("{"
+ + "\"name\":\"%s\","
+ + "\"file_id\":\"%s\","
+ + "\"dock_sn\":\"%s\","
+ + "\"task_type\":1,"
+ + "\"select_execute_time\":\"%s\","
+ + "\"rth_altitude\":100,"
+ + "\"out_of_control_action\":0,"
+ + "\"executeTimeContinuousArr\":[{\"index\":1,\"value\":[]}],"
+ + "\"executeTimeRepeatArr\":[{\"index\":1,\"value\":\"\"}],"
+ + "\"rep_fre_val\":1,"
+ + "\"rep_fre_type\":3,"
+ + "\"rep_rule_type\":1,"
+ + "\"time_range\":[],"
+ + "\"rth_mode\":1,"
+ + "\"1conValue\":[],"
+ + "\"1repValue\":\"\","
+ + "\"task_days\":%s,"
+ + "\"task_periods\":%s,"
+ + "\"wayline_type\":0,"
+ + "\"job_id\":\"%s\""
+ + "}", name, fileId, dockSn, select_execute_time, taskDaysJson, taskPeriodsJson, jobid);
+ }
+
/**
* 将上传的db保存一份到本地
@@ -468,6 +666,34 @@
public void dbSave(String path, String folder, String taskId) {
String sourceFilePath = path; // 源文件路径
String targetFolderPath = fileFold(folder).getPath(); // 目标文件夹路径
+
+ 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 targetFilePath = targetFolderPath + File.separator + fileName;
+
+ // 复制文件到目标文件夹
+ Path sourcePath = Paths.get(sourceFilePath);
+ Path targetPath = Paths.get(targetFilePath);
+ Files.copy(sourcePath, targetPath, StandardCopyOption.REPLACE_EXISTING);
+ } catch (IOException e) {
+ throw new RuntimeException("Db文件复制失败", e); // 捕获并抛出原始异常
+ }
+ }
+ public void dbSaveGt(String path, String folder, String taskId) {
+ String sourceFilePath = path; // 源文件路径
+ String targetFolderPath = fileFold(folder,taskId).getPath(); // 目标文件夹路径
try {
// 创建目标文件夹
@@ -519,13 +745,28 @@
}
return folder;
}
+ private static File fileFold(String fold,String taskId) {
+ // 获取当前时间
+ LocalDateTime currentTime = LocalDateTime.now();
- public static Long getCurrentTimestampPlus8Hours() {
+ // 拼接文件夹路径
+ String folderPath = fold + File.separator + taskId;
+
+ // 创建文件夹
+ File folder = new File(folderPath);
+ if (!folder.exists()) {
+ if (!folder.mkdirs()) {
+ throw new RuntimeException("文件创建失败" + folderPath);
+ }
+ }
+ return folder;
+ }
+ public static Long getCurrentTimestampPlus8Hours(long hours) {
// 获取当前时间
LocalDateTime now = LocalDateTime.now();
// 加上8小时
- LocalDateTime nowPlus8Hours = now.plusHours(8);
+ LocalDateTime nowPlus8Hours = now.plusHours(hours);
// 转换为UTC时间戳
ZonedDateTime zonedDateTime = nowPlus8Hours.atZone(ZoneId.systemDefault());
@@ -535,7 +776,7 @@
return timestamp / 1000;
}
- public static Long addOneHourToTimestamp(Long timestampInSeconds) {
+ public static Long addOneHourToTimestamp(Long timestampInSeconds, long hours, long min) {
// 将输入的秒级时间戳转换为Instant对象
Instant instant = Instant.ofEpochSecond(timestampInSeconds);
@@ -543,7 +784,7 @@
ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());
// 加上一小时
- ZonedDateTime zonedDateTimePlusOneHour = zonedDateTime.plusHours(1).plusMinutes(30);
+ ZonedDateTime zonedDateTimePlusOneHour = zonedDateTime.plusHours(hours).plusMinutes(min);
// 将ZonedDateTime对象转换回秒级时间戳
return zonedDateTimePlusOneHour.toInstant().getEpochSecond();
@@ -564,24 +805,20 @@
public static String getNowTimeName() {
LocalDateTime currentTime = LocalDateTime.now();
-
// 格式化时间，生成当前时间
return "云飞行计划" + currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSS"));
+ }
+
+ public static String getTimeName() {
+ LocalDateTime currentTime = LocalDateTime.now();
+ // 格式化时间，生成当前时间
+ return "国土调查云" + currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSS"));
}
public static String getNowDay() {
LocalDateTime currentTime = LocalDateTime.now();
// 格式化时间，生成当前时间
- return "云飞行计划" + currentTime.format(DateTimeFormatter.ofPattern("MMdd"));
- }
-
- public static void main(String[] args) {
- // 获取当前时间
- LocalDateTime currentTime = LocalDateTime.now();
-
- // 格式化时间，生成文件夹名字
- String folderName = currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSS"));
- System.out.println(folderName);
+ return currentTime.format(DateTimeFormatter.ofPattern("MMddHHmmssSSS"));
}
}
--
Gitblit v1.9.3