Browse Source

重新规划测风塔实体属性

xusl 7 months ago
parent
commit
08b14c15c3

+ 4 - 4
cpp-admin/src/main/java/com/cpp/web/controller/stationDataQuery/WindTowerStatusDataController.java

@@ -45,7 +45,7 @@ public class WindTowerStatusDataController {
     }
 
     @ApiOperation(value = "通过条件查询", notes = "通过条件查询")
-    @PostMapping("/queryCharts")
+    @GetMapping("/queryCharts")
     public R queryCharts(String stationCode,
                          Long startTime,
                          Long endTime,
@@ -54,11 +54,11 @@ public class WindTowerStatusDataController {
     }
 
     @ApiOperation(value = "根据条件查询", notes = "分页查询")
-    @PostMapping("/queryTableData")
-    public R queryTableData(Long currentPage, Long pageSize, String stationCode, Long startTime, Long endTime, String equipmentId) {
+    @GetMapping("/queryTableData")
+    public R queryTableData(Long currentPage, Long pageSize, String stationCode, Long startTime, Long endTime) {
         Page page = new Page(currentPage, pageSize);
         page.addOrder(OrderItem.asc("time"));
         page.setMaxLimit((long) -1);
-        return R.ok(windTowerStatusDataService.page(page, windTowerStatusDataService.getByBetweenTimeAndEquipmentIdAndStationCode(new Date(startTime), new Date(endTime), equipmentId, stationCode)));
+        return R.ok(windTowerStatusDataService.page(page, windTowerStatusDataService.getByBetweenTimeAndStationCode(new Date(startTime), new Date(endTime), stationCode)));
     }
 }

+ 62 - 947
cpp-admin/src/main/java/com/cpp/web/domain/station/WindTowerStatusData.java

@@ -23,1042 +23,157 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_wind_tower_status_data")
 public class WindTowerStatusData extends BaseCppEntity {
-
-
-    /**
-     * 设备主键ID
-     */
-    @ApiModelProperty(value = "设备主键ID")
-    private Long equipmentId;
-
-
-    /**
-     * 状态值为1代表运行,2代表待机,3代表停用,4代表故障
-     */
-    @ApiModelProperty(value = "状态值为1代表运行,2代表待机,3代表停用,4代表故障")
-    private String status;
-
-
     /**
      * 时间
      */
     @ApiModelProperty(value = "时间")
     private Date time;
 
-
-    /**
-     * 温度瞬时值
-     */
-    @ApiModelProperty(value = "温度瞬时值(℃)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal tInst = new BigDecimal(-99);
-
-
-    /**
-     * 温度最大值(℃)
-     */
-    @ApiModelProperty(value = "温度最大值(℃)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal tMax = new BigDecimal(-99);
-
-
-    /**
-     * 温度最小值(℃)
-     */
-    @ApiModelProperty(value = "温度最小值(℃)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal tMin = new BigDecimal(-99);
-
-
-    /**
-     * 温度平均值(℃)
-     */
-    @ApiModelProperty(value = "温度平均值(℃)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal tAve = new BigDecimal(-99);
-
-
-    /**
-     * 温度标准差(℃)
-     */
-    @ApiModelProperty(value = "温度标准差(℃)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal tSta = new BigDecimal(-99);
-
-
-    /**
-     * 湿度瞬时值(%)
-     */
-    @ApiModelProperty(value = "湿度瞬时值(%)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal rhInst = new BigDecimal(-99);
-
-
-    /**
-     * 湿度最大值(%)
-     */
-    @ApiModelProperty(value = "湿度最大值(%)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal rhMax = new BigDecimal(-99);
-
-
-    /**
-     * 湿度最小值(%)
-     */
-    @ApiModelProperty(value = "湿度最小值(%)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal rhMin = new BigDecimal(-99);
-
-
     /**
-     * 湿度平均值(%)
+     * 温度
      */
-    @ApiModelProperty(value = "湿度平均值(%)")
+    @ApiModelProperty(value = "温度(℃)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal rhAve = new BigDecimal(-99);
-
+    private BigDecimal t = new BigDecimal(-99);
 
     /**
-     * 湿度标准差(%)
+     * 湿度(%)
      */
-    @ApiModelProperty(value = "湿度标准差(%)")
+    @ApiModelProperty(value = "湿度(%)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal rhSta = new BigDecimal(-99);
-
+    private BigDecimal rh = new BigDecimal(-99);
 
     /**
-     * 气压瞬时值(KPa)
+     * 气压(KPa)
      */
-    @ApiModelProperty(value = "气压瞬时值(KPa)")
+    @ApiModelProperty(value = "气压(KPa)")
     @Digits(integer = 10, fraction = 4)
     private BigDecimal paInst = new BigDecimal(-99);
 
-
-    /**
-     * 气压最大值(KPa)
-     */
-    @ApiModelProperty(value = "气压最大值(KPa)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal paMax = new BigDecimal(-99);
-
-
-    /**
-     * 气压最小值(KPa)
-     */
-    @ApiModelProperty(value = "气压最小值(KPa)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal paMin = new BigDecimal(-99);
-
-
-    /**
-     * 气压平均值(KPa)
-     */
-    @ApiModelProperty(value = "气压平均值(KPa)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal paAve = new BigDecimal(-99);
-
-
-    /**
-     * 气压标准差(KPa)
-     */
-    @ApiModelProperty(value = "气压标准差(KPa)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal paSta = new BigDecimal(-99);
-
-
-    /**
-     * 10米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "10米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "10米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "10米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "10米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "10米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "10米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风向最大值(°)
-     */
-    @ApiModelProperty(value = "10米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风向最小值(°)
-     */
-    @ApiModelProperty(value = "10米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风向平均值(°)
-     */
-    @ApiModelProperty(value = "10米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve10 = new BigDecimal(-99);
-
-
-    /**
-     * 10米风向标准差(°)
-     */
-    @ApiModelProperty(value = "10米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta10 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "30米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "30米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "30米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "30米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "30米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "30米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风向最大值(°)
-     */
-    @ApiModelProperty(value = "30米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风向最小值(°)
-     */
-    @ApiModelProperty(value = "30米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风向平均值(°)
-     */
-    @ApiModelProperty(value = "30米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve30 = new BigDecimal(-99);
-
-
-    /**
-     * 30米风向标准差(°)
-     */
-    @ApiModelProperty(value = "30米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta30 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "50米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "50米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "50米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "50米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "50米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "50米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风向最大值(°)
-     */
-    @ApiModelProperty(value = "50米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风向最小值(°)
-     */
-    @ApiModelProperty(value = "50米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风向平均值(°)
-     */
-    @ApiModelProperty(value = "50米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve50 = new BigDecimal(-99);
-
-
-    /**
-     * 50米风向标准差(°)
-     */
-    @ApiModelProperty(value = "50米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta50 = new BigDecimal(-99);
-
-
     /**
-     * 60米风速瞬时值(m/s)
+     * 10米风速(m/s)
      */
-    @ApiModelProperty(value = "60米风速瞬时值(m/s)")
+    @ApiModelProperty(value = "10米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst60 = new BigDecimal(-99);
-
-
-    /**
-     * 60米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "60米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax60 = new BigDecimal(-99);
-
-
-    /**
-     * 60米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "60米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin60 = new BigDecimal(-99);
-
+    private BigDecimal ws10 = new BigDecimal(-99);
 
     /**
-     * 60米风速平均值(m/s
+     * 10米风向(°)
      */
-    @ApiModelProperty(value = "60米风速平均值(m/s)")
+    @ApiModelProperty(value = "10米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve60 = new BigDecimal(-99);
-
+    private BigDecimal wd10 = new BigDecimal(-99);
 
     /**
-     * 60米风速标准差(m/s)
+     * 30米风速(m/s)
      */
-    @ApiModelProperty(value = "60米风速标准差(m/s)")
+    @ApiModelProperty(value = "30米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta60 = new BigDecimal(-99);
-
+    private BigDecimal ws30 = new BigDecimal(-99);
 
     /**
-     * 60米风向瞬时值(°)
+     * 30米风向(°)
      */
-    @ApiModelProperty(value = "60米风向瞬时值(°)")
+    @ApiModelProperty(value = "30米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst60 = new BigDecimal(-99);
-
+    private BigDecimal wd30 = new BigDecimal(-99);
 
     /**
-     * 60米风向最大值(°
+     * 50米风速(m/s)
      */
-    @ApiModelProperty(value = "60米风向最大值(°)")
+    @ApiModelProperty(value = "50米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax60 = new BigDecimal(-99);
-
+    private BigDecimal ws50 = new BigDecimal(-99);
 
     /**
-     * 60米风向最小值(°)
+     * 50米风向(°)
      */
-    @ApiModelProperty(value = "60米风向最小值(°)")
+    @ApiModelProperty(value = "50米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin60 = new BigDecimal(-99);
-
+    private BigDecimal wd50 = new BigDecimal(-99);
 
     /**
-     * 60米风向平均值(°
+     * 60米风速(m/s)
      */
-    @ApiModelProperty(value = "60米风向平均值(°)")
+    @ApiModelProperty(value = "60米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve60 = new BigDecimal(-99);
-
+    private BigDecimal ws60 = new BigDecimal(-99);
 
     /**
-     * 60米风向标准差(°)
+     * 60米风向(°)
      */
-    @ApiModelProperty(value = "60米风向标准差(°)")
+    @ApiModelProperty(value = "60米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta60 = new BigDecimal(-99);
-
+    private BigDecimal wd60 = new BigDecimal(-99);
 
     /**
-     * 70米风速瞬时值(m/s)
+     * 70米风速(m/s)
      */
-    @ApiModelProperty(value = "70米风速瞬时值(m/s)")
+    @ApiModelProperty(value = "70米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst70 = new BigDecimal(-99);
-
+    private BigDecimal ws70 = new BigDecimal(-99);
 
     /**
-     * 70米风速最大值(m/s
+     * 70米风向(°)
      */
-    @ApiModelProperty(value = "70米风速最大值(m/s)")
+    @ApiModelProperty(value = "70米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax70 = new BigDecimal(-99);
-
+    private BigDecimal wd70 = new BigDecimal(-99);
 
     /**
-     * 70米风速最小值(m/s)
+     * 80米风速(m/s)
      */
-    @ApiModelProperty(value = "70米风速最小值(m/s)")
+    @ApiModelProperty(value = "80米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin70 = new BigDecimal(-99);
-
+    private BigDecimal ws80 = new BigDecimal(-99);
 
     /**
-     * 70米风速平均值(m/s
+     * 80米风向(°)
      */
-    @ApiModelProperty(value = "70米风速平均值(m/s)")
+    @ApiModelProperty(value = "80米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve70 = new BigDecimal(-99);
-
+    private BigDecimal wd80 = new BigDecimal(-99);
 
     /**
-     * 70米风速标准差(m/s)
+     * 90米风速(m/s)
      */
-    @ApiModelProperty(value = "70米风速标准差(m/s)")
+    @ApiModelProperty(value = "90米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta70 = new BigDecimal(-99);
-
+    private BigDecimal ws90 = new BigDecimal(-99);
 
     /**
-     * 70米风向瞬时值(°)
+     * 90米风向(°)
      */
-    @ApiModelProperty(value = "70米风向瞬时值(°)")
+    @ApiModelProperty(value = "90米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst70 = new BigDecimal(-99);
-
+    private BigDecimal wd90 = new BigDecimal(-99);
 
     /**
-     * 70米风向最大值(°
+     * 100米风速(m/s)
      */
-    @ApiModelProperty(value = "70米风向最大值(°)")
+    @ApiModelProperty(value = "100米风速(m/s)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax70 = new BigDecimal(-99);
-
+    private BigDecimal ws100 = new BigDecimal(-99);
 
     /**
-     * 70米风向最小值(°)
+     * 100米风向(°)
      */
-    @ApiModelProperty(value = "70米风向最小值(°)")
+    @ApiModelProperty(value = "100米风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin70 = new BigDecimal(-99);
-
+    private BigDecimal wd100 = new BigDecimal(-99);
 
     /**
-     * 70米风向平均值(°)
+     * 轮毂高度风速
      */
-    @ApiModelProperty(value = "70米风向平均值(°)")
+    @ApiModelProperty(value = "轮毂高度风速")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve70 = new BigDecimal(-99);
-
+    private BigDecimal wsHubHeight = new BigDecimal(-99);
 
     /**
-     * 70米风向标准差(°)
+     * 风机轮毂高度风向瞬时值(°)
      */
-    @ApiModelProperty(value = "70米风向标准差(°)")
+    @ApiModelProperty(value = "轮毂高度风向(°)")
     @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta70 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "80米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "80米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "80米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "80米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "80米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "80米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风向最大值(°)
-     */
-    @ApiModelProperty(value = "80米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风向最小值(°)
-     */
-    @ApiModelProperty(value = "80米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风向平均值(°)
-     */
-    @ApiModelProperty(value = "80米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve80 = new BigDecimal(-99);
-
-
-    /**
-     * 80米风向标准差(°)
-     */
-    @ApiModelProperty(value = "80米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta80 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "90米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "90米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "90米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "90米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "90米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "90米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风向最大值(°)
-     */
-    @ApiModelProperty(value = "90米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风向最小值(°)
-     */
-    @ApiModelProperty(value = "90米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风向平均值(°)
-     */
-    @ApiModelProperty(value = "90米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve90 = new BigDecimal(-99);
-
-
-    /**
-     * 90米风向标准差(°)
-     */
-    @ApiModelProperty(value = "90米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta90 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "100米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "100米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "100米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "100米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "100米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "100米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风向最大值(°)
-     */
-    @ApiModelProperty(value = "100米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风向最小值(°)
-     */
-    @ApiModelProperty(value = "100米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风向平均值(°)
-     */
-    @ApiModelProperty(value = "100米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve100 = new BigDecimal(-99);
-
-
-    /**
-     * 100米风向标准差(°)
-     */
-    @ApiModelProperty(value = "100米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta100 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "110米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "110米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "110米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "110米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "110米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "110米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风向最大值(°)
-     */
-    @ApiModelProperty(value = "110米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风向最小值(°)
-     */
-    @ApiModelProperty(value = "110米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风向平均值(°)
-     */
-    @ApiModelProperty(value = "110米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve110 = new BigDecimal(-99);
-
-
-    /**
-     * 110米风向标准差(°)
-     */
-    @ApiModelProperty(value = "110米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta110 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风速瞬时值(m/s)
-     */
-    @ApiModelProperty(value = "120米风速瞬时值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInst120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "120米风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMax120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "120米风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMin120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "120米风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAve120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "120米风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsSta120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "120米风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInst120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风向最大值(°)
-     */
-    @ApiModelProperty(value = "120米风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMax120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风向最小值(°)
-     */
-    @ApiModelProperty(value = "120米风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMin120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风向平均值(°)
-     */
-    @ApiModelProperty(value = "120米风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAve120 = new BigDecimal(-99);
-
-
-    /**
-     * 120米风向标准差(°)
-     */
-    @ApiModelProperty(value = "120米风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdSta120 = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风速瞬时值
-     */
-    @ApiModelProperty(value = "风机轮毂高度风速瞬时值")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsInstHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风速最大值(m/s)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风速最大值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMaxHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风速最小值(m/s)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风速最小值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsMinHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风速平均值(m/s)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风速平均值(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsAveHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风速标准差(m/s)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风速标准差(m/s)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wsStaHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风向瞬时值(°)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风向瞬时值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdInstHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风向最大值(°)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风向最大值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMaxHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风向最小值(°)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风向最小值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdMinHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风向平均值(°)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风向平均值(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdAveHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 风机轮毂高度风向标准差(°)
-     */
-    @ApiModelProperty(value = "风机轮毂高度风向标准差(°)")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal wdStaHubHeight = new BigDecimal(-99);
-
-
-    /**
-     * 空气密度  Kg/m³
-     */
-    @ApiModelProperty(value = "空气密度  Kg/m³")
-    @Digits(integer = 10, fraction = 4)
-    private BigDecimal airDensity = new BigDecimal(-99);
-
-
-    /**
-     * 数据是否是通过预测数据生成的 1:是 0:否
-     */
-    @ApiModelProperty(value = "数据是否是通过预测数据生成的 1:是 0:否")
-    private String isGenerated;
-
+    private BigDecimal wdHubHeight = new BigDecimal(-99);
 
 }

+ 22 - 29
cpp-admin/src/main/java/com/cpp/web/service/datafactory/impl/ParsingCftServiceImpl.java

@@ -78,38 +78,31 @@ public class ParsingCftServiceImpl extends ServiceImpl<ParsingCftMapper, Parsing
                                 if (time != null) {
                                     WindTowerStatusData windTowerStatusData = new WindTowerStatusData();
                                     windTowerStatusData.setTime(time);
-                                    windTowerStatusData.setTInst(parsingValue(parsingCft.gettInst(), fileContent));
+                                    windTowerStatusData.setT(parsingValue(parsingCft.gettInst(), fileContent));
                                     windTowerStatusData.setPaInst(parsingValue(parsingCft.getPaInst(), fileContent));
-                                    windTowerStatusData.setRhInst(parsingValue(parsingCft.getRhInst(), fileContent));
-                                    windTowerStatusData.setAirDensity(parsingValue(parsingCft.getAirDensity(), fileContent));
-
-                                    windTowerStatusData.setWsInst10(parsingValue(parsingCft.getWsInst10(), fileContent));
-                                    windTowerStatusData.setWsInst30(parsingValue(parsingCft.getWsInst30(), fileContent));
-                                    windTowerStatusData.setWsInst50(parsingValue(parsingCft.getWsInst50(), fileContent));
-                                    windTowerStatusData.setWsInst60(parsingValue(parsingCft.getWsInst60(), fileContent));
-                                    windTowerStatusData.setWsInst70(parsingValue(parsingCft.getWsInst70(), fileContent));
-                                    windTowerStatusData.setWsInst80(parsingValue(parsingCft.getWsInst80(), fileContent));
-                                    windTowerStatusData.setWsInst90(parsingValue(parsingCft.getWsInst90(), fileContent));
-                                    windTowerStatusData.setWsInst100(parsingValue(parsingCft.getWsInst100(), fileContent));
-                                    windTowerStatusData.setWsInst110(parsingValue(parsingCft.getWsInst110(), fileContent));
-                                    windTowerStatusData.setWsInstHubHeight(parsingValue(parsingCft.getWsInstHubHeight(), fileContent));
-
-                                    windTowerStatusData.setWdInst10(parsingValue(parsingCft.getWdInst10(), fileContent));
-                                    windTowerStatusData.setWdInst30(parsingValue(parsingCft.getWdInst30(), fileContent));
-                                    windTowerStatusData.setWdInst50(parsingValue(parsingCft.getWdInst50(), fileContent));
-                                    windTowerStatusData.setWdInst60(parsingValue(parsingCft.getWdInst60(), fileContent));
-                                    windTowerStatusData.setWdInst70(parsingValue(parsingCft.getWdInst70(), fileContent));
-                                    windTowerStatusData.setWdInst80(parsingValue(parsingCft.getWdInst80(), fileContent));
-                                    windTowerStatusData.setWdInst90(parsingValue(parsingCft.getWdInst90(), fileContent));
-                                    windTowerStatusData.setWdInst100(parsingValue(parsingCft.getWdInst100(), fileContent));
-                                    windTowerStatusData.setWdInst110(parsingValue(parsingCft.getWdInst110(), fileContent));
-                                    windTowerStatusData.setWdInstHubHeight(parsingValue(parsingCft.getWdInstHubHeight(), fileContent));
-
-                                    windTowerStatusData.setStatus(parsingStatus(parsingCft.getStatus(), fileContent));
+                                    windTowerStatusData.setRh(parsingValue(parsingCft.getRhInst(), fileContent));
+
+                                    windTowerStatusData.setWs10(parsingValue(parsingCft.getWsInst10(), fileContent));
+                                    windTowerStatusData.setWs30(parsingValue(parsingCft.getWsInst30(), fileContent));
+                                    windTowerStatusData.setWs50(parsingValue(parsingCft.getWsInst50(), fileContent));
+                                    windTowerStatusData.setWs60(parsingValue(parsingCft.getWsInst60(), fileContent));
+                                    windTowerStatusData.setWs70(parsingValue(parsingCft.getWsInst70(), fileContent));
+                                    windTowerStatusData.setWs80(parsingValue(parsingCft.getWsInst80(), fileContent));
+                                    windTowerStatusData.setWs90(parsingValue(parsingCft.getWsInst90(), fileContent));
+                                    windTowerStatusData.setWs100(parsingValue(parsingCft.getWsInst100(), fileContent));
+                                    windTowerStatusData.setWsHubHeight(parsingValue(parsingCft.getWsInstHubHeight(), fileContent));
+
+                                    windTowerStatusData.setWd10(parsingValue(parsingCft.getWdInst10(), fileContent));
+                                    windTowerStatusData.setWd30(parsingValue(parsingCft.getWdInst30(), fileContent));
+                                    windTowerStatusData.setWd50(parsingValue(parsingCft.getWdInst50(), fileContent));
+                                    windTowerStatusData.setWd60(parsingValue(parsingCft.getWdInst60(), fileContent));
+                                    windTowerStatusData.setWd70(parsingValue(parsingCft.getWdInst70(), fileContent));
+                                    windTowerStatusData.setWd80(parsingValue(parsingCft.getWdInst80(), fileContent));
+                                    windTowerStatusData.setWd90(parsingValue(parsingCft.getWdInst90(), fileContent));
+                                    windTowerStatusData.setWd100(parsingValue(parsingCft.getWdInst100(), fileContent));
+                                    windTowerStatusData.setWdHubHeight(parsingValue(parsingCft.getWdInstHubHeight(), fileContent));
                                     windTowerStatusData.setStationCode(parsingCft.getStationCode());
 
-                                    windTowerStatusData.setEquipmentId(eqId);
-
                                     windTowerStatusDataService.save(windTowerStatusData);
                                     parsingResultDto.setStatus("success");
                                     log.info("解析CFT文件:{} 成功! O(∩_∩)O", file.getName());

+ 1 - 1
cpp-admin/src/main/java/com/cpp/web/service/station/WindTowerStatusDataService.java

@@ -17,7 +17,7 @@ import java.util.Map;
 public interface WindTowerStatusDataService extends IService<WindTowerStatusData> {
     List<WindTowerStatusData> getByStationCodeBetweenTimeAndEquipmentId(String stationCode, Date startTime, Date endTime, String equipmentId);
 
-    QueryWrapper<WindTowerStatusData> getByBetweenTimeAndEquipmentIdAndStationCode(Date startTime, Date endTime, String equipmentId, String stationCode);
+    QueryWrapper<WindTowerStatusData> getByBetweenTimeAndStationCode(Date startTime, Date endTime, String stationCode);
 
     Map<String, Object> queryCharts(String stationCode, Date startTime, Date endTime, String equipmentId) throws Exception;
 }

+ 1 - 4
cpp-admin/src/main/java/com/cpp/web/service/station/impl/WindTowerStatusDataServiceImpl.java

@@ -50,7 +50,7 @@ public class WindTowerStatusDataServiceImpl extends ServiceImpl<WindTowerStatusD
     }
 
     @Override
-    public QueryWrapper<WindTowerStatusData> getByBetweenTimeAndEquipmentIdAndStationCode(Date startTime, Date endTime, String equipmentId, String stationCode) {
+    public QueryWrapper<WindTowerStatusData> getByBetweenTimeAndStationCode(Date startTime, Date endTime, String stationCode) {
         QueryWrapper<WindTowerStatusData> wrapper = new QueryWrapper<>();
         if (stationCode != null && !stationCode.equals("")) {
             wrapper.eq("station_code", stationCode);
@@ -58,9 +58,6 @@ public class WindTowerStatusDataServiceImpl extends ServiceImpl<WindTowerStatusD
         if (startTime != null && !startTime.equals("") && endTime != null && !endTime.equals("")) {
             wrapper.between("time", startTime, endTime);
         }
-        if (equipmentId != null && !equipmentId.equals("")) {
-            wrapper.eq("equipment_id", equipmentId);
-        }
 
         return wrapper;
     }

+ 162 - 0
cpp-ui/src/views/stationDataQuery/windtowerstatusdata/index.vue

@@ -0,0 +1,162 @@
+<template>
+  <div class="app-container">
+    <el-form ref="queryForm" size="small" :inline="true">
+      <el-form-item label="时间">
+        <el-date-picker
+          size="mini"
+          :clearable="false"
+          v-model="dateTime"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:45:00']"
+        />
+      </el-form-item>
+      <el-form-item label="场站名称">
+        <el-select v-model="stationCode" placeholder="请选择" @change="stationChange">
+          <el-option
+            v-for="item in stationList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" style="margin-left: 5px" icon="el-icon-search" @click="dataQuery">查询
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <div style="padding-top: 10px">
+      <vxe-table
+        ref="xTable"
+        align="center"
+        class="mytable-style"
+        auto-resize
+        border
+        resizable
+        export-config
+        highlight-current-row
+        show-overflow
+        max-height="700"
+        :data="tableData"
+        :radio-config="{trigger: 'row'}">
+        <vxe-table-column field="stationCode" title="场站名称" :formatter="stationCodeFormat"></vxe-table-column>
+        <vxe-table-column field="time" title="时间"></vxe-table-column>
+        <vxe-table-column field="tinst" title="温度(℃)"></vxe-table-column>
+        <vxe-table-column field="rhInst" title="湿度(%RH)"></vxe-table-column>
+        <vxe-table-column field="paInst" title="气压(hPa)"></vxe-table-column>
+        <vxe-table-column field="wsInstHubHeight" title="轮毂风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInstHubHeight" title="轮毂风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst10" title="10米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst10" title="10米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst30" title="30米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst30" title="30米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst50" title="50米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst50" title="50米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst60" title="60米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst60" title="60米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst70" title="70米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst70" title="70米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst80" title="80米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst80" title="80米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst90" title="90米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst90" title="90米风向(°)"></vxe-table-column>
+        <vxe-table-column field="wsInst100" title="100米风速(m/s)"></vxe-table-column>
+        <vxe-table-column field="wdInst100" title="100米风向(°)"></vxe-table-column>
+      </vxe-table>
+      <vxe-pager
+        background
+        :loading="loading"
+        :current-page.sync="currentPage"
+        :page-size.sync="pageSize"
+        :total="total"
+        @page-change="handlePageChange"
+        :layouts="['PrevJump', 'PrevPage', 'JumpNumber', 'NextPage', 'NextJump', 'Sizes', 'FullJump', 'Total']">
+      </vxe-pager>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'inverterinfo',
+  data() {
+    return {
+      dateTime: [new Date(new Date().toLocaleDateString()).getTime(), new Date(new Date().toLocaleDateString()).getTime() + 60 * 60 * 24 * 1000-5*1000*60],
+      total: 0,
+      sortOrder: 'asc',
+      pageSize: 10,
+      currentPage: 1,
+      stationList: [],
+      stationCode: [],
+      searchForm: {},
+      tableData: [],
+      nameList:[],
+      loading: false,
+      modId: '',//备用id
+    }
+  },
+  created(){
+
+  },
+  mounted() {
+    this.getStationCode()
+  },
+  computed: {},
+  methods: {
+    stationChange() {
+      this.currentPage = 1
+      this.pageSize = 10
+    },
+    nameFormat({cellValue, row, column}) {
+      const item = this.nameList.find(item => item.value === cellValue)
+      return item ? item.label : ''
+    },
+    stationCodeFormat({cellValue, row, column}) {
+      const item = this.stationList.find(item => item.value === cellValue)
+      return item ? item.label : ''
+    },
+    handlePageChange({currentPage, pageSize}) {
+      this.currentPage = currentPage
+      this.pageSize = pageSize
+      this.dataQuery();
+    },
+    dataQuery() {
+      let startTime = Math.round(this.dateTime[0])
+      let endTime = Math.round(this.dateTime[1])
+      if (endTime <= startTime) {
+        this.$message.error("开始时间不能大于结束时间")
+        return
+      }
+
+      this.loading = true
+      let queryParams = {
+        "currentPage": this.currentPage,
+        "pageSize": this.pageSize,
+        "stationCode": this.stationCode,
+        "startTime": startTime,
+        "endTime": endTime,
+      }
+      this.$axios.get('/windtowerstatusdata/queryTableData', {params: queryParams}).then(response => {
+        console.log(response.data.records)
+        this.tableData = response.data.records
+        this.page.total = response.data.total
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    getStationCode() {
+      this.$axios({url: '/electricfield/all', method: 'get'}).then(response => {
+        this.stationList = response.data
+        if (this.stationList.length > 0) {
+          this.stationCode = this.stationList[0].value
+          this.stationChange()
+        }
+      })
+    },
+  }
+}
+</script>