From b4da600953fca5f4a786cccb5f60a7efd4b6310f Mon Sep 17 00:00:00 2001 From: houwei Date: Wed, 30 Oct 2024 13:09:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E9=87=87?= =?UTF-8?q?=E7=94=A8=E7=BB=9F=E4=B8=80=E5=AE=9A=E4=B9=89=E7=9A=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8BID=E6=9E=9A=E4=B8=BE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../das/modules/equipment/mapper/SysEquipmentMapper.java | 2 +- .../das/modules/page/service/WindTurbinesPageService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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<>();