sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

查询枚举值列表修改;

Browse Source 
首页-获取风电场的实时数据修改;
This commit is contained in:
yu 2024-11-22 14:37:37 +08:00
parent e61c278b65
commit 6b412f3b06
4 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
View File

@ -161,8 +161,6 @@ public class SysEnumServiceImpl implements SysEnumService {
PageQuery pageQuery = new PageQuery(); PageQuery pageQuery = new PageQuery();
pageQuery.setPageNum(sysEnumValuesDto.getPageNum()); pageQuery.setPageNum(sysEnumValuesDto.getPageNum());
pageQuery.setPageSize(sysEnumValuesDto.getPageSize()); pageQuery.setPageSize(sysEnumValuesDto.getPageSize());
//只返回有效的数据
sysEnumValuesDto.setIsActive(1);
IPage<SysEnumValuesVo> iPage = IPage<SysEnumValuesVo> iPage =
sysEnumValuesMapper.queryEnumValuesList(pageQuery.build(), sysEnumValuesDto); sysEnumValuesMapper.queryEnumValuesList(pageQuery.build(), sysEnumValuesDto);
return PageDataInfo.build(iPage.getRecords(), iPage.getTotal()); return PageDataInfo.build(iPage.getRecords(), iPage.getTotal());

6
das/src/main/java/com/das/modules/page/domian/dto/WindFarmRealDataDto.java
View File

@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
@Data @Data
public class WindFarmRealDataDto implements Serializable { public class WindFarmRealDataDto implements Serializable {
@ -21,4 +22,9 @@ public class WindFarmRealDataDto implements Serializable {
* 风场名称 * 风场名称
*/ */
private String WindFarmName; private String WindFarmName;
/**
* 物模型属性
*/
private List<String> attributesList;
} }

20
das/src/main/java/com/das/modules/page/service/impl/HomeServiceImpl.java
View File

@ -122,24 +122,8 @@ public class HomeServiceImpl implements HomeService {
windFarmId = defaultWindFarmId; windFarmId = defaultWindFarmId;
} }
List<SnapshotValueQueryParam> paramList = new ArrayList<>(); List<SnapshotValueQueryParam> paramList = new ArrayList<>();
//构建需要查询的物模型属 性 //构建需要查询的物模型属
List<String> attributesList = new ArrayList<>(); List<String> attributesList = windFarmRealDataDto.getAttributesList();
//功率
attributesList.add("windfarmactivepower");
//平均风速
attributesList.add("windfarmavgwindspeed");
//日利用小时
attributesList.add("windfarmdayoperationhours");
//月利用小时
attributesList.add("windfarmmonthoperationhours");
//日发电量
attributesList.add("windfarmdayprodenergy");
//月发电量
attributesList.add("windfarmmonthprodenergy");
//年发电量
attributesList.add("windfarmyearprodenergy");
//总发电量
attributesList.add("windfarmtotalprodenergy");
//构建查询属性参数 //构建查询属性参数
SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam(); SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam();
snapshotValueQueryParam.setAttributes(attributesList); snapshotValueQueryParam.setAttributes(attributesList);

2
das/src/main/resources/mapper/SysEnumValuesMapper.xml
View File

@ -20,7 +20,7 @@
<if test="sysEnumValuesDto.enumTypeId != null and sysEnumValuesDto.enumTypeId != ''"> <if test="sysEnumValuesDto.enumTypeId != null and sysEnumValuesDto.enumTypeId != ''">
and e.enum_type_id =#{sysEnumValuesDto.enumTypeId} and e.enum_type_id =#{sysEnumValuesDto.enumTypeId}
</if> </if>
<if test="sysEnumValuesDto.isActive != null and sysEnumValuesDto.isActive != ''"> <if test="sysEnumValuesDto.isActive != null ">
and e.is_active =#{sysEnumValuesDto.isActive} and e.is_active =#{sysEnumValuesDto.isActive}
</if> </if>
order by e.order_number asc order by e.order_number asc