修改气象站实体属性

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

@@ -24,21 +24,6 @@ import java.util.Date;
 @ApiModel(value = "cpp_weather_station_status_data")
 public class WeatherStationStatusData extends BaseCppEntity {
 
-
-    /**
-     * 设备主键ID
-     */
-    @ApiModelProperty(value = "设备主键ID")
-    private Long equipmentId;
-
-
-    /**
-     * 状态值为1代表运行，2代表待机，3代表停用，4代表故障
-     */
-    @ApiModelProperty(value = "状态值为1代表运行，2代表待机，3代表停用，4代表故障")
-    private String status;
-
-
     /**
      * 时间
      */
@@ -70,14 +55,6 @@ public class WeatherStationStatusData extends BaseCppEntity {
 
 
     /**
-     * 斜面辐射（W/㎡）
-     */
-    @ApiModelProperty(value = "斜面辐射（W/㎡）")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal obliqueR = new BigDecimal(-99);
-
-
-    /**
      * 环境温度（℃）
      */
     @ApiModelProperty(value = "环境温度（℃）")
@@ -124,52 +101,4 @@ public class WeatherStationStatusData extends BaseCppEntity {
     @Digits(integer = 10, fraction = 2)
     private BigDecimal wd = new BigDecimal(-99);
 
-
-    /**
-     * 日照小时数
-     */
-    @ApiModelProperty(value = "日照小时数")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal hourDA = new BigDecimal(-99);
-
-
-    /**
-     * 总辐射日累计（MJ/㎡）
-     */
-    @ApiModelProperty(value = "总辐射日累计（MJ/㎡）")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal globalRDA = new BigDecimal(-99);
-
-
-    /**
-     * 直接辐射日累计（MJ/㎡）
-     */
-    @ApiModelProperty(value = "直接辐射日累计（MJ/㎡）")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal directRDA = new BigDecimal(-99);
-
-
-    /**
-     * 散射辐射日累计（MJ/㎡）
-     */
-    @ApiModelProperty(value = "散射辐射日累计（MJ/㎡）")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal diffuseRDA = new BigDecimal(-99);
-
-
-    /**
-     * 斜面辐射日累计（MJ/㎡）
-     */
-    @ApiModelProperty(value = "斜面辐射日累计（MJ/㎡）")
-    @Digits(integer = 10, fraction = 2)
-    private BigDecimal obliqueRDA = new BigDecimal(-99);
-
-
-    /**
-     * 数据是否是通过预测数据生成的
-     */
-    @ApiModelProperty(value = "数据是否是通过预测数据生成的")
-    private String isGenerated;
-
-
 }

cpp-admin/src/main/java/com/cpp/web/service/datafactory/impl/ParsingQxzServiceImpl.java

@@ -77,21 +77,13 @@ public class ParsingQxzServiceImpl extends ServiceImpl<ParsingQxzMapper, Parsing
                             w.setAirT(parsingValue(parsingQxzInfo.getAirT(), fileContent));
                             w.setCellT(parsingValue(parsingQxzInfo.getCellT(), fileContent));
                             w.setDiffuseR(parsingValue(parsingQxzInfo.getDiffuseR(), fileContent));
-                            w.setDiffuseRDA(parsingValue(parsingQxzInfo.getDiffuseRDA(), fileContent));
                             w.setDirectR(parsingValue(parsingQxzInfo.getDirectR(), fileContent));
-                            w.setDirectRDA(parsingValue(parsingQxzInfo.getDirectRDA(), fileContent));
                             w.setGlobalR(parsingValue(parsingQxzInfo.getGlobalR(), fileContent));
-                            w.setGlobalRDA(parsingValue(parsingQxzInfo.getGlobalRDA(), fileContent));
-                            w.setHourDA(parsingValue(parsingQxzInfo.getHourDA(), fileContent));
-                            w.setObliqueR(parsingValue(parsingQxzInfo.getObliqueR(), fileContent));
-                            w.setObliqueRDA(parsingValue(parsingQxzInfo.getObliqueRDA(), fileContent));
                             w.setP(parsingValue(parsingQxzInfo.getP(), fileContent));
                             w.setRh(parsingValue(parsingQxzInfo.getRh(), fileContent));
                             w.setWd(parsingValue(parsingQxzInfo.getWd(), fileContent));
                             w.setWs(parsingValue(parsingQxzInfo.getWs(), fileContent));
-                            w.setStatus(parsingStatus(parsingQxzInfo.getStatus(), fileContent));
                             w.setStationCode(parsingQxzInfo.getStationCode());
-                            w.setEquipmentId(eqId);
                             weatherStationStatusDataService.save(w);
                             parsingResultDto.setStatus("success");
                             log.info("解析QXZ文件：{} 成功！ O(∩_∩)O", file.getName());