From 7c32cafd8280a26d37338414b1096ac81e0bb23b Mon Sep 17 00:00:00 2001 From: yu Date: Thu, 19 Dec 2024 15:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=9C=BA=E7=9F=A9=E9=98=B5=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/domain/dto/SysEquipmentDto.java | 5 +++ .../page/controller/HomeController.java | 10 ++++- .../dto/HomeWindTurbineMatrixDataDto.java | 36 +++++++++++++++++ .../vo/HomeWindTurbineMatrixDataVoVo.java | 4 ++ .../das/modules/page/service/HomeService.java | 3 +- .../page/service/impl/HomeServiceImpl.java | 40 ++++--------------- .../resources/mapper/SysEquipmentMapper.xml | 6 +++ 7 files changed, 68 insertions(+), 36 deletions(-) create mode 100644 das/src/main/java/com/das/modules/page/domian/dto/HomeWindTurbineMatrixDataDto.java diff --git a/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java b/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java index 66598d90..89b30c73 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java +++ b/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java @@ -112,4 +112,9 @@ public class SysEquipmentDto implements Serializable { */ private Double nominalCapacity; + /** + * 所属工程 + */ + private String belongProject; + } diff --git a/das/src/main/java/com/das/modules/page/controller/HomeController.java b/das/src/main/java/com/das/modules/page/controller/HomeController.java index ddd7917a..30a52685 100644 --- a/das/src/main/java/com/das/modules/page/controller/HomeController.java +++ b/das/src/main/java/com/das/modules/page/controller/HomeController.java @@ -1,13 +1,16 @@ package com.das.modules.page.controller; +import com.das.common.exceptions.ServiceException; import com.das.common.result.R; import com.das.modules.data.domain.TSValueQueryParam; +import com.das.modules.page.domian.dto.HomeWindTurbineMatrixDataDto; import com.das.modules.page.domian.dto.WindFarmRealDataDto; import com.das.modules.page.domian.vo.HomeWindFarmRealDataVo; import com.das.modules.page.domian.vo.HomeWindTurbineMatrixDataVoVo; import com.das.modules.page.service.HomeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -32,8 +35,11 @@ public class HomeController { * @return 风机矩阵数据 */ @PostMapping("/getWindTurbineMatrixData") - public R> getWindTurbineMatrixData() { - return R.success(homeService.getWindTurbineMatrixData()); + public R> getWindTurbineMatrixData(@RequestBody HomeWindTurbineMatrixDataDto homeWindTurbineMatrixDataDto) { + if (CollectionUtils.isEmpty(homeWindTurbineMatrixDataDto.getAttributesList())){ + throw new ServiceException("属性列表不能为空"); + } + return R.success(homeService.getWindTurbineMatrixData(homeWindTurbineMatrixDataDto)); } diff --git a/das/src/main/java/com/das/modules/page/domian/dto/HomeWindTurbineMatrixDataDto.java b/das/src/main/java/com/das/modules/page/domian/dto/HomeWindTurbineMatrixDataDto.java new file mode 100644 index 00000000..294096d9 --- /dev/null +++ b/das/src/main/java/com/das/modules/page/domian/dto/HomeWindTurbineMatrixDataDto.java @@ -0,0 +1,36 @@ +package com.das.modules.page.domian.dto; + +import lombok.Data; + +import java.util.List; + +/** + * 首页风机矩阵 + */ +@Data +public class HomeWindTurbineMatrixDataDto { + + /** + * 设备类型编码 + */ + private Integer objectType; + + /** + * 所属工程 + */ + private String belongProject; + + /** + * 制造商 + */ + private String madeinFactory; + + /** + * 物理模型属性 + */ + private List attributesList; + + + + +} diff --git a/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java b/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java index f4e50de1..916179f2 100644 --- a/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java +++ b/das/src/main/java/com/das/modules/page/domian/vo/HomeWindTurbineMatrixDataVoVo.java @@ -35,6 +35,10 @@ public class HomeWindTurbineMatrixDataVoVo { private Double nominalCapacity; private String deviceCode; + /** + * 制造商 + */ + private String madeinFactory; private Map attributeMap; 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 b7c86286..5f25e0fa 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 @@ -1,6 +1,7 @@ package com.das.modules.page.service; import com.das.modules.data.domain.TSValueQueryParam; +import com.das.modules.page.domian.dto.HomeWindTurbineMatrixDataDto; import com.das.modules.page.domian.dto.WindFarmRealDataDto; import com.das.modules.page.domian.vo.HomeWindFarmRealDataVo; import com.das.modules.page.domian.vo.HomeWindTurbineMatrixDataVoVo; @@ -13,7 +14,7 @@ public interface HomeService { * 接口1： 首页风机矩阵数据 * @return 风机矩阵数据 */ - List getWindTurbineMatrixData(); + List getWindTurbineMatrixData(HomeWindTurbineMatrixDataDto homeWindTurbineMatrixDataDto); 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 37066df9..a362717a 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 @@ -2,6 +2,7 @@ package com.das.modules.page.service.impl; import com.das.common.constant.EquipmentTypeIds; +import com.das.common.utils.BeanCopyUtils; import com.das.common.utils.JsonUtils; import com.das.modules.data.domain.SnapshotValueQueryParam; import com.das.modules.data.domain.TSValueQueryParam; @@ -9,6 +10,7 @@ import com.das.modules.data.service.impl.DataServiceImpl; import com.das.modules.equipment.domain.dto.SysEquipmentDto; import com.das.modules.equipment.domain.vo.SysEquipmentVo; import com.das.modules.equipment.mapper.SysEquipmentMapper; +import com.das.modules.page.domian.dto.HomeWindTurbineMatrixDataDto; import com.das.modules.page.domian.dto.WindFarmRealDataDto; import com.das.modules.page.domian.vo.HomeWindFarmRealDataVo; import com.das.modules.page.domian.vo.HomeWindTurbineMatrixDataVoVo; @@ -42,45 +44,16 @@ public class HomeServiceImpl implements HomeService { * @return 风机矩阵数据 */ @Override - public List getWindTurbineMatrixData() { + public List getWindTurbineMatrixData(HomeWindTurbineMatrixDataDto homeWindTurbineMatrixDataDto ) { SysEquipmentDto sysEquipmentDto = new SysEquipmentDto(); - sysEquipmentDto.setObjectType(EquipmentTypeIds.EQUIPMENT_TYPE_STATION_WTG); + BeanCopyUtils.copy(homeWindTurbineMatrixDataDto ,sysEquipmentDto ); //获取所有风机设备 List sysEquipmentVos = sysEquipmentMapper.queryEquipmentListInPage(sysEquipmentDto); //风机返回数据列表 List homeWindRealTimeVoList = new ArrayList<>(); List paramList = new ArrayList<>(); - //构建需要查询的物模型属 性 - List attributesList = new ArrayList<>(); - //风速 - attributesList.add("iwindspeed"); - //风机状态判断条件所需的字段iturbineoperationmode、iYPLevel、GridLostDetected（可能会调整） - //风机状态 - attributesList.add("iturbineoperationmode"); - //偏航运行模式 - attributesList.add("iyplevel"); - //风机电网掉电 - attributesList.add("gridlostdetected"); - //刹车等级 - attributesList.add("ibplevel"); - //有功功率(MW) - attributesList.add("igenpower"); - //日发电量(kwh) - attributesList.add("ikwhthisday"); - //是否锁定 - attributesList.add("Locked"); - attributesList.add("ProcessedOperationMode"); - //叶轮转速 - attributesList.add("iRotorSpeed"); - attributesList.add("ActiveStatusCode01"); - attributesList.add("ActiveStatusCode02"); - attributesList.add("ActiveStatusCode03"); - attributesList.add("ActiveStatusCode04"); - attributesList.add("ActiveStatusCode05"); - attributesList.add("ActiveStatusCode06"); - attributesList.add("ActiveStatusCode07"); - attributesList.add("ActiveStatusCode08"); - attributesList.add("FirstTriggeredCode"); + //构建需要查询的物模型属性 + List attributesList = homeWindTurbineMatrixDataDto.getAttributesList(); for (SysEquipmentVo item : sysEquipmentVos) { //构建查询属性参数 SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam(); @@ -97,6 +70,7 @@ public class HomeServiceImpl implements HomeService { homeWindRealTimeVoResult.setBelongLine(item.getBelongLine()); homeWindRealTimeVoResult.setStandard(item.getStandard()); homeWindRealTimeVoResult.setNominalCapacity(item.getNominalCapacity()); + homeWindRealTimeVoResult.setMadeinFactory(item.getMadeinFactory()); homeWindRealTimeVoList.add(homeWindRealTimeVoResult); } //获取设备测点数据 diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml index 2f2488ed..521631b3 100644 --- a/das/src/main/resources/mapper/SysEquipmentMapper.xml +++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml @@ -85,6 +85,12 @@ and t.object_type = #{info.objectType} + + and t.belong_project = #{info.belongProject} + + + and t.madein_factory = #{info.madeinFactory} + order by t.name