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 b8b738d5..0be3e520 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,7 +16,7 @@ import java.util.List; @NoArgsConstructor public class DeviceMonitorDataRespVO { - private String deviceType; + private String typeCode; 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 cd3b0cb9..898ec48e 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(deviceType,typeNameMap.get(deviceType), rows)); + res.add(new DeviceMonitorDataRespVO(typeCode,typeNameMap.get(deviceType), rows)); } return res;