From a9b833cc64ae9c51c5a2a9380fe93bfd57559bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Fri, 24 Oct 2025 18:45:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=20(farm):=20=E8=AE=BE=E5=A4=87=E4=B8=AD?= =?UTF-8?q?=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 设备监控 --- .../admin/digitalcockpit/vo/DeviceMonitorDataRespVO.java | 1 + .../module/farm/service/deviceinfo/DeviceInfoServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/DeviceMonitorDataRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/DeviceMonitorDataRespVO.java index 704ee26d..b8b738d5 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/DeviceMonitorDataRespVO.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/digitalcockpit/vo/DeviceMonitorDataRespVO.java @@ -16,6 +16,7 @@ import java.util.List; @NoArgsConstructor public class DeviceMonitorDataRespVO { + private String deviceType; private String deviceTypeName; private List rows; diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java index 14b41dfe..cd3b0cb9 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java @@ -454,7 +454,7 @@ public class DeviceInfoServiceImpl implements DeviceInfoService { String typeCode = typeCodeMap.getOrDefault(deviceType, "其他"); List rows = this.getRealTimeList(typeCode, list,tenantId); - res.add(new DeviceMonitorDataRespVO(typeNameMap.get(deviceType), rows)); + res.add(new DeviceMonitorDataRespVO(deviceType,typeNameMap.get(deviceType), rows)); } return res;