From 4ce73562f23f501ac3fd7341a9e2bf3768d0a34b Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 18 Jun 2024 11:42:38 +0800
Subject: [PATCH] 航线定时任务，水印工具地址，修改方法注释
---
src/main/java/com/dji/sample/patches/utils/TimerUtil.java | 213 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 173 insertions(+), 40 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 4c9cccc..cce124f 100644
--- a/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/TimerUtil.java
@@ -13,6 +13,7 @@
import com.dji.sample.patches.xml.utils.CreateWaylineFileUtils;
import com.dji.sample.territory.pojo.TerritoryConfigPojo;
import com.dji.sample.territory.service.ITbFJService;
+import com.dji.sample.wayline.model.dto.WaylineFileDTO;
import com.dji.sample.wayline.model.entity.WaylineFileEntity;
import com.dji.sample.wayline.model.param.CreateJobParam;
import com.dji.sample.wayline.service.IWaylineFileService;
@@ -30,6 +31,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.nio.file.StandardCopyOption;
+import java.time.Instant;
import java.time.LocalDateTime;
import java.io.*;
@@ -37,6 +39,8 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.SQLException;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
@@ -82,13 +86,15 @@
*/
@Scheduled(cron = "0 0 0 * * ?")
public void myTask() throws Exception {
+ Long time = getCurrentTimestampPlus8Hours();
String taskId = "";
String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
// 获取未规划的图斑集合
- List<List<LotInfo>> lists = getNoPlan();
+ List<List<LotInfo>> lists = getNoPlan(workspaceId);
List<List<LotInfo>> convertedLists = convertToLists(lists);
for (List<LotInfo> list : convertedLists) {
long timestamp = System.currentTimeMillis();
+ time = addOneHourToTimestamp(time);
String waylineName = "云飞行调查" + timestamp;
//根据获取的图斑集合获得kmz航线文件
MultipartFile multipartFile = null;
@@ -98,10 +104,17 @@
throw new RuntimeException(e);
}
//上传航线文件
- backWayline(multipartFile, waylineName, workspaceId, backclaim().getUsername());
+ WaylineFileEntity waylineFile = backWayline(multipartFile, waylineName, workspaceId, backclaim().getUsername());
//将为规划的图斑状态更新为已规划
+ 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("云飞行计划" + timestamp, waylineFile.getWaylineId(), times, lists1, listOfLists);
updatePatchesStatu(list);
-// waylineJobService.publishFlightTask(JobParam("656c62f4-cb86-4911-930d-b38089829348"),backclaim());
}
}
@@ -119,6 +132,11 @@
executor.shutdown();
}
+ /**
+ * 完成对未推送的图斑数据进行整合发送
+ *
+ * @throws Exception
+ */
@Transactional
public void dbOperation() throws Exception {
String workspaceId = "4a574db8-4ad3-48f7-9f16-3edbcd8056e1";
@@ -135,7 +153,7 @@
dkbh = getDkbh(mediaFile.getFileName());
//获取该媒体文件的图斑信息
LotInfo lotInfo2 = getPatchesService.getLotinfo(dkbh, workspaceId);
- taskId=lotInfo2.getTaskId();
+ taskId = lotInfo2.getTaskId();
tbFJService.insertOneData(mediaFile, lotInfo2);
getPatchesService.patchesPushed(taskId, dkbh, workspaceId);
}
@@ -176,7 +194,7 @@
* @param username
* @return
*/
- public String backWayline(MultipartFile multipartFile, String waylineName, String workspaceId, String username) {
+ public WaylineFileEntity backWayline(MultipartFile multipartFile, String waylineName, String workspaceId, String username) {
waylineFileService.importKmzFileBack(multipartFile, workspaceId, username);
WaylineFileEntity entity = waylineFileService.selectByName(waylineName);
try {
@@ -184,7 +202,7 @@
} catch (SQLException e) {
throw new RuntimeException(e);
}
- return entity.getWaylineId();
+ return entity;
}
/**
@@ -192,8 +210,10 @@
*
* @return
*/
- public List<List<LotInfo>> getNoPlan() {
- List<LotInfo> list = shpToDataSourceMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getIsPlan, 0));
+ public List<List<LotInfo>> getNoPlan(String worksapceId) {
+ List<LotInfo> list = shpToDataSourceMapper.selectList(new LambdaQueryWrapper<LotInfo>()
+ .eq(LotInfo::getIsPlan, 0)
+ .eq(LotInfo::getWorkspaceId, worksapceId));
List<List<LotInfo>> combinedTasks = list.stream()
.collect(Collectors.groupingBy(LotInfo::getTaskId))
.values().stream()
@@ -214,47 +234,28 @@
}
}
+ /**
+ * 获取未推送的图斑集合
+ *
+ * @param workspaceId
+ * @return
+ */
public List<List<LotInfo>> getNoPush(String workspaceId) {
List<LotInfo> list = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>()
.eq(LotInfo::getIsPush, 0)
- .eq(LotInfo::getInvestigate,1)
+ .eq(LotInfo::getInvestigate, 1)
.eq(LotInfo::getWorkspaceId, workspaceId));
return groupTasks(list);
}
- public CustomClaim backclaim() {
+ public static CustomClaim backclaim() {
CustomClaim claim = new CustomClaim();
claim.setId("1");
claim.setUsername("adminPC");
claim.setWorkspaceId("4a574db8-4ad3-48f7-9f16-3edbcd8056e1");
claim.setUserType(1);
return claim;
- }
-
- public static CreateJobParam JobParam(String waylineId) {
- long timestamp = System.currentTimeMillis();
- List<List<Long>> listOfLists = new ArrayList<>();
- List<Long> sublist = new ArrayList<>();
- sublist.add(1715941980L); // 添加整数值
- listOfLists.add(sublist);
- List<Long> list = new ArrayList<>();
- list.add(1715941980L);
- CreateJobParam param = new CreateJobParam();
- param.setName("云飞行调查" + timestamp);
- param.setExecuteStartTimeArr(listOfLists);
- param.setTaskType(TIMED);
- param.setOutOfControlAction(0);
- param.setRepFreType(3);
- param.setRepFreVal(1);
- param.setRepRuleType(1);
- param.setRthAltitude(80);
- param.setWaylineType(WAYPOINT);
- param.setTaskPeriods(listOfLists);
- param.setTaskDays(list);
- param.setFileId(waylineId);
- param.setDockSn("4TADKCMB0010016");
- return param;
}
public static <T> List<List<T>> convertToLists(List<List<T>> listOfLists) {
@@ -266,7 +267,12 @@
}
- // 对任务ID进行分组
+ /**
+ * 根据taskID对图斑进行分组
+ *
+ * @param lotInfos
+ * @return
+ */
public static List<List<LotInfo>> groupTasks(List<LotInfo> lotInfos) {
Map<String, List<LotInfo>> groupedTasks = new HashMap<>();
for (LotInfo lotInfo : lotInfos) {
@@ -291,16 +297,25 @@
return new ArrayList<>(groupedTasks.values());
}
- // 从filename字段中提取任务ID（任务ID在文件名中以"~"开头、"."结尾）
+ /**
+ * 从filename中获取taskId
+ *
+ * @param filename
+ * @return
+ */
public static String getTaskId(String filename) {
- // 这里只是一个示例，你需要根据实际情况编写提取task_id的逻辑
int startIndex = filename.indexOf("~") + 1;
int endIndex = filename.indexOf(".");
return filename.substring(startIndex, endIndex);
}
+ /**
+ * 从filename中获取地块编号
+ *
+ * @param filename
+ * @return
+ */
public static String getDkbh(String filename) {
- // 这里只是一个示例，你需要根据实际情况编写提取task_id的逻辑
int startIndex = filename.indexOf("点") + 1;
int endIndex = filename.indexOf("~");
return filename.substring(startIndex, endIndex);
@@ -335,7 +350,7 @@
// 发送请求
ResponseEntity<String> response = restTemplate.exchange(
- "http://39.98.48.180:8087/landCloudWork/artifact/media/upload.action",
+ "http://39.98.48.180:8087/landCloudWork/artifact/media/upload.action",
// "http://localhost:6789/territory/tbdkjbxx/upload",
HttpMethod.POST,
requestEntity,
@@ -346,6 +361,14 @@
}
}
+ /**
+ * 发送的请求参数
+ *
+ * @param taskId
+ * @param fileContent
+ * @param filePath
+ * @return
+ */
private static MultiValueMap<String, Object> buildRequestBody(String taskId, byte[] fileContent, String filePath) {
MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
body.add("taskId", taskId);
@@ -361,6 +384,68 @@
private static byte[] readFileToBytes(String filePath) throws IOException {
Path path = Paths.get(filePath);
return Files.readAllBytes(path);
+ }
+
+ public static void sendPostWithParameters(String name, String fileId, String time, List<Long> taskDays, List<List<Long>> taskPeriods) throws IOException {
+ try {
+ RestTemplate restTemplate = new RestTemplate();
+
+ // 构建请求体
+ String jsonBody = buildRequestBody(name, fileId, time, taskDays, taskPeriods);
+
+ // 设置请求头
+ 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/4a574db8-4ad3-48f7-9f16-3edbcd8056e1/flight-tasks",
+ HttpMethod.POST,
+ requestEntity,
+ String.class);
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Request failed: " + e.getMessage());
+ }
+ }
+
+ /**
+ * 构建请求体
+ *
+ * @param name
+ * @param fileId
+ * @param taskDays
+ * @param taskPeriods
+ * @return
+ */
+ private static String buildRequestBody(String name, String fileId, String select_execute_time, List<Long> taskDays, List<List<Long>> taskPeriods) {
+ return String.format("{"
+ + "\"name\":\"%s\","
+ + "\"file_id\":\"%s\","
+ + "\"dock_sn\":\"4TADKCM0010016\","
+ + "\"task_type\":1,"
+ + "\"select_execute_time\":\"%s\","
+ + "\"rth_altitude\":80,"
+ + "\"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\":[],"
+ + "\"1conValue\":[],"
+ + "\"1repValue\":\"\","
+ + "\"task_days\":%s,"
+ + "\"task_periods\":%s,"
+ + "\"wayline_type\":0"
+ + "}", name, fileId, select_execute_time, taskDays, taskPeriods);
}
/**
@@ -399,6 +484,12 @@
}
}
+ /**
+ * 根据时间创建db存储时的文件夹
+ *
+ * @param fold
+ * @return
+ */
private static File fileFold(String fold) {
// 获取当前时间
LocalDateTime currentTime = LocalDateTime.now();
@@ -419,4 +510,46 @@
return folder;
}
+ public static Long getCurrentTimestampPlus8Hours() {
+ // 获取当前时间
+ LocalDateTime now = LocalDateTime.now();
+
+ // 加上8小时
+ LocalDateTime nowPlus8Hours = now.plusHours(8);
+
+ // 转换为UTC时间戳
+ ZonedDateTime zonedDateTime = nowPlus8Hours.atZone(ZoneId.systemDefault());
+ long timestamp = zonedDateTime.toInstant().toEpochMilli();
+
+ // 将毫秒级时间戳转换为秒级时间戳
+ return timestamp / 1000;
+ }
+
+ public static Long addOneHourToTimestamp(Long timestampInSeconds) {
+ // 将输入的秒级时间戳转换为Instant对象
+ Instant instant = Instant.ofEpochSecond(timestampInSeconds);
+
+ // 将Instant对象转换为ZonedDateTime对象，使用系统默认时区
+ ZonedDateTime zonedDateTime = instant.atZone(ZoneId.systemDefault());
+
+ // 加上一小时
+ ZonedDateTime zonedDateTimePlusOneHour = zonedDateTime.plusHours(1);
+
+ // 将ZonedDateTime对象转换回秒级时间戳
+ return zonedDateTimePlusOneHour.toInstant().getEpochSecond();
+ }
+
+ // 方法：将时间戳转换为指定格式的字符串
+ public static String convertTimestampToFormattedString(Long timestamp) {
+ // 将时间戳转换为Instant对象
+ Instant instant = Instant.ofEpochMilli(timestamp);
+
+ // 将Instant对象转换为ZonedDateTime对象，并设置时区为UTC
+ ZonedDateTime chinaTime = instant.atZone(ZoneId.of("Asia/Shanghai"));
+
+ // 格式化时间
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.000'Z'");
+ return chinaTime.format(formatter);
+ }
+
}
--
Gitblit v1.9.3