From 1a202e65e61889d39b3516a62b9992ec810afa7e Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Fri, 26 Apr 2024 17:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A12.?=
 =?UTF-8?q?0.2=20=E4=BF=AE=E6=94=B9=E9=87=91=E7=91=9E=E9=93=AD=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8B=E9=97=AE=E9=A2=98=EF=BC=9A=201=E3=80=81Web=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E5=A4=87-=E6=97=A0=E6=B3=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=202=E3=80=81=E5=91=8A=E8=AD=A6=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E8=AE=BE=E7=BD=AE=E6=97=A0=E7=94=9F=E6=95=88=203?=
 =?UTF-8?q?=E3=80=81=E6=A8=A1=E5=9E=8B=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E6=A8=A1=E5=9E=8B=E6=9F=90=E9=A1=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=97=A0=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/HwMonitorPlatformController.java      | 4 ++--
 .../com/ruoyi/business/service/IHwMonitorPlatformService.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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<DeviceDataColumnVo> 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<DeviceDataColumnVo> getDeviceDataColumns(Long deviceModeId, List<Map<String, Object>> latestDataMaps);
+    public List<DeviceDataColumnVo> getDeviceDataColumns(Long deviceModeId);
 }