From 5573ce20db11f8da8571f4aa1526d0d2265b7e86 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 20 Sep 2025 12:17:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E3=80=90iot=20=E7=89=A9=E8=81=94?=
 =?UTF-8?q?=E7=BD=91=E3=80=91=E5=A2=9E=E5=BC=BA=20jdk8=20=E7=9A=84?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../protocol/mqtt/manager/IotMqttConnectionManager.java   | 2 +-
 .../iot/gateway/service/device/IotDeviceServiceImpl.java  | 4 ++--
 .../gateway/service/device/remote/IotDeviceApiImpl.java   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

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<Long, IotDeviceRespDTO> deviceCaches = buildAsyncReloadingCache(
             CACHE_EXPIRE,
-            new CacheLoader<>() {
+            new CacheLoader<Long, IotDeviceRespDTO>() {
 
                 @Override
                 public IotDeviceRespDTO load(Long id) {
@@ -51,7 +51,7 @@ public class IotDeviceServiceImpl implements IotDeviceService {
      */
     private final LoadingCache<KeyValue<String, String>, IotDeviceRespDTO> deviceCaches2 = buildAsyncReloadingCache(
             CACHE_EXPIRE,
-            new CacheLoader<>() {
+            new CacheLoader<KeyValue<String, String>, IotDeviceRespDTO>() {
 
                 @Override
                 public IotDeviceRespDTO load(KeyValue<String, String> 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<Boolean> authDevice(IotDeviceAuthReqDTO authReqDTO) {
-        return doPost("/auth", authReqDTO, new ParameterizedTypeReference<>() { });
+        return doPost("/auth", authReqDTO, new ParameterizedTypeReference<CommonResult<Boolean>>() { });
     }
 
     @Override
     public CommonResult<IotDeviceRespDTO> getDevice(IotDeviceGetReqDTO getReqDTO) {
-        return doPost("/get", getReqDTO, new ParameterizedTypeReference<>() { });
+        return doPost("/get", getReqDTO, new ParameterizedTypeReference<CommonResult<IotDeviceRespDTO>>() { });
     }
 
     private <T, R> CommonResult<R> doPost(String url, T body,