diff --git a/das/src/main/java/com/das/modules/page/service/HomeService.java b/das/src/main/java/com/das/modules/page/service/HomeService.java index bdd08fab..edc4f201 100644 --- a/das/src/main/java/com/das/modules/page/service/HomeService.java +++ b/das/src/main/java/com/das/modules/page/service/HomeService.java @@ -5,7 +5,20 @@ import com.das.modules.page.domian.HomeWindRealTimeVo; import java.util.List; public interface HomeService { - + /** + * 接口1: 首页风机矩阵数据 + * @return 风机矩阵数据 + */ List queryWindRealTimeData(); + //TODO: 接口2: 获取风电场的实时数据 getWindFarmRealData(Long windFarmId) + // 包含: + // 页面左上角【风场概况】 功率(WindFarmActivePower) 平均风速(WindFarmAvgWindSpeed) 日利用小时(WindFarmDayOperationHours) 月利用小时(WIndFarmMonthOperationHours) + // 页面右上角【发电量概况】日发电量(WindFarmDayProdEnergy) 月发电量(WIndFarmMonthProdEnergy) 年发电量(WindFarmYearProdEnergy) 总发电量(WindFarmTotalProdEnergy) + //TODO: 传入参数windFarmId 为 风电场ID,如果参数为空,则查询数据库中风电场设备,取第一个风电场 + + + + + } diff --git a/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java index 51f737bb..1d275d16 100644 --- a/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java +++ b/das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java @@ -1,6 +1,7 @@ package com.das.modules.page.service.impl; +import com.das.common.constant.EquipmentTypeIds; import com.das.modules.data.domain.SnapshotValueQueryParam; import com.das.modules.data.service.DataService; import com.das.modules.equipment.domain.dto.SysEquipmentDto; @@ -18,8 +19,6 @@ import java.util.Map; @Service public class HomeServiceImpl implements HomeService { - private static final Integer OBJECT_TYPE = 10002; - @Autowired SysEquipmentMapper sysEquipmentMapper; @@ -35,7 +34,7 @@ public class HomeServiceImpl implements HomeService { @Override public List queryWindRealTimeData() { SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); - sysEquipmentDto.setObjectType(OBJECT_TYPE); + sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_STATION_WTG); //获取所有风机设备 List sysEquipmentVos = sysEquipmentMapper.querySysEquipmentList(sysEquipmentDto); //风机返回数据列表