大屏,查询设备信息

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();
     }

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();
 }

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);
     }
 
 

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