diff --git a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java index 1c7f3ce9..2f5372b4 100644 --- a/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java +++ b/das/src/main/java/com/das/modules/equipment/mapper/SysEquipmentMapper.java @@ -43,7 +43,7 @@ public interface SysEquipmentMapper extends BaseMapperPlus queryBelongLines(@Param("objectType") Long objectType); + List queryBelongLines(@Param("objectType") Integer objectType); List queryEquipmentListInPage(@Param("info") SysEquipmentDto sysEquipmentDto); diff --git a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java index aa457b2e..c5c4d4ff 100644 --- a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java +++ b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java @@ -1,5 +1,6 @@ package com.das.modules.page.service; +import com.das.common.constant.EquipmentTypeIds; import com.das.common.exceptions.ServiceException; import com.das.modules.data.domain.SnapshotValueQueryParam; import com.das.modules.data.service.DataService; @@ -24,7 +25,6 @@ import java.util.concurrent.TimeUnit; @Service @Slf4j public class WindTurbinesPageService { - private static final Integer OBJECT_TYPE = 10002; @Autowired SysEquipmentMapper sysEquipmentMapper; @@ -41,7 +41,7 @@ public class WindTurbinesPageService { * @return 返回字符串数组 */ public List queryBelongLines() { - return sysEquipmentMapper.queryBelongLines(Long.valueOf(OBJECT_TYPE)); + return sysEquipmentMapper.queryBelongLines(EquipmentTypeIds.EQUIPMENT_TYPE_STATION_WTG); } @@ -54,7 +54,7 @@ public class WindTurbinesPageService { StopWatch stopWatch = new StopWatch(); stopWatch.start("获取风机页面数据"); SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); - sysEquipmentDto.setObjectType(OBJECT_TYPE); + sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_STATION_WTG); List sysEquipmentVos = sysEquipmentMapper.queryEquipmentListInPage(sysEquipmentDto); //风机返回数据列表 List windTurbinesPageVos = new ArrayList<>();