From 800cd06bd490444adc45e1d1e5d31ddba9ed9659 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 07 Aug 2024 17:14:58 +0800
Subject: [PATCH] 完成机场设备授权和机场无人机的状态获取
---
src/main/java/com/dji/sample/droneairport/utils/SM4Util.java | 80 +++++++-
src/main/java/com/dji/sample/droneairport/utils/SM2/Test.java | 6
src/main/java/com/dji/sample/droneairport/model/dto/RegistDto.java | 23 ++
src/main/java/com/dji/sample/droneairport/utils/DroneData.java | 21 ++
src/main/java/com/dji/sample/droneairport/controller/RegistController.java | 47 ++--
src/main/java/com/dji/sample/droneairport/dao/DeviceExpanSionDao.java | 9 +
src/main/java/com/dji/sample/droneairport/model/dto/DroneStateDto.java | 8
src/main/java/com/dji/sample/droneairport/service/RegistService.java | 12
/dev/null | 16 -
src/main/java/com/dji/sample/droneairport/service/impl/RegistServiceImpl.java | 165 +++++++++++++-----
src/main/java/com/dji/sample/droneairport/model/dto/AddDeviceDto.java | 30 +++
src/main/java/com/dji/sample/common/model/ResponseResult.java | 11 +
src/main/java/com/dji/sample/droneairport/model/Entity/DeviceExpanSionEntity.java | 66 +++++++
13 files changed, 385 insertions(+), 109 deletions(-)
diff --git a/src/main/java/com/dji/sample/common/model/ResponseResult.java b/src/main/java/com/dji/sample/common/model/ResponseResult.java
index 638d80b..b54ef9b 100644
--- a/src/main/java/com/dji/sample/common/model/ResponseResult.java
+++ b/src/main/java/com/dji/sample/common/model/ResponseResult.java
@@ -24,6 +24,8 @@
private T data;
+ private String traceid;
+
public static <T> ResponseResult<T> success(T data) {
return ResponseResult.<T>builder()
.code(CODE_SUCCESS)
@@ -38,6 +40,7 @@
.message(MESSAGE_SUCCESS)
.build();
}
+
public static ResponseResult success(int code) {
return ResponseResult.builder()
.code(code)
@@ -45,6 +48,14 @@
.build();
}
+ public static ResponseResult success(int code, String message,String traceid) {
+ return ResponseResult.builder()
+ .code(code)
+ .message(message)
+ .traceid(traceid)
+ .build();
+ }
+
public static ResponseResult error() {
return ResponseResult.builder()
.code(HttpStatus.INTERNAL_SERVER_ERROR.value())
diff --git a/src/main/java/com/dji/sample/droneairport/controller/RegistController.java b/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
index 5d9640f..ef23d62 100644
--- a/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
+++ b/src/main/java/com/dji/sample/droneairport/controller/RegistController.java
@@ -1,41 +1,44 @@
package com.dji.sample.droneairport.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.common.model.ResponseResult;
-import com.dji.sample.droneairport.model.param.AddDeviceParam;
-import com.dji.sample.droneairport.model.param.RegistParam;
+import com.dji.sample.droneairport.dao.DeviceExpanSionDao;
+import com.dji.sample.droneairport.model.Entity.DeviceExpanSionEntity;
+import com.dji.sample.droneairport.model.dto.AddDeviceDto;
import com.dji.sample.droneairport.service.RegistService;
+import com.dji.sample.manage.service.impl.DeviceRedisServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
@RequestMapping("/droneAirport")
@RestController
public class RegistController {
@Autowired
private RegistService registService;
+ @Autowired
+ private DeviceExpanSionDao expanSionDao;
- @PostMapping("/RegistService")
- public ResponseResult resgitePort(@RequestBody RegistParam param) {
- return ResponseResult.success(registService.registPort(param));
- }
+ @Autowired
+ private DeviceRedisServiceImpl deviceRedisService;
- @PostMapping("/addDevice")
- public ResponseResult registeDrone(@RequestBody AddDeviceParam param) {
- param.setBrand("大疆");
- param.setDeviceid("1581F6QAD241500BDZ3J");
- param.setModel("M3D");
- param.setHeight(15);
- param.setLatitude(25.8917271933111);
- param.setLongitude(116.02094292569765);
- param.setRadius(7000);
- param.setRegioncode("360781");
- return ResponseResult.success(registService.addDrone(param));
+ // @PostMapping("/RegistService")
+// public ResponseResult resgitePort(@RequestBody RegistDto param) {
+// return ResponseResult.success(registService.registPort(param));
+// }
+ @PostMapping("/authorization")
+ public ResponseResult checkDeviceOnline(@RequestBody String body, HttpServletRequest request) throws Exception {
+ String headerValue = request.getHeader("x-lc-secret");
+ return registService.authorization(body,headerValue);
+
}
- @PostMapping("/test")
- public ResponseResult test(@RequestBody AddDeviceParam param) {
- return ResponseResult.success(param);
+ @PostMapping("/addDevice/{workspace_id}")
+ public ResponseResult registeDrone(@PathVariable(name = "workspace_id") String workspaceId) {
+ return ResponseResult.success(registService.addDrone(workspaceId));
}
- @GetMapping("/getDroneStatus")
- public ResponseResult droneStatus(@RequestParam String deviceid){
+ @GetMapping("/getDroneStatus/{deviceid}")
+ public ResponseResult droneStatus(@PathVariable (name = "deviceid") String deviceid , HttpServletRequest request) throws Exception {
return ResponseResult.success(registService.getDroneState(deviceid));
}
}
diff --git a/src/main/java/com/dji/sample/droneairport/dao/DeviceExpanSionDao.java b/src/main/java/com/dji/sample/droneairport/dao/DeviceExpanSionDao.java
new file mode 100644
index 0000000..da3dc58
--- /dev/null
+++ b/src/main/java/com/dji/sample/droneairport/dao/DeviceExpanSionDao.java
@@ -0,0 +1,9 @@
+package com.dji.sample.droneairport.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dji.sample.droneairport.model.Entity.DeviceExpanSionEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface DeviceExpanSionDao extends BaseMapper<DeviceExpanSionEntity> {
+}
diff --git a/src/main/java/com/dji/sample/droneairport/model/Entity/DeviceExpanSionEntity.java b/src/main/java/com/dji/sample/droneairport/model/Entity/DeviceExpanSionEntity.java
new file mode 100644
index 0000000..f590269
--- /dev/null
+++ b/src/main/java/com/dji/sample/droneairport/model/Entity/DeviceExpanSionEntity.java
@@ -0,0 +1,66 @@
+package com.dji.sample.droneairport.model.Entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName(value = "manage_device_expansion")
+public class DeviceExpanSionEntity {
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private int id;
+
+ @TableField("workspace_id")
+ private String workspaceId;
+
+ @TableField("service_url")
+ private String serviceUrl;
+
+ @TableField("live_stream_plugin_url")
+ private String liveStreamPluginUrl;
+
+ @TableField("contracts")
+ private String contracts;
+
+ @TableField("phone")
+ private String phone;
+
+ @TableField("regioncode")
+ private String regioncode;
+
+ @TableField("brand")
+ private String brand;
+
+ @TableField("model")
+ private String model;
+
+ @TableField("device_id")
+ private String deviceId;
+
+ @TableField("longitude")
+ private double longitude;
+
+ @TableField("latitude")
+ private double latitude;
+
+ @TableField("height")
+ private double height;
+
+ @TableField("radius")
+ private double radius;
+
+ @TableField("status")
+ private Integer status;
+
+ @TableField("type")
+ private Integer type;
+}
diff --git a/src/main/java/com/dji/sample/droneairport/model/dto/AddDeviceDto.java b/src/main/java/com/dji/sample/droneairport/model/dto/AddDeviceDto.java
new file mode 100644
index 0000000..a290561
--- /dev/null
+++ b/src/main/java/com/dji/sample/droneairport/model/dto/AddDeviceDto.java
@@ -0,0 +1,30 @@
+package com.dji.sample.droneairport.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class AddDeviceDto {
+
+ private String regioncode;
+
+ private String deviceid;
+
+ private String brand;
+
+ private String model;
+
+ private double longitude;
+
+ private double latitude;
+
+ private double height;
+
+ private double radius;
+}
diff --git a/src/main/java/com/dji/sample/droneairport/model/dto/DroneStateDto.java b/src/main/java/com/dji/sample/droneairport/model/dto/DroneStateDto.java
index 72d5207..5b8583b 100644
--- a/src/main/java/com/dji/sample/droneairport/model/dto/DroneStateDto.java
+++ b/src/main/java/com/dji/sample/droneairport/model/dto/DroneStateDto.java
@@ -1,11 +1,17 @@
package com.dji.sample.droneairport.model.dto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class DroneStateDto {
- private int mode_code;
+ private int modeCode;
private double longitude;
diff --git a/src/main/java/com/dji/sample/droneairport/model/dto/RegistDto.java b/src/main/java/com/dji/sample/droneairport/model/dto/RegistDto.java
new file mode 100644
index 0000000..3888d43
--- /dev/null
+++ b/src/main/java/com/dji/sample/droneairport/model/dto/RegistDto.java
@@ -0,0 +1,23 @@
+package com.dji.sample.droneairport.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+public class RegistDto {
+ @JsonProperty("serviceUrl")
+ private String serviceUrl;
+ @JsonProperty("liveStreamPluginUrl")
+ private String liveStreamPluginUrl;
+
+ private String contacts;
+
+ private String phone;
+}
diff --git a/src/main/java/com/dji/sample/droneairport/model/param/AddDeviceParam.java b/src/main/java/com/dji/sample/droneairport/model/param/AddDeviceParam.java
deleted file mode 100644
index 70c7435..0000000
--- a/src/main/java/com/dji/sample/droneairport/model/param/AddDeviceParam.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.dji.sample.droneairport.model.param;
-
-import lombok.Data;
-
-@Data
-public class AddDeviceParam {
-
- private String regioncode;
-
- private String deviceid;
-
- private String brand;
-
- private String model;
-
- private double longitude;
-
- private double latitude;
-
- private double height;
-
- private double radius;
-}
diff --git a/src/main/java/com/dji/sample/droneairport/model/param/RegistParam.java b/src/main/java/com/dji/sample/droneairport/model/param/RegistParam.java
deleted file mode 100644
index 0eddcb7..0000000
--- a/src/main/java/com/dji/sample/droneairport/model/param/RegistParam.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dji.sample.droneairport.model.param;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-@Data
-public class RegistParam {
- @JsonProperty("serviceUrl")
- private String serviceUrl;
- @JsonProperty("liveStreamPluginUrl")
- private String liveStreamPluginUrl;
-
- private String contacts;
-
- private String phone;
-}
diff --git a/src/main/java/com/dji/sample/droneairport/service/RegistService.java b/src/main/java/com/dji/sample/droneairport/service/RegistService.java
index 0414c0b..277956f 100644
--- a/src/main/java/com/dji/sample/droneairport/service/RegistService.java
+++ b/src/main/java/com/dji/sample/droneairport/service/RegistService.java
@@ -1,14 +1,16 @@
package com.dji.sample.droneairport.service;
+import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.droneairport.model.Entity.DeviceExpanSionEntity;
import com.dji.sample.droneairport.model.dto.DroneStateDto;
-import com.dji.sample.droneairport.model.param.AddDeviceParam;
-import com.dji.sample.droneairport.model.param.RegistParam;
public interface RegistService {
- String registPort(RegistParam param);
+ String registPort(DeviceExpanSionEntity airport);
- String addDrone(AddDeviceParam param);
+ String addDrone(String workspceId);
- DroneStateDto getDroneState(String deviceId);
+ ResponseResult getDroneState(String deviceId) throws Exception;
+
+ ResponseResult authorization(String base64, String Secret) throws Exception;
}
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 1deffed..75bf812 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
@@ -1,15 +1,26 @@
package com.dji.sample.droneairport.service.impl;
+
+import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dji.sample.common.model.ResponseResult;
+import com.dji.sample.component.redis.RedisOpsUtils;
+import com.dji.sample.droneairport.dao.DeviceExpanSionDao;
+import com.dji.sample.droneairport.model.Entity.DeviceExpanSionEntity;
+import com.dji.sample.droneairport.model.dto.AddDeviceDto;
import com.dji.sample.droneairport.model.dto.DroneStateDto;
-import com.dji.sample.droneairport.model.param.AddDeviceParam;
-import com.dji.sample.droneairport.model.param.RegistParam;
+import com.dji.sample.droneairport.model.dto.RegistDto;
import com.dji.sample.droneairport.service.RegistService;
import com.dji.sample.droneairport.utils.AuthUtil;
import com.dji.sample.droneairport.utils.SM2.Utils;
import com.dji.sample.droneairport.utils.SM4Util;
+import com.dji.sample.manage.model.receiver.OsdSubDeviceReceiver;
+import com.dji.sample.manage.service.IDeviceRedisService;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.bouncycastle.crypto.InvalidCipherTextException;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -24,21 +35,26 @@
public class RegistServiceImpl implements RegistService {
private final RestTemplate restTemplate = new RestTemplate();
private final ObjectMapper objectMapper = new ObjectMapper();
+ @Autowired
+ private IDeviceRedisService redisService;
+ @Autowired
+ private DeviceExpanSionDao expanSionDao;
- public String registPort(RegistParam param) {
+ public String registPort(DeviceExpanSionEntity airport) {
try {
+ RegistDto registDto = airportEntityToDto(airport);
// 构建请求体
- String jsonBody = buildRequestBody(param);
+ String jsonBody = buildRequestBody(registDto);
// 设置请求头
- String base64=SM4Util.encrypt("jsimjrby3wqb7dbq",jsonBody);
+ String base64 = SM4Util.encrypt("jsimjrby3wqb7dbq", 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", AuthUtil.getToken());
- headers.set("x-lc-token",Utils.encrypt("jsimjrby3wqb7dbq","044D6061FC08A19D3F32CEAA8CF6679B40500008FD741FC26DE7E50AEBF3A9115D47274437730EADEDAEF0CCC4853C5F0B35B30C6AEA83A5F6FBCA4ABEAC9E3B98"));
+ headers.set("x-lc-token", AuthUtil.getToken());
+ headers.set("x-lc-secret", Utils.hexToBase64(Utils.encrypt("jsimjrby3wqb7dbq", "044D6061FC08A19D3F32CEAA8CF6679B40500008FD741FC26DE7E50AEBF3A9115D47274437730EADEDAEF0CCC4853C5F0B35B30C6AEA83A5F6FBCA4ABEAC9E3B98")));
// 构建请求实体
HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
// 发送请求
@@ -55,37 +71,28 @@
}
}
- private String buildRequestBody(RegistParam param) {
+ private String buildRequestBody(RegistDto dto) {
try {
- return objectMapper.writeValueAsString(param);
+ return objectMapper.writeValueAsString(dto);
} catch (JsonProcessingException e) {
throw new RuntimeException("数据有误", e);
}
}
@Override
- public String addDrone(AddDeviceParam param) {
+ public String addDrone(String workspaceId) {
try {
+ DeviceExpanSionEntity airport = expanSionDao.selectOne(new LambdaQueryWrapper<DeviceExpanSionEntity>()
+ .eq(DeviceExpanSionEntity::getWorkspaceId, workspaceId)
+ .eq(DeviceExpanSionEntity::getType, 0));
+ DeviceExpanSionEntity drone = expanSionDao.selectOne(new LambdaQueryWrapper<DeviceExpanSionEntity>()
+ .eq(DeviceExpanSionEntity::getWorkspaceId, workspaceId)
+ .eq(DeviceExpanSionEntity::getType, 1));
+ AddDeviceDto dto = deviceEntityToDto(drone);
// 构建请求体
- String jsonBody = buildRequestBody(param);
+ String jsonBody = buildRequestBody(dto);
String base64 = SM4Util.encrypt("jsimjrby3wqb7dbq", jsonBody);
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
- System.out.println(AuthUtil.getToken());
+ String secret = enSM2("jsimjrby3wqb7dbq", "044D6061FC08A19D3F32CEAA8CF6679B40500008FD741FC26DE7E50AEBF3A9115D47274437730EADEDAEF0CCC4853C5F0B35B30C6AEA83A5F6FBCA4ABEAC9E3B98");
// 设置请求头
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
@@ -93,15 +100,15 @@
headers.set("Accept-Language", "zh-CN,zh;q=0.9");
headers.setConnection("keep-alive");
headers.set("x-lc-token", AuthUtil.getToken());
- headers.set("x-lc-secret", Utils.encrypt("jsimjrby3wqb7dbq", "044D6061FC08A19D3F32CEAA8CF6679B40500008FD741FC26DE7E50AEBF3A9115D47274437730EADEDAEF0CCC4853C5F0B35B30C6AEA83A5F6FBCA4ABEAC9E3B98"));
+ headers.set("x-lc-secret", secret);
// 构建请求实体
- HttpEntity<byte[]> requestEntity = new HttpEntity<>(base64.getBytes(), headers);
+ HttpEntity<String> requestEntity = new HttpEntity<>(base64, headers);
// 发送请求
RestTemplate restTemplate = new RestTemplate();
String response = restTemplate.postForObject("https://xcx.geoway.com.cn:8033/v1/droneAirport/addDevice", requestEntity, String.class);
-
+ registPort(airport);
return response;
} catch (Exception e) {
@@ -111,37 +118,53 @@
}
@Override
- public DroneStateDto getDroneState(String deviceId) {
- return null;
+ public ResponseResult getDroneState(String deviceId) throws Exception {
+ DroneStateDto data = getAirportFromCache(deviceId);
+ String json = JSON.toJSONString(data);
+ String SM4Screct = SM4Util.encrypt("jsimjrby3wqb7dbq", json);
+ String SM2Screct = enSM2(SM4Screct, "23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D");
+ return ResponseResult.success(SM2Screct);
}
- private String buildRequestBody(AddDeviceParam param) {
+ @Override
+ public ResponseResult authorization(String base64, String enSm4) throws Exception {
+ String sm4Secrect = deSM2(enSm4, "23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D");
+ String decryptedJson = SM4Util.decrypt(sm4Secrect, base64);
+ JSONObject jsonObject = new JSONObject(decryptedJson);
+ String deviceId = jsonObject.getStr("deviceid");
+ boolean online = redisService.checkDeviceOnline(deviceId);
+ if (online) {
+ return ResponseResult.success(200, "无人机机场授权成功！", "");
+ }
+ return ResponseResult.error(500, "无人机机场授权失败！");
+ }
+
+ private String buildRequestBody(AddDeviceDto dto) {
try {
- return objectMapper.writeValueAsString(param);
+ return objectMapper.writeValueAsString(dto);
} catch (JsonProcessingException e) {
throw new RuntimeException("数据有误", e);
}
}
- public static String getSM2(String data, String key, String pubKey) throws InvalidCipherTextException, IOException {
- String text = SM4Util.encrypt(key, data);
- String encrypt = Utils.encrypt(text, pubKey);
+
+
+ public static String enSM2(String data, String pubKey) throws InvalidCipherTextException, IOException {
+ String encrypt = Utils.encrypt(data, pubKey);
encrypt = Utils.hexToBase64(encrypt);
return encrypt;
}
- public static String deSM2(String Base64, String priKey, String serect) throws Exception {
+ public static String deSM2(String Base64, String priKey) throws Exception {
String hex = Utils.convertBase64ToHex(Base64);
- String decrypt = Utils.decrypt(hex, priKey);
- return SM4Util.decrypt(serect, decrypt);
+ return Utils.decrypt(hex, priKey);
}
public static void main(String[] args) throws Exception {
- System.out.println(getSM2("jsimjrby3wqb7dbq", "jsimjrby3wqb7dbq", "044c4e29d89bc0389409e204b8c072af927d2bfbc62265472463f6fa2642e565411925c58ca72b8da87d743afffa9f94aeaee4351a0511692e06ad1567ba32d236"));
-
- System.out.println(deSM2("BN2taHcWvZhysmUbAHjPAWo/vAgW3pCTv4CK0dHJoUpM62k1oUeYnMvK4twfcBs/qkbygkAt+4pUaBa6iomM9MSKVCtOSb1QAaAQ9milAvkDPSBE9yrYHzLQeLkT9HwENBJ5NanF6vl2nPgpC1d1q+XeJEBrEvJtpQkSHHsh/me/1+h9zPy0MpMkH89S",
- "00e9ced7f847e5b414ef4f4f164ec5f83172b3183826c075f0e37d3f8a1e1f6c2c", "jsimjrby3wqb7dbq"));
+ System.out.println(enSM2("jsimjrby3wqb7dbq", "044D6061FC08A19D3F32CEAA8CF6679B40500008FD741FC26DE7E50AEBF3A9115D47274437730EADEDAEF0CCC4853C5F0B35B30C6AEA83A5F6FBCA4ABEAC9E3B98"));
+ System.out.println(deSM2("BK010WH/Ax++jp57tWA4eHwbB26eqiG7bwmDfzaEGAtA6XN6/lQDt34mL0x4l4fEIOmQSzVfMqt4SV901gjzwf19mAeuPfM8AuCqCZsWZ9QU1bEx5ZqMIUDlFn9ngEbSbZ8qb1ERDvYtaMN5YE+9uI8=", "23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D"));
System.out.println(createKey());
}
+
public static Map<String, String> createKey() throws NoSuchAlgorithmException {
Map<String, String> keyPair = Utils.createKeyPair();
Map<String, String> newKey = new HashMap<>();
@@ -149,4 +172,54 @@
newKey.put("privateKey", keyPair.get("pveky"));
return newKey;
}
-}
+
+ public AddDeviceDto deviceEntityToDto(DeviceExpanSionEntity entity) {
+ AddDeviceDto.AddDeviceDtoBuilder builder = AddDeviceDto.builder();
+ if (entity != null) {
+ builder.brand(entity.getBrand())
+ .height(entity.getHeight())
+ .longitude(entity.getLongitude())
+ .latitude(entity.getLatitude())
+ .radius(entity.getRadius())
+ .regioncode(entity.getRegioncode())
+ .deviceid(entity.getDeviceId())
+ .model(entity.getModel())
+ .build();
+ }
+ return builder.build();
+ }
+
+ public RegistDto airportEntityToDto(DeviceExpanSionEntity entity) {
+ RegistDto.RegistDtoBuilder builder = RegistDto.builder();
+ if (entity != null) {
+ builder.serviceUrl(entity.getServiceUrl())
+ .contacts(entity.getContracts())
+ .phone(entity.getPhone())
+ .liveStreamPluginUrl(entity.getLiveStreamPluginUrl())
+ .build();
+ }
+ return builder.build();
+ }
+
+ public OsdSubDeviceReceiver getDroneFromCache(String sn) {
+ String key = "osd:" + sn;
+ return (OsdSubDeviceReceiver) RedisOpsUtils.get(key);
+ }
+
+
+ public DroneStateDto getAirportFromCache(String deviceId) {
+ OsdSubDeviceReceiver receiver = getDroneFromCache(deviceId);
+ DroneStateDto.DroneStateDtoBuilder builder = DroneStateDto.builder();
+ builder.gimbalYal(receiver.getAttitudeHead())
+ .gimbalPitch(receiver.getAttitudePitch())
+ .batteryCapacityPercent(receiver.getBattery().getCapacityPercent())
+ .height(receiver.getHeight())
+ .latitude(receiver.getLatitude())
+ .longitude(receiver.getLongitude())
+ .modeCode(0)
+ .elevation(receiver.getElevation())
+ .gpsState(2)
+ .build();
+ return builder.build();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/dji/sample/droneairport/utils/DroneData.java b/src/main/java/com/dji/sample/droneairport/utils/DroneData.java
new file mode 100644
index 0000000..a5b0c7a
--- /dev/null
+++ b/src/main/java/com/dji/sample/droneairport/utils/DroneData.java
@@ -0,0 +1,21 @@
+package com.dji.sample.droneairport.utils;
+
+import com.dji.sample.component.redis.RedisOpsUtils;
+import com.dji.sample.droneairport.model.Entity.DeviceExpanSionEntity;
+import com.dji.sample.manage.model.receiver.OsdSubDeviceReceiver;
+import org.springframework.stereotype.Service;
+
+@Service
+public class DroneData {
+
+
+
+ public OsdSubDeviceReceiver getDroneFromCache(String sn) {
+ String key ="osd:"+sn;
+ return (OsdSubDeviceReceiver)RedisOpsUtils.get(key);
+ }
+
+ public static void main(String[] args) {
+
+ }
+}
diff --git a/src/main/java/com/dji/sample/droneairport/utils/SM2/Test.java b/src/main/java/com/dji/sample/droneairport/utils/SM2/Test.java
index f46af7f..e6626c3 100644
--- a/src/main/java/com/dji/sample/droneairport/utils/SM2/Test.java
+++ b/src/main/java/com/dji/sample/droneairport/utils/SM2/Test.java
@@ -9,10 +9,10 @@
System.out.println("秘钥对：" + createKeyPair);
String privateKey = createKeyPair.get(KeyConstant.PRIVATE_KEY);
String publicKey = createKeyPair.get(KeyConstant.PUBLIC_KEY);
- String text = "test";
- String encrypt = Utils.encrypt(text, "049709f467dfdc4382657e081d18d4cf781f06996b2df6876f061615ff4a3ead7daba0fbc2b98c1a4ddee53db93f62b0f530b403e34141eb775277f434406a679a",ModeTypeEnum.BASE_MODE.getType());
+ String text = "jsimjrby3wqb7dbq";
+ String encrypt = Utils.encrypt(text, "044D6061FC08A19D3F32CEAA8CF6679B40500008FD741FC26DE7E50AEBF3A9115D47274437730EADEDAEF0CCC4853C5F0B35B30C6AEA83A5F6FBCA4ABEAC9E3B98",ModeTypeEnum.BASE_MODE.getType());
System.out.println("加密后密文：" + encrypt);
- String decrypt = Utils.decrypt(encrypt, "8b5afb843ca2a2d5bb12fc3442e7a17857a1d41c67c8212bb98a4943e28dfe8b",ModeTypeEnum.BASE_MODE.getType());
+ String decrypt = Utils.decrypt("04c294d1e7ebc488ede6344e2c207a33cb1e3f6fd4f7585012931a50fab43c907a8486f1df5c61e49d443ddd709aa08585a2814a766cec41ca2af908ef5a230d7d27b5600dd0b388df85616c63f711e06e32f9228129f8fece31e3a1a5eda92cdfee64ef32aa8a7a6451c7b36d32e8a4d0", "23E57DA1E4AB865CCBC325B668762207DEF74345B782237808AE0BABDF26734D",ModeTypeEnum.BASE_MODE.getType());
System.out.println("解密后明文：" + decrypt);
}
diff --git a/src/main/java/com/dji/sample/droneairport/utils/SM4Util.java b/src/main/java/com/dji/sample/droneairport/utils/SM4Util.java
index 1e721b8..0912d0e 100644
--- a/src/main/java/com/dji/sample/droneairport/utils/SM4Util.java
+++ b/src/main/java/com/dji/sample/droneairport/utils/SM4Util.java
@@ -6,34 +6,92 @@
import org.bouncycastle.crypto.paddings.PKCS7Padding;
import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
import java.util.Arrays;
import java.util.Base64;
public class SM4Util {
+
+
+ /**
+ * 生成一个随机的SM4加密密钥。
+ *
+ * SM4算法是一种对称加密算法，其密钥长度为128位（16字节）。
+ * 本方法使用安全随机数生成器生成一个16字节的随机值作为SM4密钥，
+ * 并将其转换为十六进制字符串格式以便于使用和存储。
+ *
+ * @return 返回一个表示SM4密钥的十六进制字符串。
+ */
+ public static String generateSM4Key() {
+ SecureRandom secureRandom = new SecureRandom();
+ byte[] sm4Key = new byte[16]; // SM4 密钥长度为 128 位（16 字节）
+ secureRandom.nextBytes(sm4Key);
+ String key = bytesToHex(sm4Key);
+ return key;
+ }
+
+
+ private static String bytesToHex(byte[] bytes) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : bytes) {
+ sb.append(String.format("%02x", b));
+ }
+ return sb.toString();
+ }
+ /**
+ * 使用SM4算法加密输入数据。
+ *
+ * @param key 加密密钥，应符合SM4算法的密钥长度要求。
+ * @param input 待加密的输入数据。
+ * @return 加密后的数据，以Base64编码形式表示。
+ */
public static String encrypt(byte[] key, byte[] input) {
+ // 创建并初始化SM4加密器
PaddedBufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new SM4Engine(), new PKCS7Padding());
cipher.init(true, new KeyParameter(key)); // ECB模式下不需要IV
+
+ // 用于存储加密后的数据
byte[] output = new byte[cipher.getOutputSize(input.length)];
+ // 处理输入数据，进行加密
int length = cipher.processBytes(input, 0, input.length, output, 0);
+
+ // 完成加密过程，处理可能剩余的数据
try {
length += cipher.doFinal(output, length);
} catch (Exception e) {
e.printStackTrace();
}
+
+ // 使用Base64编码加密后的字节数组，并返回
String encoded = Base64.getEncoder().encodeToString(Arrays.copyOf(output, length));
return encoded;
}
+
+ /**
+ * 使用SM4算法对输入数据进行解密
+ *
+ * @param key 密钥字节数组，用于解密数据
+ * @param input 待解密的字节数组
+ * @return 解密后的字节数组
+ */
public static byte[] decrypt(byte[] key, byte[] input) {
+ // 创建基于SM4算法的缓冲分组密码对象
PaddedBufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new SM4Engine(), new PKCS7Padding());
+ // 初始化密码对象为解密模式，并设置密钥参数
cipher.init(false, new KeyParameter(key)); // ECB模式下不需要IV
+ // 根据输入数据长度计算解密后的字节数组长度
byte[] output = new byte[cipher.getOutputSize(input.length)];
+ // 处理字节数组，将输入数据解密到输出字节数组中
int length = cipher.processBytes(input, 0, input.length, output, 0);
try {
+ // 完成最终的解密操作，并将长度累加到已处理字节数组中
length += cipher.doFinal(output, length);
} catch (Exception e) {
+ // 捕获并处理解密过程中的异常
e.printStackTrace();
}
+ // 返回解密后的字节数组
return Arrays.copyOf(output, length);
}
@@ -53,30 +111,20 @@
byte[] key = "jsimjrby3wqb7dbq".getBytes(StandardCharsets.UTF_8); // 16字节密钥
// 原始明文
- String plaintext = "{\n" +
- "\"regioncode\": \"650000\",\n" +
- "\"deviceid\": \"dh11111111111\",\n" +
- "\"brand\": \"大疆\",\n" +
- "\"model\": \"M3D\",\n" +
- "\"longitude\": 120.6670,\n" +
- "\"latitude\": 30.4567,\n" +
- "\"height\": 45,\n" +
- "\"radius\": 10000\n" +
- "}\n";
+ String plaintext = "{ \"deviceid\": \"1581F6QAD241500BDZ3J\", \"status\": 1 }";
String secert =encrypt(key,plaintext.getBytes());
- System.out.println(secert);
+// System.out.println(secert);
byte[] ming= Base64.getDecoder().decode(secert);
byte[] text=decrypt(key,ming);
- System.out.println(new String(text, StandardCharsets.UTF_8));
- System.out.println("封装"+encrypt("jsimjrby3wqb7dbq","hello"));
- System.out.println("封装"+decrypt("jsimjrby3wqb7dbq","MkzmRdHSy/pB4sdTjNHb4ngG0q7Z+vWzNKdJxJFkhw4Y9tI8R9sapL6ECLyVnKZwiZbmVQFtn+sT294nCVdskK8TUx7CCI3qo21d9I4ONl+XAYnlDCtEa8KSFK3CB3/D9zRt96zEDkv31Av2rdAJW9O7Le1Z13wWGmsEqHjjrXLv5jd/Cop6+BB9+lqDRlhx+ubNOFdUgJALe4wHjZPCMdE0ob44Hx+1iLg7m/WJQWc="));
- // 直接加密
+// System.out.println(new String(text, StandardCharsets.UTF_8));
+// System.out.println("封装"+encrypt("jsimjrby3wqb7dbq",plaintext));
+// System.out.println("封装"+decrypt("jsimjrby3wqb7dbq","9LFnVDdqleTOFcBJT7TSxs788zPH8PicodLb5634SsixHrKNX+ZAgwODPZxvWFNQ"));
String encryptedBase64 = encrypt(key, plaintext.getBytes(StandardCharsets.UTF_8));
// System.out.println("Encrypted (Base64): " + encryptedBase64);
-
+ System.out.println(generateSM4Key());
// 直接解密
byte[] decoded = Base64.getDecoder().decode(encryptedBase64);
byte[] decrypted = decrypt(key, decoded);
--
Gitblit v1.9.3