【同步】BOOT 和 CLOUD 的功能

This commit is contained in:
YunaiV
2026-01-29 22:29:41 +08:00
parent 2a48bcbee9
commit 8fd3173670
6 changed files with 12 additions and 8 deletions

View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.gateway.protocol.coap; package cn.iocoder.yudao.module.iot.gateway.protocol.coap;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
@@ -27,7 +28,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@@ -344,7 +344,7 @@ public class IotGatewayDeviceCoapProtocolIntegrationTest {
IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO(); IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO();
params.setProperties(gatewayProperties); params.setProperties(gatewayProperties);
params.setEvents(gatewayEvents); params.setEvents(gatewayEvents);
params.setSubDevices(List.of(subDeviceData)); params.setSubDevices(ListUtil.of(subDeviceData));
String payload = JsonUtils.toJsonString(MapUtil.builder() String payload = JsonUtils.toJsonString(MapUtil.builder()
.put("id", IdUtil.fastSimpleUUID()) .put("id", IdUtil.fastSimpleUUID())
.put("method", IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod()) .put("method", IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod())

View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.gateway.protocol.http; package cn.iocoder.yudao.module.iot.gateway.protocol.http;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpResponse;
@@ -288,7 +289,7 @@ public class IotGatewayDeviceHttpProtocolIntegrationTest {
IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO(); IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO();
params.setProperties(gatewayProperties); params.setProperties(gatewayProperties);
params.setEvents(gatewayEvents); params.setEvents(gatewayEvents);
params.setSubDevices(List.of(subDeviceData)); params.setSubDevices(ListUtil.of(subDeviceData));
String payload = JsonUtils.toJsonString(MapUtil.builder() String payload = JsonUtils.toJsonString(MapUtil.builder()
.put("id", IdUtil.fastSimpleUUID()) .put("id", IdUtil.fastSimpleUUID())
.put("method", IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod()) .put("method", IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod())

View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.gateway.protocol.mqtt; package cn.iocoder.yudao.module.iot.gateway.protocol.mqtt;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
@@ -350,7 +351,7 @@ public class IotGatewayDeviceMqttProtocolIntegrationTest {
IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO(); IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO();
params.setProperties(gatewayProperties); params.setProperties(gatewayProperties);
params.setEvents(gatewayEvents); params.setEvents(gatewayEvents);
params.setSubDevices(List.of(subDeviceData)); params.setSubDevices(ListUtil.of(subDeviceData));
IotDeviceMessage request = IotDeviceMessage.of( IotDeviceMessage request = IotDeviceMessage.of(
IdUtil.fastSimpleUUID(), IdUtil.fastSimpleUUID(),
IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(), IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(),

View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.gateway.protocol.tcp; package cn.iocoder.yudao.module.iot.gateway.protocol.tcp;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
@@ -316,7 +317,7 @@ public class IotGatewayDeviceTcpProtocolIntegrationTest {
IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO(); IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO();
params.setProperties(gatewayProperties); params.setProperties(gatewayProperties);
params.setEvents(gatewayEvents); params.setEvents(gatewayEvents);
params.setSubDevices(List.of(subDeviceData)); params.setSubDevices(ListUtil.of(subDeviceData));
IotDeviceMessage request = IotDeviceMessage.of( IotDeviceMessage request = IotDeviceMessage.of(
IdUtil.fastSimpleUUID(), IdUtil.fastSimpleUUID(),
IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(), IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(),

View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.gateway.protocol.udp; package cn.iocoder.yudao.module.iot.gateway.protocol.udp;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO; import cn.iocoder.yudao.module.iot.core.biz.dto.IotDeviceAuthReqDTO;
@@ -305,7 +306,7 @@ public class IotGatewayDeviceUdpProtocolIntegrationTest {
IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO(); IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO();
params.setProperties(gatewayProperties); params.setProperties(gatewayProperties);
params.setEvents(gatewayEvents); params.setEvents(gatewayEvents);
params.setSubDevices(List.of(subDeviceData)); params.setSubDevices(ListUtil.of(subDeviceData));
IotDeviceMessage request = IotDeviceMessage.of( IotDeviceMessage request = IotDeviceMessage.of(
IdUtil.fastSimpleUUID(), IdUtil.fastSimpleUUID(),
IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(), IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(),

View File

@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.gateway.protocol.websocket; package cn.iocoder.yudao.module.iot.gateway.protocol.websocket;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@@ -26,7 +27,6 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -352,7 +352,7 @@ public class IotGatewayDeviceWebSocketProtocolIntegrationTest {
IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO(); IotDevicePropertyPackPostReqDTO params = new IotDevicePropertyPackPostReqDTO();
params.setProperties(gatewayProperties); params.setProperties(gatewayProperties);
params.setEvents(gatewayEvents); params.setEvents(gatewayEvents);
params.setSubDevices(List.of(subDeviceData)); params.setSubDevices(ListUtil.of(subDeviceData));
IotDeviceMessage request = IotDeviceMessage.of( IotDeviceMessage request = IotDeviceMessage.of(
IdUtil.fastSimpleUUID(), IdUtil.fastSimpleUUID(),
IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(), IotDeviceMessageMethodEnum.PROPERTY_PACK_POST.getMethod(),