diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/manager/IotMqttConnectionManager.java b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/manager/IotMqttConnectionManager.java index 3fd1a3a041..d7c4adbd00 100644 --- a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/manager/IotMqttConnectionManager.java +++ b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/manager/IotMqttConnectionManager.java @@ -125,7 +125,7 @@ public class IotMqttConnectionManager { */ public IotMqttConnectionManager.ConnectionInfo getConnectionInfoByDeviceId(Long deviceId) { // 通过设备 ID 获取连接端点 - var endpoint = getDeviceEndpoint(deviceId); + MqttEndpoint endpoint = getDeviceEndpoint(deviceId); if (endpoint == null) { return null; } diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/IotDeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/IotDeviceServiceImpl.java index 0ad51f4035..1c580b91ba 100644 --- a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/IotDeviceServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/IotDeviceServiceImpl.java @@ -32,7 +32,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { */ private final LoadingCache deviceCaches = buildAsyncReloadingCache( CACHE_EXPIRE, - new CacheLoader<>() { + new CacheLoader() { @Override public IotDeviceRespDTO load(Long id) { @@ -51,7 +51,7 @@ public class IotDeviceServiceImpl implements IotDeviceService { */ private final LoadingCache, IotDeviceRespDTO> deviceCaches2 = buildAsyncReloadingCache( CACHE_EXPIRE, - new CacheLoader<>() { + new CacheLoader, IotDeviceRespDTO>() { @Override public IotDeviceRespDTO load(KeyValue kv) { diff --git a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java index 58e42f93e4..bfdc2020c3 100644 --- a/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java +++ b/yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/service/device/remote/IotDeviceApiImpl.java @@ -40,19 +40,19 @@ public class IotDeviceApiImpl implements IotDeviceCommonApi { IotGatewayProperties.RpcProperties rpc = gatewayProperties.getRpc(); restTemplate = new RestTemplateBuilder() .rootUri(rpc.getUrl() + "/rpc-api/iot/device") - .readTimeout(rpc.getReadTimeout()) - .connectTimeout(rpc.getConnectTimeout()) + .setConnectTimeout(rpc.getReadTimeout()) + .setReadTimeout(rpc.getConnectTimeout()) .build(); } @Override public CommonResult authDevice(IotDeviceAuthReqDTO authReqDTO) { - return doPost("/auth", authReqDTO, new ParameterizedTypeReference<>() { }); + return doPost("/auth", authReqDTO, new ParameterizedTypeReference>() { }); } @Override public CommonResult getDevice(IotDeviceGetReqDTO getReqDTO) { - return doPost("/get", getReqDTO, new ParameterizedTypeReference<>() { }); + return doPost("/get", getReqDTO, new ParameterizedTypeReference>() { }); } private CommonResult doPost(String url, T body,