diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
index 6300947e..70f06a89 100644
--- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
+++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
@@ -161,8 +161,6 @@ public class SysEnumServiceImpl implements SysEnumService {
         PageQuery pageQuery = new PageQuery();
         pageQuery.setPageNum(sysEnumValuesDto.getPageNum());
         pageQuery.setPageSize(sysEnumValuesDto.getPageSize());
-        //只返回有效的数据
-        sysEnumValuesDto.setIsActive(1);
         IPage<SysEnumValuesVo> iPage =
                 sysEnumValuesMapper.queryEnumValuesList(pageQuery.build(), sysEnumValuesDto);
         return PageDataInfo.build(iPage.getRecords(), iPage.getTotal());
diff --git a/das/src/main/java/com/das/modules/page/domian/dto/WindFarmRealDataDto.java b/das/src/main/java/com/das/modules/page/domian/dto/WindFarmRealDataDto.java
index 638620c0..58f6cd18 100644
--- a/das/src/main/java/com/das/modules/page/domian/dto/WindFarmRealDataDto.java
+++ b/das/src/main/java/com/das/modules/page/domian/dto/WindFarmRealDataDto.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class WindFarmRealDataDto implements Serializable {
@@ -21,4 +22,9 @@ public class WindFarmRealDataDto implements Serializable {
      * 风场名称
      */
     private String WindFarmName;
+
+    /**
+     * 物模型属性
+     */
+    private List<String> attributesList;
 }
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 d07a8391..020d04b9 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
@@ -122,24 +122,8 @@ public class HomeServiceImpl implements HomeService {
             windFarmId = defaultWindFarmId;
         }
         List<SnapshotValueQueryParam> paramList = new ArrayList<>();
-        //构建需要查询的物模型属                                                                                                                                                                                                                性
-        List<String> attributesList = new ArrayList<>();
-        //功率
-        attributesList.add("windfarmactivepower");
-        //平均风速
-        attributesList.add("windfarmavgwindspeed");
-        //日利用小时
-        attributesList.add("windfarmdayoperationhours");
-        //月利用小时
-        attributesList.add("windfarmmonthoperationhours");
-        //日发电量
-        attributesList.add("windfarmdayprodenergy");
-        //月发电量
-        attributesList.add("windfarmmonthprodenergy");
-        //年发电量
-        attributesList.add("windfarmyearprodenergy");
-        //总发电量
-        attributesList.add("windfarmtotalprodenergy");
+        //构建需要查询的物模型属
+        List<String> attributesList = windFarmRealDataDto.getAttributesList();
         //构建查询属性参数
         SnapshotValueQueryParam snapshotValueQueryParam = new SnapshotValueQueryParam();
         snapshotValueQueryParam.setAttributes(attributesList);
diff --git a/das/src/main/resources/mapper/SysEnumValuesMapper.xml b/das/src/main/resources/mapper/SysEnumValuesMapper.xml
index e950eda3..99a540ad 100644
--- a/das/src/main/resources/mapper/SysEnumValuesMapper.xml
+++ b/das/src/main/resources/mapper/SysEnumValuesMapper.xml
@@ -20,7 +20,7 @@
             <if test="sysEnumValuesDto.enumTypeId != null and sysEnumValuesDto.enumTypeId != ''">
                 and e.enum_type_id =#{sysEnumValuesDto.enumTypeId}
             </if>
-            <if test="sysEnumValuesDto.isActive != null and sysEnumValuesDto.isActive != ''">
+            <if test="sysEnumValuesDto.isActive != null ">
                 and e.is_active =#{sysEnumValuesDto.isActive}
             </if>
             order by e.order_number asc