大屏,查询设备信息
This commit is contained in:
@@ -61,7 +61,7 @@ public class JobStatisticsController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/device/info")
|
@GetMapping("/device/info")
|
||||||
public AjaxResult getDeviceInfo() {
|
public Object getDeviceInfo() {
|
||||||
// 获取设备信息
|
// 获取设备信息
|
||||||
return jobStatisticsService.getDeviceInfo();
|
return jobStatisticsService.getDeviceInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,5 +18,5 @@ public interface IJobStatisticsService {
|
|||||||
*/
|
*/
|
||||||
public Map<String, Object> getDailyStatistics();
|
public Map<String, Object> getDailyStatistics();
|
||||||
|
|
||||||
AjaxResult getDeviceInfo();
|
Object getDeviceInfo();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -95,10 +95,10 @@ public class JobStatisticsServiceImpl implements IJobStatisticsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult getDeviceInfo() {
|
public Object getDeviceInfo() {
|
||||||
|
|
||||||
String s = HttpUtil.get(deviceUrl);
|
//String s = HttpUtil.get(deviceUrl);
|
||||||
return JSONUtil.toBean(s, AjaxResult.class);
|
return HttpUtil.get(deviceUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -131,4 +131,4 @@ xss:
|
|||||||
api:
|
api:
|
||||||
wcs:
|
wcs:
|
||||||
device:
|
device:
|
||||||
url: http://192.168.1.1:8080/api/device
|
url: http://127.0.0.1:8081/device/api/devicecar/list
|
||||||
|
|||||||
Reference in New Issue
Block a user