diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteDeviceService.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteDeviceService.java index 8b59b30..1f76007 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteDeviceService.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/RemoteDeviceService.java @@ -3,15 +3,13 @@ package com.ruoyi.device.api; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; -import com.ruoyi.device.api.domain.DeviceTemp; +import com.ruoyi.device.api.domain.DeviceTempVO; import com.ruoyi.device.api.factory.RemoteDeviceFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestHeader; -import java.util.List; - /** * 设备服务 * @@ -29,5 +27,5 @@ public interface RemoteDeviceService * @return 结果 */ @GetMapping("/device/temp/{id}") - R getDeviceById(@PathVariable("id") String id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + R getDeviceById(@PathVariable("id") String id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } \ No newline at end of file diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DeviceTemp.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DeviceTempVO.java similarity index 92% rename from ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DeviceTemp.java rename to ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DeviceTempVO.java index 675e9ea..bd1b1f4 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DeviceTemp.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DeviceTempVO.java @@ -8,7 +8,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author ruoyi * @date 2026-01-15 */ -public class DeviceTemp extends BaseEntity +public class DeviceTempVO extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteDeviceFallbackFactory.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteDeviceFallbackFactory.java index 360ff38..fec02e8 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteDeviceFallbackFactory.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/factory/RemoteDeviceFallbackFactory.java @@ -2,7 +2,7 @@ package com.ruoyi.device.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.device.api.RemoteDeviceService; -import com.ruoyi.device.api.domain.DeviceTemp; +import com.ruoyi.device.api.domain.DeviceTempVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -26,7 +26,7 @@ public class RemoteDeviceFallbackFactory implements FallbackFactory getDeviceById(String id, String source) + public R getDeviceById(String id, String source) { return R.fail("获取设备信息失败:" + throwable.getMessage()); }