修改实体父类

cpp-admin/src/main/java/com/cpp/web/domain/BaseCppEntity.java

@@ -43,8 +43,6 @@ public class BaseCppEntity implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime lastModifyTime;
 
-    @TableField(fill = FieldFill.INSERT)
-    private String delFlag;
 
     /**
      * 场站标识

cpp-admin/src/main/java/com/cpp/web/domain/datafactory/BaseParsing.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.cpp.common.annotation.Excel;
 import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.BaseCppEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,15 +16,7 @@ import lombok.Data;
  * @date 2024-09-23 15:28:33
  */
 @Data
-public class BaseParsing extends BaseEntity {
-
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
+public class BaseParsing extends BaseCppEntity {
 
     /**
      * 数据类型（s：单行，m：多行）

cpp-admin/src/main/java/com/cpp/web/domain/datafactory/ParsingType.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.common.annotation.Excel;
 import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.datafactory.enums.FileTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,7 +42,7 @@ public class ParsingType extends BaseEntity {
      * 文件类型
      */
     @ApiModelProperty(value = "文件类型")
-    private String fileType;
+    private FileTypeEnum fileType;
 
 
 }

cpp-admin/src/main/java/com/cpp/web/domain/datafactory/dto/ParsingResultDto.java

@@ -0,0 +1,17 @@
+package com.cpp.web.domain.datafactory.dto;
+
+import lombok.Data;
+
+/**
+ * 站端文件解析状态dto
+ *
+ * @author jy
+ * @since 2024/09/06
+ */
+@Data
+public class ParsingResultDto {
+    private String fileType;
+    private String fileName;
+    private String status;
+    private String message;
+}

cpp-admin/src/main/java/com/cpp/web/domain/datafactory/enums/FileTypeEnum.java

@@ -6,15 +6,15 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum FileTypeEnum {
-    E1(1, "短期"),
-    E2(2, "超短期"),
-    E3(3, "实发功率"),
-    E4(4, "NWP"),
-    E5(5, "运行信息"),
-    E6(6, "气象站"),
-    E7(7, "测风塔"),
-    E8(8, "逆变器"),
-    E9(9, "风机");
+    dq(1, "短期"),
+    cdq(2, "超短期"),
+    rp(3, "实发功率"),
+    nwp(4, "NWP"),
+    status(5, "运行信息"),
+    qxz(6, "气象站"),
+    cft(7, "测风塔"),
+    nbq(8, "逆变器"),
+    fj(9, "风机");
 
     private Integer code;
     private String message;

cpp-admin/src/main/java/com/cpp/web/domain/station/ElectricField.java

@@ -1,9 +1,7 @@
 package com.cpp.web.domain.station;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.BaseCppEntity;
 import com.cpp.web.domain.station.enums.ProvinceEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,14 +18,8 @@ import java.math.BigDecimal;
 @Data
 @TableName("cpp_electric_field")
 @EqualsAndHashCode(callSuper = true)
-public class ElectricField extends BaseEntity {
+public class ElectricField extends BaseCppEntity {
 
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
 
     /**
      * 场站编号

cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerShortTermStation.java

@@ -28,7 +28,7 @@ public class ForecastPowerShortTermStation extends BaseCppEntity {
      * 预测时间
      */
     @ApiModelProperty(value = "预测值时间")
-    private Date forecastTime;
+    private Date time;
 
 
     /**
@@ -38,23 +38,6 @@ public class ForecastPowerShortTermStation extends BaseCppEntity {
     @Digits(integer = 10, fraction = 2)
     private BigDecimal fpValue = new BigDecimal(-99);
 
-
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
-
-
     /**
      * 提前多久预测
      */

cpp-admin/src/main/java/com/cpp/web/domain/station/ForecastPowerUltraShortTermStation.java

@@ -38,23 +38,6 @@ public class ForecastPowerUltraShortTermStation extends BaseCppEntity {
     @Digits(integer = 10, fraction = 2)
     private BigDecimal fpValue = new BigDecimal(-99);
 
-
-    /**
-     * 开机容量
-     */
-    @ApiModelProperty(value = "开机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal openCapacity = new BigDecimal(-99);
-
-
-    /**
-     * 装机容量
-     */
-    @ApiModelProperty(value = "装机容量")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal capacity = new BigDecimal(-99);
-
-
     /**
      * 提前多久预测
      */

cpp-admin/src/main/java/com/cpp/web/domain/station/InverterInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.BaseCppEntity;
 import com.cpp.web.domain.station.enums.EquipmentTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,19 +25,12 @@ import java.util.Date;
 @TableName("cpp_inverter_info")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_inverter_info")
-public class InverterInfo extends BaseEntity {
+public class InverterInfo extends BaseCppEntity {
 
     public InverterInfo() {
         this.setEquipmentType(EquipmentTypeEnum.INVERTER.getCode());
     }
 
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
 
     /**
      * 设备类型

cpp-admin/src/main/java/com/cpp/web/domain/station/WeatherStationInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.BaseCppEntity;
 import com.cpp.web.domain.station.enums.EquipmentTypeEnum;
 
 
@@ -24,20 +25,12 @@ import java.time.LocalDate;
 @TableName("cpp_weather_station_info")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_weather_station_info")
-public class WeatherStationInfo extends BaseEntity {
-    private static final long serialVersionUID = 1L;
+public class WeatherStationInfo extends BaseCppEntity {
 
     public WeatherStationInfo() {
         this.setEquipmentType(EquipmentTypeEnum.WEATHERSTATION.getCode());
     }
 
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
 
     /**
      * 备用字段A

cpp-admin/src/main/java/com/cpp/web/domain/station/WindTowerInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.BaseCppEntity;
 import com.cpp.web.domain.station.enums.EquipmentTypeEnum;
 
 
@@ -24,19 +25,12 @@ import java.time.LocalDate;
 @TableName("cpp_wind_tower_info")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_wind_tower_info")
-public class WindTowerInfo extends BaseEntity {
+public class WindTowerInfo extends BaseCppEntity {
 
     public WindTowerInfo() {
         this.setEquipmentType(EquipmentTypeEnum.WINDTOWER.getCode());
     }
 
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
 
     /**
      * 备用字段A

cpp-admin/src/main/java/com/cpp/web/domain/station/WindTurbineInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.cpp.common.core.domain.BaseEntity;
+import com.cpp.web.domain.BaseCppEntity;
 import com.cpp.web.domain.station.enums.EquipmentTypeEnum;
 
 
@@ -25,21 +26,13 @@ import java.util.Date;
 @TableName("cpp_wind_turbine_info")
 @EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "cpp_wind_turbine_info")
-public class WindTurbineInfo extends BaseEntity {
+public class WindTurbineInfo extends BaseCppEntity {
 
     public WindTurbineInfo() {
         this.setEquipmentType(EquipmentTypeEnum.WINDTURBINE.getCode());
     }
 
     /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-
-
-    /**
      * 备用字段A
      */
     @ApiModelProperty(value = "备用字段A")