diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpBinaryDeviceMessageCodec.java b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpBinaryDeviceMessageCodec.java index 4f42a8c2f6..05098cccbf 100644 --- a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpBinaryDeviceMessageCodec.java +++ b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpBinaryDeviceMessageCodec.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; import java.nio.charset.StandardCharsets; /** - * TCP 二进制格式 {@link IotDeviceMessage} 编解码器 + * TCP/UDP 二进制格式 {@link IotDeviceMessage} 编解码器 *
* 二进制协议格式(所有数值使用大端序):
*
diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpJsonDeviceMessageCodec.java b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpJsonDeviceMessageCodec.java
index 10ffbdf5c6..7d62ce2e0f 100644
--- a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpJsonDeviceMessageCodec.java
+++ b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/codec/tcp/IotTcpJsonDeviceMessageCodec.java
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component;
/**
- * TCP JSON 格式 {@link IotDeviceMessage} 编解码器
+ * TCP/UDP JSON 格式 {@link IotDeviceMessage} 编解码器
*
* 采用纯 JSON 格式传输,格式如下:
* {
diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/router/IotTcpUpstreamHandler.java b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/router/IotTcpUpstreamHandler.java
index 58d7cde314..b4638a8261 100644
--- a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/router/IotTcpUpstreamHandler.java
+++ b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/router/IotTcpUpstreamHandler.java
@@ -10,7 +10,10 @@ import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
import cn.iocoder.yudao.module.iot.core.biz.IotDeviceCommonApi;
import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceRespDTO;
+import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
+import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterReqDTO;
+import cn.iocoder.yudao.module.iot.core.topic.auth.IotDeviceRegisterRespDTO;
import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity;
import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils;
import cn.iocoder.yudao.module.iot.gateway.codec.tcp.IotTcpBinaryDeviceMessageCodec;
@@ -120,6 +123,9 @@ public class IotTcpUpstreamHandler implements Handler
+ * 使用产品密钥(productSecret)验证身份,成功后返回设备密钥(deviceSecret)
+ *
+ * 注意:此接口不需要认证
+ */
+ @Test
+ public void testDeviceRegister() throws Exception {
+ // 1.1 构建注册消息
+ IotDeviceRegisterReqDTO registerReqDTO = new IotDeviceRegisterReqDTO();
+ registerReqDTO.setProductKey(PRODUCT_KEY);
+ registerReqDTO.setDeviceName("test-tcp-" + System.currentTimeMillis());
+ registerReqDTO.setProductSecret("test-product-secret");
+ IotDeviceMessage request = IotDeviceMessage.of(IdUtil.fastSimpleUUID(),
+ IotDeviceMessageMethodEnum.DEVICE_REGISTER.getMethod(), registerReqDTO, null, null, null);
+ // 1.2 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testDeviceRegister][Codec: {}, 请求消息: {}, 数据包长度: {} 字节]", CODEC.type(), request, payload.length);
+ if (CODEC instanceof IotTcpBinaryDeviceMessageCodec) {
+ log.info("[testDeviceRegister][二进制数据包(HEX): {}]", HexUtil.encodeHexStr(payload));
+ }
+
+ // 2.1 发送请求
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 2.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testDeviceRegister][响应消息: {}]", response);
+ log.info("[testDeviceRegister][成功后可使用返回的 deviceSecret 进行一机一密认证]");
+ } else {
+ log.warn("[testDeviceRegister][未收到响应]");
+ }
+ }
+ }
+
// ===================== 直连设备属性上报测试 =====================
/**
diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/test/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotGatewayDeviceTcpProtocolIntegrationTest.java b/yudao-module-iot/yudao-module-iot-gateway/src/test/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotGatewayDeviceTcpProtocolIntegrationTest.java
new file mode 100644
index 0000000000..22b2cb9f44
--- /dev/null
+++ b/yudao-module-iot/yudao-module-iot-gateway/src/test/java/cn/iocoder/yudao/module/iot/gateway/protocol/tcp/IotGatewayDeviceTcpProtocolIntegrationTest.java
@@ -0,0 +1,389 @@
+package cn.iocoder.yudao.module.iot.gateway.protocol.tcp;
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
+import cn.iocoder.yudao.module.iot.core.enums.IotDeviceMessageMethodEnum;
+import cn.iocoder.yudao.module.iot.core.mq.message.IotDeviceMessage;
+import cn.iocoder.yudao.module.iot.core.topic.IotDeviceIdentity;
+import cn.iocoder.yudao.module.iot.core.topic.auth.IotSubDeviceRegisterReqDTO;
+import cn.iocoder.yudao.module.iot.core.topic.property.IotDevicePropertyPackPostReqDTO;
+import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoAddReqDTO;
+import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoDeleteReqDTO;
+import cn.iocoder.yudao.module.iot.core.topic.topo.IotDeviceTopoGetReqDTO;
+import cn.iocoder.yudao.module.iot.core.util.IotDeviceAuthUtils;
+import cn.iocoder.yudao.module.iot.gateway.codec.IotDeviceMessageCodec;
+import cn.iocoder.yudao.module.iot.gateway.codec.tcp.IotTcpBinaryDeviceMessageCodec;
+import cn.iocoder.yudao.module.iot.gateway.codec.tcp.IotTcpJsonDeviceMessageCodec;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * IoT 网关设备 TCP 协议集成测试(手动测试)
+ *
+ * 测试场景:网关设备(IotProductDeviceTypeEnum 的 GATEWAY 类型)通过 TCP 协议管理子设备拓扑关系
+ *
+ * 支持两种编解码格式:
+ * 使用步骤:
+ * 注意:TCP 协议是有状态的长连接,认证成功后同一连接上的后续请求无需再携带认证信息
+ *
+ * @author 芋道源码
+ */
+@Slf4j
+public class IotGatewayDeviceTcpProtocolIntegrationTest {
+
+ private static final String SERVER_HOST = "127.0.0.1";
+ private static final int SERVER_PORT = 8091;
+ private static final int TIMEOUT_MS = 5000;
+
+ // ===================== 编解码器选择(修改此处切换 JSON / Binary) =====================
+ private static final IotDeviceMessageCodec CODEC = new IotTcpJsonDeviceMessageCodec();
+// private static final IotDeviceMessageCodec CODEC = new IotTcpBinaryDeviceMessageCodec();
+
+ // ===================== 网关设备信息(根据实际情况修改,从 iot_device 表查询网关设备) =====================
+ private static final String GATEWAY_PRODUCT_KEY = "m6XcS1ZJ3TW8eC0v";
+ private static final String GATEWAY_DEVICE_NAME = "sub-ddd";
+ private static final String GATEWAY_DEVICE_SECRET = "b3d62c70f8a4495487ed1d35d61ac2b3";
+
+ // ===================== 子设备信息(根据实际情况修改,从 iot_device 表查询子设备) =====================
+ private static final String SUB_DEVICE_PRODUCT_KEY = "jAufEMTF1W6wnPhn";
+ private static final String SUB_DEVICE_NAME = "chazuo-it";
+ private static final String SUB_DEVICE_SECRET = "d46ef9b28ab14238b9c00a3a668032af";
+
+ // ===================== 认证测试 =====================
+
+ /**
+ * 网关设备认证测试
+ */
+ @Test
+ public void testAuth() throws Exception {
+ // 1.1 构建认证消息
+ IotDeviceAuthReqDTO authInfo = IotDeviceAuthUtils.getAuthInfo(
+ GATEWAY_PRODUCT_KEY, GATEWAY_DEVICE_NAME, GATEWAY_DEVICE_SECRET);
+ IotDeviceAuthReqDTO authReqDTO = new IotDeviceAuthReqDTO()
+ .setClientId(authInfo.getClientId())
+ .setUsername(authInfo.getUsername())
+ .setPassword(authInfo.getPassword());
+ IotDeviceMessage request = IotDeviceMessage.of(IdUtil.fastSimpleUUID(), "auth", authReqDTO, null, null, null);
+ // 1.2 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testAuth][Codec: {}, 请求消息: {}, 数据包长度: {} 字节]", CODEC.type(), request, payload.length);
+ if (CODEC instanceof IotTcpBinaryDeviceMessageCodec) {
+ log.info("[testAuth][二进制数据包(HEX): {}]", HexUtil.encodeHexStr(payload));
+ }
+
+ // 2.1 发送请求
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 2.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testAuth][响应消息: {}]", response);
+ } else {
+ log.warn("[testAuth][未收到响应]");
+ }
+ }
+ }
+
+ // ===================== 拓扑管理测试 =====================
+
+ /**
+ * 添加子设备拓扑关系测试
+ */
+ @Test
+ public void testTopoAdd() throws Exception {
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+
+ // 1. 先进行认证
+ IotDeviceMessage authResponse = authenticate(socket);
+ log.info("[testTopoAdd][认证响应: {}]", authResponse);
+
+ // 2.1 构建子设备认证信息
+ IotDeviceAuthReqDTO subAuthInfo = IotDeviceAuthUtils.getAuthInfo(
+ SUB_DEVICE_PRODUCT_KEY, SUB_DEVICE_NAME, SUB_DEVICE_SECRET);
+ IotDeviceAuthReqDTO subDeviceAuth = new IotDeviceAuthReqDTO()
+ .setClientId(subAuthInfo.getClientId())
+ .setUsername(subAuthInfo.getUsername())
+ .setPassword(subAuthInfo.getPassword());
+ // 2.2 构建请求参数
+ IotDeviceTopoAddReqDTO params = new IotDeviceTopoAddReqDTO();
+ params.setSubDevices(Collections.singletonList(subDeviceAuth));
+ IotDeviceMessage request = IotDeviceMessage.of(
+ IdUtil.fastSimpleUUID(),
+ IotDeviceMessageMethodEnum.TOPO_ADD.getMethod(),
+ params,
+ null, null, null);
+ // 2.3 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testTopoAdd][Codec: {}, 请求消息: {}]", CODEC.type(), request);
+
+ // 3.1 发送请求
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 3.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testTopoAdd][响应消息: {}]", response);
+ } else {
+ log.warn("[testTopoAdd][未收到响应]");
+ }
+ }
+ }
+
+ /**
+ * 删除子设备拓扑关系测试
+ */
+ @Test
+ public void testTopoDelete() throws Exception {
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+
+ // 1. 先进行认证
+ IotDeviceMessage authResponse = authenticate(socket);
+ log.info("[testTopoDelete][认证响应: {}]", authResponse);
+
+ // 2.1 构建请求参数
+ IotDeviceTopoDeleteReqDTO params = new IotDeviceTopoDeleteReqDTO();
+ params.setSubDevices(Collections.singletonList(
+ new IotDeviceIdentity(SUB_DEVICE_PRODUCT_KEY, SUB_DEVICE_NAME)));
+ IotDeviceMessage request = IotDeviceMessage.of(
+ IdUtil.fastSimpleUUID(),
+ IotDeviceMessageMethodEnum.TOPO_DELETE.getMethod(),
+ params,
+ null, null, null);
+ // 2.2 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testTopoDelete][Codec: {}, 请求消息: {}]", CODEC.type(), request);
+
+ // 3.1 发送请求
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 3.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testTopoDelete][响应消息: {}]", response);
+ } else {
+ log.warn("[testTopoDelete][未收到响应]");
+ }
+ }
+ }
+
+ /**
+ * 获取子设备拓扑关系测试
+ */
+ @Test
+ public void testTopoGet() throws Exception {
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+
+ // 1. 先进行认证
+ IotDeviceMessage authResponse = authenticate(socket);
+ log.info("[testTopoGet][认证响应: {}]", authResponse);
+
+ // 2.1 构建请求参数
+ IotDeviceTopoGetReqDTO params = new IotDeviceTopoGetReqDTO();
+ IotDeviceMessage request = IotDeviceMessage.of(
+ IdUtil.fastSimpleUUID(),
+ IotDeviceMessageMethodEnum.TOPO_GET.getMethod(),
+ params,
+ null, null, null);
+ // 2.2 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testTopoGet][Codec: {}, 请求消息: {}]", CODEC.type(), request);
+
+ // 3.1 发送请求
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 3.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testTopoGet][响应消息: {}]", response);
+ } else {
+ log.warn("[testTopoGet][未收到响应]");
+ }
+ }
+ }
+
+ // ===================== 子设备注册测试 =====================
+
+ /**
+ * 子设备动态注册测试
+ */
+ @Test
+ public void testSubDeviceRegister() throws Exception {
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+
+ // 1. 先进行认证
+ IotDeviceMessage authResponse = authenticate(socket);
+ log.info("[testSubDeviceRegister][认证响应: {}]", authResponse);
+
+ // 2.1 构建请求参数
+ IotSubDeviceRegisterReqDTO subDevice = new IotSubDeviceRegisterReqDTO();
+ subDevice.setProductKey(SUB_DEVICE_PRODUCT_KEY);
+ subDevice.setDeviceName("mougezishebei");
+ IotDeviceMessage request = IotDeviceMessage.of(
+ IdUtil.fastSimpleUUID(),
+ IotDeviceMessageMethodEnum.SUB_DEVICE_REGISTER.getMethod(),
+ Collections.singletonList(subDevice),
+ null, null, null);
+ // 2.2 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testSubDeviceRegister][Codec: {}, 请求消息: {}]", CODEC.type(), request);
+
+ // 3.1 发送请求
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 3.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testSubDeviceRegister][响应消息: {}]", response);
+ } else {
+ log.warn("[testSubDeviceRegister][未收到响应]");
+ }
+ }
+ }
+
+ // ===================== 批量上报测试 =====================
+
+ /**
+ * 批量上报属性测试(网关 + 子设备)
+ */
+ @Test
+ public void testPropertyPackPost() throws Exception {
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+
+ // 1. 先进行认证
+ IotDeviceMessage authResponse = authenticate(socket);
+ log.info("[testPropertyPackPost][认证响应: {}]", authResponse);
+
+ // 2.1 构建【网关设备】自身属性
+ Map 测试场景:子设备(IotProductDeviceTypeEnum 的 SUB 类型)通过网关设备代理上报数据
+ *
+ * 重要说明:子设备无法直接连接平台,所有请求均由网关设备(Gateway)代为转发。
+ *
+ * 支持两种编解码格式:
+ * 使用步骤:
+ * 注意:TCP 协议是有状态的长连接,认证成功后同一连接上的后续请求无需再携带认证信息
+ *
+ * @author 芋道源码
+ */
+@Slf4j
+public class IotGatewaySubDeviceTcpProtocolIntegrationTest {
+
+ private static final String SERVER_HOST = "127.0.0.1";
+ private static final int SERVER_PORT = 8091;
+ private static final int TIMEOUT_MS = 5000;
+
+ // ===================== 编解码器选择(修改此处切换 JSON / Binary) =====================
+ private static final IotDeviceMessageCodec CODEC = new IotTcpJsonDeviceMessageCodec();
+// private static final IotDeviceMessageCodec CODEC = new IotTcpBinaryDeviceMessageCodec();
+
+ // ===================== 网关子设备信息(根据实际情况修改,从 iot_device 表查询子设备) =====================
+ private static final String PRODUCT_KEY = "jAufEMTF1W6wnPhn";
+ private static final String DEVICE_NAME = "chazuo-it";
+ private static final String DEVICE_SECRET = "d46ef9b28ab14238b9c00a3a668032af";
+
+ // ===================== 认证测试 =====================
+
+ /**
+ * 子设备认证测试
+ */
+ @Test
+ public void testAuth() throws Exception {
+ // 1.1 构建认证消息
+ IotDeviceAuthReqDTO authInfo = IotDeviceAuthUtils.getAuthInfo(PRODUCT_KEY, DEVICE_NAME, DEVICE_SECRET);
+ IotDeviceAuthReqDTO authReqDTO = new IotDeviceAuthReqDTO()
+ .setClientId(authInfo.getClientId())
+ .setUsername(authInfo.getUsername())
+ .setPassword(authInfo.getPassword());
+ IotDeviceMessage request = IotDeviceMessage.of(IdUtil.fastSimpleUUID(), "auth", authReqDTO, null, null, null);
+ // 1.2 编码
+ byte[] payload = CODEC.encode(request);
+ log.info("[testAuth][Codec: {}, 请求消息: {}, 数据包长度: {} 字节]", CODEC.type(), request, payload.length);
+ if (CODEC instanceof IotTcpBinaryDeviceMessageCodec) {
+ log.info("[testAuth][二进制数据包(HEX): {}]", HexUtil.encodeHexStr(payload));
+ }
+
+ // 2.1 发送请求
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+ byte[] responseBytes = sendAndReceive(socket, payload);
+ // 2.2 解码响应
+ if (responseBytes != null) {
+ IotDeviceMessage response = CODEC.decode(responseBytes);
+ log.info("[testAuth][响应消息: {}]", response);
+ } else {
+ log.warn("[testAuth][未收到响应]");
+ }
+ }
+ }
+
+ // ===================== 子设备属性上报测试 =====================
+
+ /**
+ * 子设备属性上报测试
+ */
+ @Test
+ public void testPropertyPost() throws Exception {
+ try (Socket socket = new Socket(SERVER_HOST, SERVER_PORT)) {
+ socket.setSoTimeout(TIMEOUT_MS);
+
+ // 1. 先进行认证
+ IotDeviceMessage authResponse = authenticate(socket);
+ log.info("[testPropertyPost][认证响应: {}]", authResponse);
+
+ // 2.1 构建属性上报消息
+ IotDeviceMessage request = IotDeviceMessage.of(
+ IdUtil.fastSimpleUUID(),
+ IotDeviceMessageMethodEnum.PROPERTY_POST.getMethod(),
+ IotDevicePropertyPostReqDTO.of(MapUtil.
*
@@ -98,6 +100,46 @@ public class IotDirectDeviceTcpProtocolIntegrationTest {
}
}
+ // ===================== 动态注册测试 =====================
+
+ /**
+ * 直连设备动态注册测试(一型一密)
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *