Skip to content

G
gf_back
Commit c7acd837 authored by ZWT's avatar ZWT
Browse files
Options

feat(吉林演示): 松原 

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2bc63f65
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1051 deletions
C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_photovoltaic_plant/GetBasePhotovoltaicPlantCloudOutput.java
View file @ c7acd837
......@@ -4,7 +4,6 @@ import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
* 光伏电站Cloud模块
......@@ -17,27 +16,6 @@ public class GetBasePhotovoltaicPlantCloudOutput {
@XText("ID")
private String id;
@XText("是否删除(1_是;0_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("组织机构ID")
private String ouId;
......
C09-base/pps-core-base/src/main/java/pps/core/base/excel/WindPredictionDataListener.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.base.excel;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.read.listener.ReadListener;
import pps.core.base.entity.WindPredictionFutureView;
import pps.core.base.entity.WindPredictionHistoryView;
import pps.core.base.mapper.WindPredictionFutureViewMapper;
import pps.core.base.mapper.WindPredictionHistoryViewMapper;
import pps.core.base.service.data.base_excel.WindPredictionExcelData;
import pps.core.common.utils.BaseUtils;
import xstartup.base.XContext;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
/**
* 风资源数据(测试用)
*
* @author ZWT
* @date 2024/08/30 15:46
*/
public class WindPredictionDataListener implements ReadListener<WindPredictionExcelData> {
private XContext context;
private String stationId;
/**
* 缓存的数据
*/
private List<WindPredictionExcelData> cachedDataList = new ArrayList<>(4096);
public WindPredictionDataListener(XContext context, String stationId) {
this.context = context;
this.stationId = stationId;
}
@Override
public void invoke(WindPredictionExcelData windPredictionExcelData, AnalysisContext analysisContext) {
cachedDataList.add(windPredictionExcelData);
}
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
this.saveWindPredictionHistory(context, cachedDataList, stationId);
}
public void saveWindPredictionHistory(XContext context, List<WindPredictionExcelData> cachedDataList, String stationId) {
if (CollUtil.isNotEmpty(cachedDataList)) {
List<WindPredictionFutureView> futureList = new ArrayList<>(cachedDataList.size());
List<WindPredictionHistoryView> historyList = new ArrayList<>(cachedDataList.size());
//按日期顺序排序
cachedDataList.sort(Comparator.comparing(WindPredictionExcelData::getDataTime));
//数据分界线
DateTime futureFlag = DateUtil.offsetDay(DateUtil.beginOfDay(CollUtil.getLast(cachedDataList).getDataTime()), -20);
//数据分片
for (WindPredictionExcelData excelData : cachedDataList) {
if (DateUtil.compare(excelData.getDataTime(), futureFlag) >= 0) {
//未来数据
WindPredictionFutureView build = WindPredictionFutureView.builder()
.stationId(stationId)
.dataTime(excelData.getDataTime())
.windDirection(excelData.getWindDirection())
.windSpeed(excelData.getWindSpeed())
.airTemperature(excelData.getAirTemperature())
.humidity(excelData.getHumidity())
.pressure(excelData.getPressure())
.actualWindSpeed(excelData.getActualWindSpeed())
.actualPower(excelData.getActualPower())
.predictedPower(excelData.getPredictedPower())
.build();
//去重
if (futureList.stream()
.noneMatch(item -> DateUtil.compare(item.getDataTime(), build.getDataTime()) == 0)) {
futureList.add(build);
}
} else {
//历史数据
WindPredictionHistoryView build = WindPredictionHistoryView.builder()
.stationId(stationId)
.dataTime(excelData.getDataTime())
.windDirection(excelData.getWindDirection())
.windSpeed(excelData.getWindSpeed())
.airTemperature(excelData.getAirTemperature())
.humidity(excelData.getHumidity())
.pressure(excelData.getPressure())
.actualWindSpeed(excelData.getActualWindSpeed())
.actualPower(excelData.getActualPower())
.predictedPower(excelData.getPredictedPower())
.build();
//去重
if (historyList.stream()
.noneMatch(item -> DateUtil.compare(item.getDataTime(), build.getDataTime()) == 0)) {
historyList.add(build);
}
}
}
//记录
String futureStart = DateUtil.formatDateTime(CollUtil.getFirst(futureList).getDataTime());
String futureEnd = DateUtil.formatDateTime(CollUtil.getLast(futureList).getDataTime());
String historyStart = DateUtil.formatDateTime(CollUtil.getFirst(historyList).getDataTime());
String historyEnd = DateUtil.formatDateTime(CollUtil.getLast(historyList).getDataTime());
//入库
if (CollUtil.isNotEmpty(futureList)) {
WindPredictionFutureViewMapper futureMapper = context.getBean(WindPredictionFutureViewMapper.class);
if (futureList.size() > BaseUtils.BATCH_SIZE) {
List<List<WindPredictionFutureView>> subList = BaseUtils.getSubList(futureList);
subList.forEach(futureMapper::insertBatch);
} else {
futureMapper.insertBatch(futureList);
}
}
if (CollUtil.isNotEmpty(historyList)) {
WindPredictionHistoryViewMapper historyMapper = context.getBean(WindPredictionHistoryViewMapper.class);
if (historyList.size() > BaseUtils.BATCH_SIZE) {
List<List<WindPredictionHistoryView>> subList = BaseUtils.getSubList(historyList);
subList.forEach(historyMapper::batchInsert);
} else {
historyMapper.batchInsert(historyList);
}
}
}
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_energy_storage_device/GetBaseEnergyStorageDeviceOutput.java
View file @ c7acd837
......@@ -5,7 +5,6 @@ import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
* 储能电站
......@@ -18,27 +17,6 @@ public class GetBaseEnergyStorageDeviceOutput {
@XText("ID")
private String id;
@XText("是否删除(1_是;0_否)")
private Integer isDeleted;
@XText("创建人ID")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人ID")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
@XText("组织机构ID")
private String ouId;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_excel/WindPredictionExcelData.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.base.service.data.base_excel;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
* 风资源数据(测试用)
*
* @author ZWT
* @date 2024/08/30 15:33
*/
@Data
@ExcelIgnoreUnannotated
public class WindPredictionExcelData {
@XText("记录时间")
@ExcelProperty(value = "DATATIME")
private Date dataTime;
@XText("风向")
@ExcelProperty(value = "WINDDIRECTION")
private Integer windDirection;
@XText("预报风速(m/s)")
@ExcelProperty(value = "WINDSPEED")
private BigDecimal windSpeed;
@XText("气温(℃)")
@ExcelProperty(value = "TEMPERATURE")
private BigDecimal airTemperature;
@XText("湿度(%)")
@ExcelProperty(value = "HUMIDITY")
private BigDecimal humidity;
@XText("气压(hPa)")
@ExcelProperty(value = "PRESSURE")
private BigDecimal pressure;
@XText("实际风速(m/s)")
@ExcelProperty(value = "ROUND(A.WS,1)")
private BigDecimal actualWindSpeed;
@XText("实际功率(kw)")
@ExcelProperty(value = "ROUND(A.POWER,0)")
private BigDecimal actualPower;
@XText("预测功率(kw)")
@ExcelProperty(value = "PREPOWER")
private BigDecimal predictedPower;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/base_photovoltaic_plant/GetSysOrganizationAndPlantInput.java
View file @ c7acd837
......@@ -44,22 +44,4 @@ public class GetSysOrganizationAndPlantInput {
@XText("序号")
private Integer sort;
@XText("创建人")
private String createById;
@XText("创建人名称")
private String createByName;
@XText("创建时间")
private Date createTime;
@XText("修改人")
private String modifyById;
@XText("修改人名称")
private String modifyByName;
@XText("修改时间")
private Date modifyTime;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/third_weather_data/LocationDTO.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.base.service.data.third_weather_data;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 位置信息
*
* @author ZWT
* @date 2024/04/23
*/
@NoArgsConstructor
@Data
public class LocationDTO {
/**
* 纬度:经度
*/
private String query;
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/third_weather_data/ThirdApiWeatherData.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.base.service.data.third_weather_data;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
* 第三方气象数据
*
* @author ZWT
* @date 2024/04/23
*/
@Data
public class ThirdApiWeatherData {
@XText("太阳直接辐射[W/m2]")
private BigDecimal dni;
@XText("太阳总辐射（水平面）[W/m2]")
private BigDecimal ghi;
@XText("太阳散射辐射（水平面）[W/m2]")
private BigDecimal dhi;
@XText("预报时间")
@JSONField(name = "time")
private Date forecastTime;
@XText("气温 [C]")
private BigDecimal tem;
@XText("相对湿度 [%]")
private BigDecimal rhu;
@XText("风速（地面10米）[m/s]")
private BigDecimal wns;
@XText("风向角度（地面10米）[degree]")
private Integer wnd;
@XText("风力等级（地面10米）")
@JSONField(name = "wns_grd")
private Integer wnsGrd;
@XText("阵风风速（地面10米）[m/s]")
private BigDecimal gust;
@XText("降水量（1小时累计）[mm]")
private BigDecimal pre;
@XText("地面气压 [hPa]")
@JSONField(name = "prs_qfe")
private BigDecimal prsQfe;
@XText("能见度 [km]")
private BigDecimal vis;
@XText("云量 [%]")
private BigDecimal clo;
@XText("紫外线UV辐照度（1小时累计）[kWh/m2]")
private BigDecimal uvb;
@XText("紫外线UV辐照指数")
private Integer uvi;
@XText("降水相态：(0无降水, 1雨, 3冻雨, 5雪, 6湿雪, 7雨夹雪, 8冰雹)")
private Integer phs;
@XText("天气现象代码")
private Integer wep;
@XText("风向角度（地面100米）[degree]")
@JSONField(name = "wnd_100m")
private Integer wnd100m;
@XText("风速（地面100米）[m/s]")
@JSONField(name = "wns_100m")
private BigDecimal wns100m;
@XText("风力等级（地面100米）")
@JSONField(name = "wns_grd_100m")
private Integer wnsGrd100m;
@XText("天气数据更新时间")
private Date updateTime;
@XText("数据创建时间")
private Date createTime;
@XText("经度(°)")
private BigDecimal longitude;
@XText("纬度(°)")
private BigDecimal latitude;
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/data/third_weather_data/Weather15mData.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.base.service.data.third_weather_data;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* 15分钟数据
*
* @author ZWT
* @date 2024/04/23 10:00
*/
@NoArgsConstructor
@Data
public class Weather15mData {
/**
* 15天每15分钟气象数据
*/
private List<ThirdApiWeatherData> data;
/**
* 位置信息
*/
private LocationDTO location;
/**
* 更新日期
*/
@JSONField(name = "time_updated")
private Date timeUpdated;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_long_wellhead/GetSpaceOptimizeLongWellheadOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_long_wellhead;
import lombok.Data;
import pps.core.space.service.data.SpaceOptimizeDateDuration;
import xstartup.annotation.XText;
import java.util.List;
/**
* 中期间开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeLongWellheadOutput {
@XText("ID")
private String id;
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
/**
* 井口配置(未优化)
*/
@XText("井口配置(未优化)")
private List<SpaceOptimizeDateDuration> initializeList;
/**
* 井口配置(已优化)
*/
@XText("井口配置(已优化)")
private List<SpaceOptimizeDateDuration> optimizeList;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_long_wellhead/GetSpaceOptimizeLongWellheadViewOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_long_wellhead;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 中期间开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeLongWellheadViewOutput {
@XText("ID")
private String id;
@XText("长期优化周期ID")
private String longPeriodId;
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_mid_period/GetSpaceOptimizeMidPeriodViewInput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_mid_period;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 短期间开开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeMidPeriodViewInput {
@XText("ID")
@NotBlank(message = "缺少中短期ID")
private String id;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_mid_period/GetSpaceOptimizeMidPeriodViewOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_mid_period;
import lombok.Data;
import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
import pps.core.space.service.data.SpaceOptimizeDateOutput;
import pps.core.space.service.data.space_optimize_mid_wellhead.GetSpaceOptimizeMidWellheadOutput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
* 短期间开开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeMidPeriodViewOutput {
/**
* 已优化日期列表
*/
@XText("已优化日期列表")
List<SpaceOptimizeDateOutput> dateList;
/**
* 策略配置列表
*/
@XText("策略配置列表")
List<GetBasePriceStrategyDetailOutput> strategyDetailList;
/**
* 井口信息
*/
@XText("井口信息")
List<GetSpaceOptimizeMidWellheadOutput> wellheadList;
/**
* 功率预测列表
*/
@XText("功率预测列表")
List<DynamicQueryPlantPredictedPowerOutput> powerGenerationList;
@XText("ID")
private String id;
@XText("线路ID")
private String lineId;
@XText("间开制度ID")
private String institutionId;
@XText("执行周期")
private String executionCycle;
@XText("优化状态(0_已优化;1_未优化)")
private Integer optimizeState;
@XText("优化截止日期")
private Date optimizeDeadline;
/**
* 电网类型key
*/
@XText("电网类型key(字典获取)")
private String gridTypeKey;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_mid_wellhead/GetSpaceOptimizeMidWellheadOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_mid_wellhead;
import lombok.Data;
import pps.core.space.service.data.SpaceOptimizeDateDuration;
import xstartup.annotation.XText;
import java.util.List;
/**
* 短期间开开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeMidWellheadOutput {
@XText("ID")
private String id;
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
/**
* 井口配置(未优化)
*/
@XText("井口配置(未优化)")
private List<SpaceOptimizeDateDuration> initializeList;
/**
* 井口配置(已优化)
*/
@XText("井口配置(已优化)")
private List<SpaceOptimizeDateDuration> optimizeList;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/GetSpaceOptimizeShortPeriodViewInput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_short_period;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 极短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeShortPeriodViewInput {
@XText("ID")
@NotBlank(message = "缺少极短期ID")
private String id;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_short_period/GetSpaceOptimizeShortPeriodViewOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_short_period;
import lombok.Data;
import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
import pps.cloud.prediction.service.data.plant_predicted_power_data.DynamicQueryPlantPredictedPowerOutput;
import pps.core.space.service.data.SpaceOptimizeDateOutput;
import pps.core.space.service.data.space_optimize_short_wellhead.GetSpaceOptimizeShortWellheadOutput;
import xstartup.annotation.XText;
import java.util.Date;
import java.util.List;
/**
* 极短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Data
public class GetSpaceOptimizeShortPeriodViewOutput {
/**
* 已优化日期列表
*/
@XText("已优化日期列表")
List<SpaceOptimizeDateOutput> dateList;
/**
* 策略配置列表
*/
@XText("策略配置列表")
List<GetBasePriceStrategyDetailOutput> strategyDetailList;
/**
* 井口信息
*/
@XText("井口信息")
List<GetSpaceOptimizeShortWellheadOutput> wellheadList;
/**
* 功率预测列表
*/
@XText("功率预测列表")
List<DynamicQueryPlantPredictedPowerOutput> powerGenerationList;
@XText("ID")
private String id;
@XText("线路ID")
private String lineId;
@XText("间开制度ID")
private String institutionId;
@XText("优化状态(0_已优化;1_未优化)")
private Integer optimizeState;
@XText("优化日期")
private Date optimizeDate;
/**
* 电网类型key
*/
@XText("电网类型key(字典获取)")
private String gridTypeKey;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_ultra_wellhead/GetSpaceOptimizeUltraWellheadOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_ultra_wellhead;
import lombok.Data;
import pps.core.space.service.data.SpaceOptimizeDateDuration;
import xstartup.annotation.XText;
import java.util.List;
/**
* 长期间开优化井口记录
*
* @author ZWT
* @date 2024/03/22
*/
@Data
public class GetSpaceOptimizeUltraWellheadOutput {
@XText("ID")
private String id;
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
/**
* 井口配置(未优化)
*/
@XText("井口配置(未优化)")
private List<SpaceOptimizeDateDuration> initializeList;
/**
* 井口配置(已优化)
*/
@XText("井口配置(已优化)")
private List<SpaceOptimizeDateDuration> optimizeList;
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/data/space_optimize_ultra_wellhead/GetSpaceOptimizeUltraWellheadViewOutput.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.space.service.data.space_optimize_ultra_wellhead;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 长期间开优化井口记录
*
* @author ZWT
* @date 2024/03/22
*/
@Data
public class GetSpaceOptimizeUltraWellheadViewOutput {
@XText("ID")
private String id;
@XText("长期优化周期ID")
private String ultraPeriodId;
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
}
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/PhotovoltaicElectricityConsumptionEnt.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.prediction.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 光伏用电表(测试用)
*
* @author ZWT
* @date 2023/09/28
*/
@Data
@TableName("photovoltaic_electricity_consumption")
public class PhotovoltaicElectricityConsumptionEnt implements Serializable {
@XText("ID")
@TableId(type = IdType.AUTO)
private Long id;
@XText("组织机构ID")
@TableField
private String ouId;
@XText("机构名称")
@TableField
private String ouName;
@XText("总电量")
@TableField
private BigDecimal totalElectricity;
@XText("市电")
@TableField
private BigDecimal cityElectricity;
@XText("市电环比")
@TableField
private BigDecimal cityElectricityScale;
@XText("绿电")
@TableField
private BigDecimal greenElectricity;
@XText("绿电环比")
@TableField
private BigDecimal greenElectricityScale;
@XText("日期")
@TableField
private Date dataDate;
}
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/PhotovoltaicElectricityConsumptionView.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.prediction.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import xstartup.annotation.XText;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 光伏用电表(测试用)
*
* @author ZWT
* @date 2023/09/28
*/
@Data
public class PhotovoltaicElectricityConsumptionView implements Serializable {
@XText("ID")
@TableField
private Long id;
@XText("组织机构ID")
@TableField
private String ouId;
@XText("机构名称")
@TableField
private String ouName;
@XText("总电量")
@TableField
private BigDecimal totalElectricity;
@XText("市电")
@TableField
private BigDecimal cityElectricity;
@XText("市电环比")
@TableField
private BigDecimal cityElectricityScale;
@XText("绿电")
@TableField
private BigDecimal greenElectricity;
@XText("绿电环比")
@TableField
private BigDecimal greenElectricityScale;
@XText("日期")
@TableField
private Date dataDate;
}
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/PhotovoltaicElectricityConsumptionMapper.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.prediction.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.prediction.entity.PhotovoltaicElectricityConsumptionEnt;
/**
* 光伏用电表(测试用)
*
* @author ZWT
* @date 2023/09/28
*/
@Repository(value = "pps.core.prediction.mapper.PhotovoltaicElectricityConsumptionMapper")
public interface PhotovoltaicElectricityConsumptionMapper extends BaseMapper<PhotovoltaicElectricityConsumptionEnt> {
}
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/PhotovoltaicElectricityConsumptionViewMapper.java deleted 100644 → 0
View file @ 2bc63f65
package pps.core.prediction.mapper;
import org.springframework.stereotype.Repository;
import pps.core.prediction.entity.PhotovoltaicElectricityConsumptionView;
import java.util.List;
/**
* 光伏用电表(测试用)
*
* @author ZWT
* @date 2023/09/28
*/
@Repository(value = "pps.core.prediction.mapper.PhotovoltaicElectricityConsumptionViewMapper")
public interface PhotovoltaicElectricityConsumptionViewMapper {
PhotovoltaicElectricityConsumptionView selectOne(PhotovoltaicElectricityConsumptionView record);
List<PhotovoltaicElectricityConsumptionView> selectList(PhotovoltaicElectricityConsumptionView record);
}
C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/PhotovoltaicElectricityConsumptionViewMapper.xml deleted 100644 → 0
View file @ 2bc63f65
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.prediction.mapper.PhotovoltaicElectricityConsumptionViewMapper">
<resultMap id="BaseResultMap" type="pps.core.prediction.entity.PhotovoltaicElectricityConsumptionView">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
<result column="total_electricity" property="totalElectricity" jdbcType="DECIMAL"/>
<result column="city_electricity" property="cityElectricity" jdbcType="DECIMAL"/>
<result column="city_electricity_scale" property="cityElectricityScale" jdbcType="DECIMAL"/>
<result column="green_electricity" property="greenElectricity" jdbcType="DECIMAL"/>
<result column="green_electricity_scale" property="greenElectricityScale" jdbcType="DECIMAL"/>
<result column="data_date" property="dataDate" jdbcType="DATE"/>
</resultMap>
<sql id="Base_Column_List">
id
,
ou_id,
ou_name,
total_electricity,
city_electricity,
city_electricity_scale,
green_electricity,
green_electricity_scale,
data_date
</sql>
<select id="selectOne" parameterType="pps.core.prediction.entity.PhotovoltaicElectricityConsumptionView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from photovoltaic_electricity_consumption
where
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.prediction.entity.PhotovoltaicElectricityConsumptionView"
resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from photovoltaic_electricity_consumption
where
id=#{id}
</select>
</mapper>
\ No newline at end of file
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_active_power/GetThirdActivePowerViewInput.java
View file @ c7acd837
......@@ -6,7 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
......@@ -20,27 +19,7 @@ import java.util.Date;
@AllArgsConstructor
@Builder
public class GetThirdActivePowerViewInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("井组ID(线路/光伏电站)")
private String stationId;
@XText("创建时间")
private Date createDate;
@XText("光伏实际功率(KW)")
private BigDecimal photovoltaicPower;
@XText("电表有功功率(KW)")
private BigDecimal meterPower;
@XText("来源系统")
private String systemSource;
@XText("录入时间")
private Date inputTime;
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_current_well_condition/GetThirdCurrentWellConditionInput.java
View file @ c7acd837
......@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 油井状态
......@@ -19,15 +16,4 @@ import java.util.Date;
@AllArgsConstructor
@Builder
public class GetThirdCurrentWellConditionInput {
@XText("ID")
private Long id;
@XText("井号")
private String wellNumber;
@XText("下次启停时间")
private Date nextTime;
@XText("井口状态(开/停井)")
private String wellStatus;
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationInput.java
View file @ c7acd837
......@@ -4,10 +4,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
* 电站累积数据列表
......@@ -20,33 +16,4 @@ import java.util.Date;
@AllArgsConstructor
@Builder
public class GetThirdDailyAccumulationInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("井组ID(光伏电站)")
private String stationId;
@XText("创建时间")
private Date createDate;
@XText("光伏日累计发电(KWh)")
private BigDecimal photovoltaicPower;
@XText("日累计用电量(KW·h)")
private BigDecimal dailyElectricityConsumption;
@XText("日累计产液量(m3)")
private BigDecimal dailyLiquidProduction;
@XText("就地消纳电量(KWh)")
private BigDecimal inPlaceConsumption;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerInput.java
View file @ c7acd837
......@@ -6,7 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
......@@ -20,18 +19,7 @@ import java.util.Date;
@AllArgsConstructor
@Builder
public class GetThirdPhotovoltaicPowerInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
}
\ No newline at end of file
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/weather_attachment_record/GetWeatherAttachmentRecordInput.java
View file @ c7acd837
......@@ -4,9 +4,6 @@ import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 天气附件记录
......@@ -19,15 +16,5 @@ import java.util.Date;
@AllArgsConstructor
@Builder
public class GetWeatherAttachmentRecordInput {
@XText("邮件时间")
private Date emailDataTime;
@XText("邮件附件下载地址")
private String emailAttachmentUrl;
@XText("邮件名称")
private String emailName;
@XText("环境")
private String oilFieldCode;
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/wellhead_daily_production_situation/GetWellheadDailyProductionSituationInput.java
View file @ c7acd837
......@@ -6,9 +6,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
/**
* 井口日累计生产数据
*
......@@ -20,57 +17,7 @@ import java.util.Date;
@AllArgsConstructor
@Builder
public class GetWellheadDailyProductionSituationInput {
@XText("ID")
private Long id;
@XText("井号")
private String wellNumber;
@XText("数据日期")
private String dataDate;
@XText("日耗电量(kW-h)")
private BigDecimal powerConsumeDaily;
@XText("日市电用电量")
private BigDecimal dailyUtilityElectricityConsumption;
@XText("尖峰时段用电量")
private BigDecimal electricityConsumptionPh;
@XText("高峰时段用电量")
private BigDecimal electricityConsumptionHh;
@XText("平时段用电量")
private BigDecimal electricityConsumptionNp;
@XText("谷时段用电量")
private BigDecimal electricityConsumptionVh;
@XText("日市电用电费")
private BigDecimal electricityChargeCity;
@XText("尖峰时段电费")
private BigDecimal electricityChargesPh;
@XText("高峰时段电费")
private BigDecimal peakHourTariff;
@XText("平时段电费")
private BigDecimal normalPeriodTariff;
@XText("谷时段用电费")
private BigDecimal alleyHoursTariff;
@XText("开井时长(h)")
private BigDecimal startHours;
@XText("日产液量(m3)")
private BigDecimal dailyLiquidProduction;
@XText("来源系统")
private String systemSource;
@XText("创建时间")
private Date createDate;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment