diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java index 2182993..78e4476 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwMonitorPlatformController.java @@ -102,7 +102,7 @@ public class HwMonitorPlatformController extends BaseController { @RequiresPermissions("business:monitor:index") @GetMapping("/getDeviceOperations/{sceneId}") public AjaxResult selectDeviceStatus(@PathVariable("sceneId") Long sceneId) { - System.out.println(("sceneid:" + sceneId)); +// System.out.println(("sceneid:" + sceneId)); return AjaxResult.success(hwDeviceService.getOnlineDevicesCount(sceneId)); } @@ -280,7 +280,7 @@ public class HwMonitorPlatformController extends BaseController { TdReturnDataVo returnDataVo = hwMonitorPlatformService.getHistoryData(deviceHistoryData); if (returnDataVo != null) { List deviceDataColumnVos = hwMonitorPlatformService. - getDeviceDataColumns(deviceHistoryData.getDeviceModeId(), returnDataVo.getDataList()); + getDeviceDataColumns(deviceHistoryData.getDeviceModeId()); returnObj.put("deviceDataColumns", deviceDataColumnVos); returnObj.put("historyData", returnDataVo); } diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorPlatformService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorPlatformService.java index ad618f0..7fa1e55 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorPlatformService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwMonitorPlatformService.java @@ -44,5 +44,5 @@ public interface IHwMonitorPlatformService { * @author xins * @date 2023-09-25 15:40 */ - public List getDeviceDataColumns(Long deviceModeId, List> latestDataMaps); + public List getDeviceDataColumns(Long deviceModeId); }