hxf hace 2 años
padre
commit
b9cccdca77

+ 2 - 0
neim-biz/src/main/java/com/jiayue/biz/dto/EquipmentDto.java

@@ -6,4 +6,6 @@ import lombok.Data;
 public class EquipmentDto {
     private String label;
     private String value;
+    // 风向层高
+    private String wdHeight;
 }

+ 7 - 5
neim-biz/src/main/java/com/jiayue/biz/service/impl/HomePageServiceImpl.java

@@ -541,7 +541,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
     }
 
     /**
-     * 首页空气密度、温度、压强平均值 湍流 风切变
+     * 首页空气密度、温度、压强平均值 湍流 风切变 满发小时数 日发电量 经纬度 数据起止时间
      *
      * @param equipmentId 场站编号
      * @return Map<String, BigDecimal>
@@ -751,7 +751,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                     map.put("longitude", equipment.getLongitude());
                     map.put("latitude", equipment.getLatitude());
                     map.put("towerName", equipment.getName());
-                    map.put("towerId", equipment.getId());
+                    map.put("towerNo", equipment.getEquipmentNo());
                     map.put("projectName", projectInfo.getProjectBasicInfo().getProjectNameEasy());
                     map.put("projectId", projectInfo.getId());
                     towerList.add(map);
@@ -775,7 +775,7 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                     map.put("longitude", equipment.getLongitude());
                     map.put("latitude", equipment.getLatitude());
                     map.put("towerName", equipment.getName());
-                    map.put("towerId", equipment.getId());
+                    map.put("towerNo", equipment.getEquipmentNo());
                     map.put("stationName", stationInfo.getStationBasicInfo().getStationName());
                     map.put("stationId", stationInfo.getId());
                     arrayList.add(map);
@@ -810,7 +810,8 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                     for (Equipment equipment : projectInfo.getEquipment()) {
                         EquipmentDto equipmentDto = new EquipmentDto();
                         equipmentDto.setLabel(equipment.getName());
-                        equipmentDto.setValue(equipment.getId());
+                        equipmentDto.setValue(equipment.getEquipmentNo());
+                        equipmentDto.setWdHeight(equipment.getWdHeights());
                         equipmentDtoList.add(equipmentDto);
                     }
                     selectLabForVal.setEquipmentDto(equipmentDtoList);
@@ -984,7 +985,8 @@ public class HomePageServiceImpl extends ServiceImpl<WindTowerDataParentTableMap
                     for (Equipment equipment : stationInfo.getEquipment()) {
                         EquipmentDto equipmentDto = new EquipmentDto();
                         equipmentDto.setLabel(equipment.getName());
-                        equipmentDto.setValue(equipment.getId());
+                        equipmentDto.setValue(equipment.getEquipmentNo());
+                        equipmentDto.setWdHeight(equipment.getWdHeights());
                         equipmentDtoList.add(equipmentDto);
                     }
                     selectLabForVal.setEquipmentDto(equipmentDtoList);