From b1368e15d9c5268230df2b48f1c80448e2b21a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?=
 <9290821+guowen-the-cat@user.noreply.gitee.com>
Date: Thu, 12 Jun 2025 15:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F,=E6=9F=A5=E8=AF=A2=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/api/controller/JobStatisticsController.java   | 2 +-
 .../java/com/ruoyi/api/service/IJobStatisticsService.java   | 2 +-
 .../ruoyi/api/service/impl/JobStatisticsServiceImpl.java    | 6 +++---
 ruoyi-admin/src/main/resources/application.yml              | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java
index 9bef28e..5286655 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/JobStatisticsController.java
@@ -61,7 +61,7 @@ public class JobStatisticsController {
     }
 
     @GetMapping("/device/info")
-    public AjaxResult getDeviceInfo() {
+    public Object getDeviceInfo() {
         // 获取设备信息
         return jobStatisticsService.getDeviceInfo();
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java
index bab02a1..54485ae 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IJobStatisticsService.java
@@ -18,5 +18,5 @@ public interface IJobStatisticsService {
      */
     public Map<String, Object> getDailyStatistics();
 
-    AjaxResult getDeviceInfo();
+    Object getDeviceInfo();
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java
index b6eec8f..6ba27e2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/JobStatisticsServiceImpl.java
@@ -95,10 +95,10 @@ public class JobStatisticsServiceImpl implements IJobStatisticsService {
     }
 
     @Override
-    public AjaxResult getDeviceInfo() {
+    public Object getDeviceInfo() {
 
-        String s = HttpUtil.get(deviceUrl);
-        return JSONUtil.toBean(s, AjaxResult.class);
+        //String s = HttpUtil.get(deviceUrl);
+        return HttpUtil.get(deviceUrl);
     }
 
 
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d33e581..5ce11cc 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -131,4 +131,4 @@ xss:
 api:
   wcs:
     device:
-      url: http://192.168.1.1:8080/api/device
+      url: http://127.0.0.1:8081/device/api/devicecar/list