From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/droneairport/service/impl/RegistServiceImpl.java | 252 ++++++++++++++++++++++++++++++++------------------
1 files changed, 160 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/dji/sample/droneairport/service/impl/RegistServiceImpl.java b/src/main/java/com/dji/sample/droneairport/service/impl/RegistServiceImpl.java
index 74d0d85..da980ff 100644
--- a/src/main/java/com/dji/sample/droneairport/service/impl/RegistServiceImpl.java
+++ b/src/main/java/com/dji/sample/droneairport/service/impl/RegistServiceImpl.java
@@ -8,6 +8,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.redis.RedisOpsUtils;
import com.dji.sample.droneairport.dao.DbUploadMapper;
@@ -46,18 +47,17 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
import java.util.*;
import java.util.stream.Collectors;
+import static com.dji.sample.droneairport.utils.AuthUtil.getToken;
import static com.dji.sample.droneairport.utils.TaskAllocator.assignTasks;
-import static com.dji.sample.patches.utils.TimerUtil.getCurrentTimestampPlus8Hours;
-import static com.dji.sample.patches.utils.TimerUtil.getNextDayEightAMTimestamp;
+import static com.dji.sample.patches.utils.TimerUtil.*;
@Service
public class RegistServiceImpl implements RegistService {
@@ -85,29 +85,47 @@
public String registPort(DeviceExpanSionEntity airport) {
try {
RegistDto registDto = airportEntityToDto(airport);
+ String secret = SM4Util.generateSM4Key();
String jsonBody = buildRequestBody(registDto);
- String base64 = SM4Util.encrypt("jsimjrby3wqb7dbq", jsonBody);
+ String base64 = SM4Util.encrypt(secret, jsonBody);
+ String keys=Utils.encrypt(secret,"04225AACF606D800EA3C2C31FCF8FB161B15F7A8D0460DEB91013D4F228C455E76A2ED8D71BC6525B5DC5CC015C155479D8839950344AEE438A3A6305C90F8269F");
+ String enSM2=Utils.hexToBase64(keys);
// 设置请求头
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.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MjA2NTg3NDMsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDcwNTg3NDMsImlhdCI6MTcyMDY1ODc0MywidXNlcm5hbWUiOiJhZG1pbkRQIn0.CrRFYUTK357HleqrrfL7nLdwFJw5Bcv3ms33n_Or8eM");
- headers.set("x-lc-token", "");
- // 构建请求实体
- HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
- // 发送请求
- ResponseEntity<String> response = restTemplate.exchange(
- "http://localhost:6789/droneAirport/test",
- HttpMethod.POST,
- requestEntity,
- String.class);
- return response.getBody();
+ headers.set("x-lc-token", getToken());
+ headers.set("x-auth-token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MTg1ODUxNTQsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDQ5ODUxNTQsImlhdCI6MTcxODU4NTE1NCwidXNlcm5hbWUiOiJhZG1pbkRQIn0.eTi9DTYGwcTvnIZasKTFq9OHQgMFS1-m840terb7ss0");
+ headers.set("x-lc-secret", enSM2);
+ // 构建请求实体
+// HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
+// // 发送请求
+// ResponseEntity<String> response = restTemplate.exchange(
+// "https://xcx.geoway.com.cn:8033/v1/droneAirport/RegistService",
+// HttpMethod.POST,
+// requestEntity,
+// String.class);
+// HttpHeaders responseHeaders = response.getHeaders();
+// String responseSecret = responseHeaders.getFirst("x-lc-secret");
+
+ String data=deSM2(enSM2, "00D631FD5615416EAB63D33A9E66E801F95DE840567504210080006081DE877AE3");
+
+ // 使用 Hutool 的 JSONUtil 解析 JSON 字符串
+// JSONObject jsonObject = JSONUtil.parseObj(response.getBody());
+
+ // 提取 data 字段的值
+// String dataValue = jsonObject.getStr("data");
+
+// return SM4Util.decrypt(data,dataValue);
+ String text=SM4Util.decrypt(data,base64);
+ return SM4Util.decrypt(data,base64);
} catch (Exception e) {
+
// 异常处理
- throw new IllegalArgumentException("无人机机场注册失败: " + e.getMessage());
+ return(e.getMessage());
}
}
@@ -136,42 +154,56 @@
DeviceExpanSionEntity drone = expanSionMapper.selectOne(new LambdaQueryWrapper<DeviceExpanSionEntity>()
.eq(DeviceExpanSionEntity::getWorkspaceId, workspaceId)
.eq(DeviceExpanSionEntity::getType, 1));
+ registPort(airport);
AddDeviceDto dto = deviceEntityToDto(drone);
+ String secret = SM4Util.generateSM4Key();
// 构建请求体
String jsonBody = buildRequestBody(dto);
- String base64 = SM4Util.encrypt("jsimjrby3wqb7dbq", jsonBody);
+ String base64 = SM4Util.encrypt(secret, jsonBody);
+ String keys=Utils.encrypt(secret,"04CF7CAE31B5130D1D5D1AC1DC2778D94533868A8D57FC02BBD97B688E07145DAAA96462DC83D9F348261F738D51C049770C43BA53B584917C9E30C6221B737CDD");
+ String enSM2=Utils.hexToBase64(keys);
// 设置请求头
-
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.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MjA2NTg3NDMsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDcwNTg3NDMsImlhdCI6MTcyMDY1ODc0MywidXNlcm5hbWUiOiJhZG1pbkRQIn0.CrRFYUTK357HleqrrfL7nLdwFJw5Bcv3ms33n_Or8eM");
- headers.set("x-lc-token", "");
+ headers.set("x-auth-token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MTg1ODUxNTQsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDQ5ODUxNTQsImlhdCI6MTcxODU4NTE1NCwidXNlcm5hbWUiOiJhZG1pbkRQIn0.eTi9DTYGwcTvnIZasKTFq9OHQgMFS1-m840terb7ss0");
+ headers.set("x-lc-token", getToken());
+ headers.set("x-lc-secret", (enSM2));
// 构建请求实体
HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
// 发送请求
ResponseEntity<String> response = restTemplate.exchange(
- "http://localhost:6789/droneAirport/test",
+ "https://xcx.geoway.com.cn:8033/v1/droneAirport/addDevice",
HttpMethod.POST,
requestEntity,
String.class);
- registPort(airport);
- return response.getBody();
-
+ HttpHeaders responseHeaders = response.getHeaders();
+ String responseSecret = responseHeaders.getFirst("x-lc-secret");
+ String data=deSM2(responseSecret, "00D631FD5615416EAB63D33A9E66E801F95DE840567504210080006081DE877AE3");
+ // 使用 Hutool 的 JSONUtil 解析 JSON 字符串
+ JSONObject jsonObject = JSONUtil.parseObj(response.getBody());
+ // 提取 data 字段的值
+ String dataValue = jsonObject.getStr("data");
+ return SM4Util.decrypt(data,dataValue);
} catch (Exception e) {
// 异常处理
- throw new IllegalArgumentException("无人机机场设备注册失败: " + e.getMessage());
+ return (e.getMessage());
}
}
@Override
- public String getDroneState(String deviceId) throws Exception {
+ public Map<String, String> getDroneState(String deviceId) throws Exception {
+ String key = SM4Util.generateSM4Key();
+ String secret = Utils.encrypt(key, "04CF7CAE31B5130D1D5D1AC1DC2778D94533868A8D57FC02BBD97B688E07145DAAA96462DC83D9F348261F738D51C049770C43BA53B584917C9E30C6221B737CDD");
DroneStateDto data = getAirportFromCache(deviceId);
String json = JSON.toJSONString(data);
- String SM4Screct = SM4Util.encrypt("jsimjrby3wqb7dbq", json);
- return SM4Screct;
+ String SM4Screct = SM4Util.encrypt(key, json);
+ Map<String, String> info = new HashMap<>();
+ info.put("text", SM4Screct);
+ info.put("serect", secret);
+ return info;
}
// @Override
@@ -192,20 +224,20 @@
dto.setSn(sn);
dto.setStatus(0);
String jsonBody = buildRequestBody(dto);
- String base64 = SM4Util.encrypt("jsimjrby3wqb7dbq", jsonBody);
+ String base64 = SM4Util.encrypt(SM4Util.generateSM4Key(), jsonBody);
// 设置请求头
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.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MjA2NTg3NDMsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDcwNTg3NDMsImlhdCI6MTcyMDY1ODc0MywidXNlcm5hbWUiOiJhZG1pbkRQIn0.CrRFYUTK357HleqrrfL7nLdwFJw5Bcv3ms33n_Or8eM");
- headers.set("x-lc-token", "");
+ headers.set("x-lc-token", "eyJvcmdjb2RlIjoiMDAwMDAwMDAwMDAwMDAwMDAwIiwib3JnbmFtZSI6IuWbveWcn+iwg+afpeS6keaXoOS6uuacuuaOpeWPo+a1i+ivleivgeS5puS4peemgeeUqOS6juato+W8j+eOr+WigyIsImNlcnRjb2RlIjoiVUFWMzJfV0hSNEUzVUFKWlRFM0tFNUlaRkRHTDdDQlUiLCJjZXJ0b3JnY29kZSI6IjEyMTAwMDAwNDAwMDEwMzk4UCIsImNlcnRvcmduYW1lIjoi5Lit5Zu95Zu95Zyf5YuY5rWL6KeE5YiS6ZmiIiwiZXhwaXJhdGlvbiI6IjIwMjQtMTItMzEgMTU6NDY6MzIiLCJwdWJsaWNrZXkiOiIwNDIyNUFBQ0Y2MDZEODAwRUEzQzJDMzFGQ0Y4RkIxNjFCMTVGN0E4RDA0NjBERUI5MTAxM0Q0RjIyOEM0NTVFNzZBMkVEOEQ3MUJDNjUyNUI1REM1Q0MwMTVDMTU1NDc5RDg4Mzk5NTAzNDRBRUU0MzhBM0E2MzA1QzkwRjgyNjlGIiwic2lnbiI6IkI4OTVGQUM1Qzk4NzM5RURGNzFBRkE2QjM4NDEzQUIzNDRCRTBDQjE1RTk3MDQ3Nzk5QTczNUM0MjBEMkZFMzdENkE1NjJFQTlFMUFBRjFBNjhBRDJERjE0QzhEMThBOEY5N0JENzUyOUE2NDRERDA3NkI2NDM1OTg5QkQxREIwIiwiY2VydHR5cGUiOiLml6DkurrmnLrkuL7or4Hor4HkuaYiLCJyZWdpb25jb2RlIjoiMDAwMDAwIn0=");
+ headers.set("x-lc-secret", "00D631FD5615416EAB63D33A9E66E801F95DE840567504210080006081DE877AE3");
// 构建请求实体
HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
// 发送请求
ResponseEntity<String> response = restTemplate.exchange(
- "http://localhost:6789/droneAirport/test",
+ "https://xcx.geoway.com.cn:8033/v1/droneAirport/authorization",
HttpMethod.POST,
requestEntity,
String.class);
@@ -217,35 +249,42 @@
dto.setSn(sn);
dto.setStatus(1);
String jsonBody = buildRequestBody(dto);
- String base64 = SM4Util.encrypt("jsimjrby3wqb7dbq", jsonBody);
+ String base64 = SM4Util.encrypt(SM4Util.generateSM4Key(), jsonBody);
// 设置请求头
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.eyJ3b3Jrc3BhY2VfaWQiOiJlM2RlYTBmNS0zN2YyLTRkNzktYWU1OC00OTBhZjMyMjgwNjkiLCJzdWIiOiJDbG91ZEFwaVNhbXBsZSIsInVzZXJfdHlwZSI6IjEiLCJuYmYiOjE3MjA2NTg3NDMsImxvZyI6IkxvZ2dlcltjb20uZGppLnNhbXBsZS5jb21tb24ubW9kZWwuQ3VzdG9tQ2xhaW1dIiwiaXNzIjoiREpJIiwiaWQiOiI5Y2MwMGY3Zi0yODMwLTRmM2UtYjdmNC1lN2E1ZjIzYjNjNGYiLCJleHAiOjE4MDcwNTg3NDMsImlhdCI6MTcyMDY1ODc0MywidXNlcm5hbWUiOiJhZG1pbkRQIn0.CrRFYUTK357HleqrrfL7nLdwFJw5Bcv3ms33n_Or8eM");
- headers.set("x-lc-token", "");
+ headers.set("x-lc-token", "eyJvcmdjb2RlIjoiMDAwMDAwMDAwMDAwMDAwMDAwIiwib3JnbmFtZSI6IuWbveWcn+iwg+afpeS6keaXoOS6uuacuuaOpeWPo+a1i+ivleivgeS5puS4peemgeeUqOS6juato+W8j+eOr+WigyIsImNlcnRjb2RlIjoiVUFWMzJfV0hSNEUzVUFKWlRFM0tFNUlaRkRHTDdDQlUiLCJjZXJ0b3JnY29kZSI6IjEyMTAwMDAwNDAwMDEwMzk4UCIsImNlcnRvcmduYW1lIjoi5Lit5Zu95Zu95Zyf5YuY5rWL6KeE5YiS6ZmiIiwiZXhwaXJhdGlvbiI6IjIwMjQtMTItMzEgMTU6NDY6MzIiLCJwdWJsaWNrZXkiOiIwNDIyNUFBQ0Y2MDZEODAwRUEzQzJDMzFGQ0Y4RkIxNjFCMTVGN0E4RDA0NjBERUI5MTAxM0Q0RjIyOEM0NTVFNzZBMkVEOEQ3MUJDNjUyNUI1REM1Q0MwMTVDMTU1NDc5RDg4Mzk5NTAzNDRBRUU0MzhBM0E2MzA1QzkwRjgyNjlGIiwic2lnbiI6IkI4OTVGQUM1Qzk4NzM5RURGNzFBRkE2QjM4NDEzQUIzNDRCRTBDQjE1RTk3MDQ3Nzk5QTczNUM0MjBEMkZFMzdENkE1NjJFQTlFMUFBRjFBNjhBRDJERjE0QzhEMThBOEY5N0JENzUyOUE2NDRERDA3NkI2NDM1OTg5QkQxREIwIiwiY2VydHR5cGUiOiLml6DkurrmnLrkuL7or4Hor4HkuaYiLCJyZWdpb25jb2RlIjoiMDAwMDAwIn0=");
+ headers.set("x-lc-secret", "00D631FD5615416EAB63D33A9E66E801F95DE840567504210080006081DE877AE3");
// 构建请求实体
HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
// 发送请求
ResponseEntity<String> response = restTemplate.exchange(
- "http://localhost:6789/droneAirport/test",
+ "https://xcx.geoway.com.cn:8033/v1/droneAirport/authorization",
HttpMethod.POST,
requestEntity,
String.class);
}
@Override
- public ReturnTaskParam AddTask(String base64, String Secret, String username) throws Exception {
+ public Map<String, String> AddTask(String base64, String Secret, String username) throws Exception {
ReturnTaskParam param = new ReturnTaskParam();
+ //获取SM4密钥
+ String secret = SM4Util.generateSM4Key();
+ //对SM4密钥进行SM2加密
+ String retse = Utils.encrypt(secret, "04CF7CAE31B5130D1D5D1AC1DC2778D94533868A8D57FC02BBD97B688E07145DAAA96462DC83D9F348261F738D51C049770C43BA53B584917C9E30C6221B737CDD");
String taskId = UUID.randomUUID().toString();
String traceid = UUID.randomUUID().toString();
- String sm4Secrect = deSM2(Secret, "23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D");
+ //通过SM2私钥解密请求头里的secret获取SM4密钥
+ String sm4Secrect = deSM2(Secret, "00D631FD5615416EAB63D33A9E66E801F95DE840567504210080006081DE877AE3");
+ //使用从请求头里获取的SM4密钥解析请求参数
String decryptedJson = SM4Util.decrypt(sm4Secrect, base64);
JSONObject jsonObject = new JSONObject(decryptedJson);
AddTaskDto addTaskDto = jsonToDto(jsonObject);
TaskInfo taskInfo = new TaskInfo();
+ //获取设备Id
List<String> listx = convertStringToList(addTaskDto.getDeviceid());
taskInfo.setId(traceid);
taskInfo.setTaskId(taskId);
@@ -261,6 +300,7 @@
for (TaskListDto taskListDto : tasklist) {
LotInfo lotInfo = convertToLotInfo(taskListDto);
lotInfo.setTaskId(taskId);
+ //
lotInfo.setType(1);
lotInfo.setTaskName(addTaskDto.getBizidname());
lotInfo.setUserName(username);
@@ -284,7 +324,8 @@
String waylineName = TimerUtil.getTimeName();
MultipartFile multipartFile = timerUtil.getFile(waylineName, lotInfosForAirport, airport.getLat(), airport.getLon());
WaylineFileEntity waylineFile = timerUtil.backWayline(multipartFile, waylineName, airport.getWorkspaceId(), username);
- Long time = getNextDayEightAMTimestamp(countDistinctTaskIdsForToday(airport.getWorkspaceId()));
+ Long time = getNextDayEightAMTimestamp(getDistinctTaskIdCount(airport.getWorkspaceId()));
+// Long time = getAdjustedTimestamp(50);
List<List<Long>> listOfLists = new ArrayList<>();
List<Long> sublist = new ArrayList<>();
sublist.add(time);
@@ -292,21 +333,26 @@
List<Long> lists1 = new ArrayList<>();
lists1.add(time);
String times = TimerUtil.convertTimestampToFormattedString(time);
- param.setJobId(SM4Util.encrypt("jsimjrby3wqb7dbq", taskId));
+ param.setJobId(SM4Util.encrypt(secret, taskId));
timerUtil.sendPostWithParameters(waylineName, waylineFile.getWaylineId(), times, lists1, listOfLists, taskId + "~" + airport.getWorkspaceId(), airport.getDockSn());
timerUtil.updatePatchesStatu(lotInfosForAirport);
}
}
-
- return param;
+ Map<String, String> info = new HashMap<>();
+ info.put("taskid", param.getJobId());
+ info.put("traceid", param.getTraceId());
+ info.put("serect", retse);
+ return info;
}
@Override
- public ReturnTaskParam updateTask(String base64, String Secret, String username) throws Exception {
+ public Map<String, String> updateTask(String base64, String Secret, String username) throws Exception {
ReturnTaskParam param = new ReturnTaskParam();
+ String secret = SM4Util.generateSM4Key();
+ String retse = Utils.encrypt(secret, "04CF7CAE31B5130D1D5D1AC1DC2778D94533868A8D57FC02BBD97B688E07145DAAA96462DC83D9F348261F738D51C049770C43BA53B584917C9E30C6221B737CDD");
String traceid = UUID.randomUUID().toString();
- String sm4Secrect = deSM2(Secret, "23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D");
+ String sm4Secrect = deSM2(Secret, "00D631FD5615416EAB63D33A9E66E801F95DE840567504210080006081DE877AE3");
String decryptedJson = SM4Util.decrypt(sm4Secrect, base64);
JSONObject jsonObject = new JSONObject(decryptedJson);
UpdataTaskDto addTaskDto = UpjsonToDto(jsonObject);
@@ -356,7 +402,7 @@
WaylineFileEntity waylineFile = timerUtil.backWayline(multipartFile, waylineName, airport.getWorkspaceId(), username);
// 将为规划的图斑状态更新为已规划
- Long time = getNextDayEightAMTimestamp(countDistinctTaskIdsForToday(airport.getWorkspaceId()));
+ Long time = getNextDayEightAMTimestamp(getDistinctTaskIdCount(airport.getWorkspaceId()));
List<List<Long>> listOfLists = new ArrayList<>();
List<Long> sublist = new ArrayList<>();
sublist.add(time);
@@ -364,22 +410,30 @@
List<Long> lists1 = new ArrayList<>();
lists1.add(time);
String times = TimerUtil.convertTimestampToFormattedString(time);
- param.setJobId(taskId);
+ param.setJobId(SM4Util.encrypt(secret, taskId));
timerUtil.sendPostWithParameters(waylineName, waylineFile.getWaylineId(), times, lists1, listOfLists, airport.getWorkspaceId() + "~" + taskId, airport.getDockSn());
timerUtil.updatePatchesStatu(lotInfosForAirport);
}
}
-
- return param;
+ Map<String, String> info = new HashMap<>();
+ info.put("taskid", param.getJobId());
+ info.put("traceid", param.getTraceId());
+ info.put("serect", retse);
+ return info;
}
@Override
- public ResponseResult cancelTask(String taskId) {
+ public Map<String, String> cancelTask(String taskId) throws InvalidCipherTextException, IOException {
+ String secret = SM4Util.generateSM4Key();
+ String retse = Utils.encrypt(secret, "04CF7CAE31B5130D1D5D1AC1DC2778D94533868A8D57FC02BBD97B688E07145DAAA96462DC83D9F348261F738D51C049770C43BA53B584917C9E30C6221B737CDD");
LambdaUpdateWrapper<WaylineJobEntity> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.like(WaylineJobEntity::getJobId, taskId)
.set(WaylineJobEntity::getStatus, 4);
waylineJobMapper.update(null, updateWrapper);
- return null;
+ Map<String, String> info = new HashMap<>();
+ info.put("serect", retse);
+ info.put("taskid", SM4Util.encrypt(secret,taskId));
+ return info;
}
public void processAndInsertTasks(List<AirportTasks> airportTasks) {
@@ -400,7 +454,7 @@
List<WaylineJobEntity> jobEntity = waylineJobMapper.selectList(new LambdaQueryWrapper<WaylineJobEntity>().like(WaylineJobEntity::getJobId, taskid));
if (jobEntity == null || jobEntity.isEmpty()) {
- return ResponseResult.error(201, "查询无人机机场任务状态失败！");
+ return ResponseResult.success(201, "查询无人机机场任务状态失败！","",UUID.randomUUID().toString());
}
// 检查是否所有 status 都等于 4
@@ -412,11 +466,11 @@
.allMatch(job -> job.getStatus() == 3);
if (allStatusAreFour) {
- return ResponseResult.error(204, "查询无人机机场任务状态成功！");
+ return ResponseResult.success(204, "查询无人机机场任务状态成功！","",UUID.randomUUID().toString());
} else if (allStatusAreThree) {
- return ResponseResult.error(200, "查询无人机机场任务状态成功！");
+ return ResponseResult.success(200, "查询无人机机场任务状态成功！","",UUID.randomUUID().toString());
} else {
- return ResponseResult.error(202, "查询无人机机场任务状态成功！");
+ return ResponseResult.success(202, "查询无人机机场任务状态成功！","",UUID.randomUUID().toString());
}
}
@@ -426,34 +480,28 @@
* @param taskId 任务 ID
* @return 匹配的 DB 文件路径列表
*/
- public String findDbFilesByTaskId(String taskId) {
+ public Map<String,String> findDbFilesByTaskId(String taskId) throws InvalidCipherTextException, IOException {
DbUploadEntity entity = dbUploadMapper.selectOne(new LambdaQueryWrapper<DbUploadEntity>()
.eq(DbUploadEntity::getTaskId, taskId));
- if (entity!=null){
- DbUploadDto dto=DbEntityToDto(entity);
- return SM4Util.encrypt("jsimjrby3wqb7dbq",buildRequestBody(dto));
+ String secret = SM4Util.generateSM4Key();
+ String traceId = UUID.randomUUID().toString();
+ Map<String,String> info =new HashMap<>();
+ String retse = Utils.encrypt(secret, "04225AACF606D800EA3C2C31FCF8FB161B15F7A8D0460DEB91013D4F228C455E76A2ED8D71BC6525B5DC5CC015C155479D8839950344AEE438A3A6305C90F8269F");
+ if (entity != null) {
+ DbUploadDto dto = DbEntityToDto(entity);
+ String data=buildRequestBody(dto);
+ String text=SM4Util.encrypt(secret,data);
+ info.put("data", text);
+ info.put("serect", retse);
+ info.put("traceId",traceId);
+ return info;
}
return null;
-
-// File baseDir = new File(BASE_DIR);
-//
-// // 检查基础目录是否存在并且是目录
-// if (!baseDir.exists() || !baseDir.isDirectory()) {
-// throw new IllegalStateException("Base directory does not exist or is not a directory.");
-// }
-//
-// // 构建文件路径
-// File targetDir = new File(baseDir, taskId);
-// File dbFile = new File(targetDir, ".db");
-//
-// // 如果文件存在，则返回文件路径
-// if (dbFile.exists()) {
-// return dbFile.getAbsolutePath();
-// }
-//
-// return null; // 或者抛出异常，视需求而定
}
+ public static void main(String[] args) {
+ getToken();
+ }
public void delPatchesByTaskId(String taskId) {
patchesMapper.delete(new LambdaUpdateWrapper<LotInfo>().eq(LotInfo::getTaskId, taskId));
@@ -474,6 +522,7 @@
dto.setUrl(entity.getUrl());
return dto;
}
+
public void delTaskInfo(String taskId) {
taskInfoMapper.delete(new LambdaUpdateWrapper<TaskInfo>().eq(TaskInfo::getTaskId, taskId));
}
@@ -493,8 +542,9 @@
}
public String getBizidnameByTask(String taskId) {
- TaskInfo taskInfo = taskInfoMapper.selectOne(new LambdaQueryWrapper<TaskInfo>().eq(TaskInfo::getTaskId, taskId));
- return taskInfo.getName();
+ List<LotInfo> lotInfos = patchesMapper.selectList(new LambdaQueryWrapper<LotInfo>().eq(LotInfo::getTaskId, taskId));
+ String taskName = lotInfos.get(0).getTaskName();
+ return taskName;
}
public static String enSM2(String data, String pubKey) throws InvalidCipherTextException, IOException {
@@ -748,19 +798,37 @@
// 调用 update 方法进行更新操作
waylineJobMapper.update(null, updateWrapper);
}
- public int countDistinctTaskIdsForToday(String workspaceId) {
- // 获取当天的开始和结束时间戳
- long startOfDay = LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli();
- long startOfNextDay = LocalDate.now().plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli();
- // 查询数据库，计算不同 taskId 的数量
- return patchesMapper.selectCount(new LambdaQueryWrapper<LotInfo>()
- .eq(LotInfo::getWorkspaceId, workspaceId)
- .ge(LotInfo::getCreateTime, startOfDay)
- .lt(LotInfo::getCreateTime, startOfNextDay)
- .select(LotInfo::getTaskId)
- .groupBy(LotInfo::getTaskId)
- );
+ /**
+ * 统计给定工作空间下，创建时间为当天的不同 taskId 的数量。
+ *
+ * @param workspaceId 工作空间 ID
+ * @return 不同 taskId 的数量
+ */
+ public Integer getDistinctTaskIdCount(String workspaceId) {
+ // 获取当前日期的开始和结束时间
+ LocalDate today = LocalDate.now();
+ LocalDateTime startTime = today.atStartOfDay();
+ LocalDateTime endTime = today.plusDays(1).atStartOfDay();
+
+ // 转换为毫秒时间戳
+ long startTimestamp = startTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ long endTimestamp = endTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+ // 使用 LambdaQueryWrapper 进行查询
+ LambdaQueryWrapper<LotInfo> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(LotInfo::getWorkspaceId, workspaceId)
+ .ge(LotInfo::getCreateTime, startTimestamp)
+ .lt(LotInfo::getCreateTime, endTimestamp);
+
+ // 获取符合条件的所有 taskId
+ Set<String> taskIdSet = patchesMapper.selectList(queryWrapper).stream()
+ .map(LotInfo::getTaskId)
+ .collect(Collectors.toSet());
+
+ // 返回不同 taskId 的数量
+ return taskIdSet.size();
}
+
}
--
Gitblit v1.9.3