Skip to content

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

feat(吉林演示): 松原 

1.修改实际功率数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;
2.修改实际井口状态数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;
3.修改天气数据接收处理定时任务功能,在光伏数据处理完成插入后,添加预测功能远程调用逻辑,完成功能验证;
4.开发光伏预测结果集训练定时任务,完成定时任务配置及功能验证;
5.修改井场日累计数据数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6469c575
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 2141 deletions
C10-task/pps-core-task/src/main/java/pps/core/task/job/ThirdDailyAccumulationJob.java
View file @ 3156c514
...@@ -20,7 +20,8 @@ import xstartup.data.XServiceResult; ...@@ -20,7 +20,8 @@ import xstartup.data.XServiceResult;
public class ThirdDailyAccumulationJob { public class ThirdDailyAccumulationJob {
/** /**
* 十分钟一次,隔7分钟 * 长庆:10分钟一次,隔7分钟 0 7/10 * * * ?
* 吉林:30分钟一次,隔7分钟 0 7/30 * * * ?
* *
* @param xContext x上下文 * @param xContext x上下文
* @return {@link XServiceResult} * @return {@link XServiceResult}
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
View file @ 3156c514
...@@ -13,9 +13,12 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInpu ...@@ -13,9 +13,12 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInpu
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput; import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
import pps.cloud.middle.service.IThirdActivePowerCloudService; import pps.cloud.middle.service.IThirdActivePowerCloudService;
import pps.cloud.middle.service.IThirdCurrentWellConditionCloudService; import pps.cloud.middle.service.IThirdCurrentWellConditionCloudService;
import pps.cloud.middle.service.IThirdDailyAccumulationCloudService;
import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewInput; import pps.cloud.middle.service.data.third_active_power.GetThirdActivePowerViewInput;
import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionInput; import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionInput;
import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionOutput; import pps.cloud.middle.service.data.third_current_well_condition.GetThirdCurrentWellConditionOutput;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationInput;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationOutput;
import pps.cloud.prediction.service.IThirdDataAccessCloudService; import pps.cloud.prediction.service.IThirdDataAccessCloudService;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.prediction.constant.ThirdPartyApiConstant; import pps.core.prediction.constant.ThirdPartyApiConstant;
...@@ -169,7 +172,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -169,7 +172,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
switch (oilFieldCode) { switch (oilFieldCode) {
case BusinessConstant.ENV_SY: case BusinessConstant.ENV_SY:
IThirdCurrentWellConditionCloudService service = context.getBean(IThirdCurrentWellConditionCloudService.class); IThirdCurrentWellConditionCloudService service = context.getBean(IThirdCurrentWellConditionCloudService.class);
XListResult<GetThirdCurrentWellConditionOutput> result = service.getCurrentWellConditionList(context, GetThirdCurrentWellConditionInput.builder().build()); XListResult<GetThirdCurrentWellConditionOutput> result = service.getCurrentWellConditionList(context, new GetThirdCurrentWellConditionInput());
result.throwIfFail(); result.throwIfFail();
outputs = XCopyUtils.copyNewList(result.getResult(), GetThirdCurrentWellConditionViewOutput.class); outputs = XCopyUtils.copyNewList(result.getResult(), GetThirdCurrentWellConditionViewOutput.class);
break; break;
...@@ -314,15 +317,29 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -314,15 +317,29 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
*/ */
@Override @Override
public XServiceResult thirdDailyAccumulationJob(XContext context) { public XServiceResult thirdDailyAccumulationJob(XContext context) {
List<GetCumulativePowerGenerationOutput> outputs;
//区分环境
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
switch (oilFieldCode) {
case BusinessConstant.ENV_SY:
IThirdDailyAccumulationCloudService service = context.getBean(IThirdDailyAccumulationCloudService.class);
XListResult<GetThirdDailyAccumulationOutput> result = service.getDailyAccumulationList(context, new GetThirdDailyAccumulationInput());
result.throwIfFail();
outputs = XCopyUtils.copyNewList(result.getResult(), GetCumulativePowerGenerationOutput.class);
break;
case BusinessConstant.ENV_CQ:
String resultStr = ServiceUtil.doPostFormCq(context, String resultStr = ServiceUtil.doPostFormCq(context,
ThirdPartyApiConstant.CQ_GROUP_REAL_PV_DATA, ThirdPartyApiConstant.CQ_GROUP_REAL_PV_DATA,
new HashMap<>(0)); new HashMap<>(0));
context.getLogger().info("*** CQ_GROUP_REAL_PV_DATA : {}", resultStr); context.getLogger().info("*** CQ_GROUP_REAL_PV_DATA : {}", resultStr);
List<GetCumulativePowerGenerationOutput> outputs = JSON.parseArray(resultStr, GetCumulativePowerGenerationOutput.class); outputs = JSON.parseArray(resultStr, GetCumulativePowerGenerationOutput.class);
break;
default:
return XServiceResult.OK;
}
if (CollUtil.isEmpty(outputs)) { if (CollUtil.isEmpty(outputs)) {
return XServiceResult.OK; return XServiceResult.OK;
} }
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
//取电站 //取电站
Map<String, String> plantMap = this.getPhotovoltaicPlantMap(context); Map<String, String> plantMap = this.getPhotovoltaicPlantMap(context);
DateTime now = DateUtil.date(); DateTime now = DateUtil.date();
......
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/IThirdDailyAccumulationCloudService.java 0 → 100644
View file @ 3156c514
package pps.cloud.middle.service;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationInput;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationOutput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XListResult;
/**
* 电站累积数据
*
* @author ZWT
* @date 2024/10/19 18:14
*/
@XText("电站累积数据Cloud模块")
@XService
public interface IThirdDailyAccumulationCloudService {
/**
* 电站累积数据列表
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult }<{@link GetThirdDailyAccumulationOutput }>
*/
@XText("电站累积数据列表")
XListResult<GetThirdDailyAccumulationOutput> getDailyAccumulationList(XContext context, GetThirdDailyAccumulationInput input);
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/CreateThirdDailyAccumulationInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class CreateThirdDailyAccumulationInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/CreateThirdDailyAccumulationOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class CreateThirdDailyAccumulationOutput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DeleteThirdDailyAccumulationInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DeleteThirdDailyAccumulationInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DeleteThirdDailyAccumulationOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DeleteThirdDailyAccumulationOutput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DynamicQueryThirdDailyAccumulationInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DynamicQueryThirdDailyAccumulationInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DynamicQueryThirdDailyAccumulationOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DynamicQueryThirdDailyAccumulationOutput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/DynamicQueryThirdDailyAccumulationViewOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DynamicQueryThirdDailyAccumulationViewOutput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationInput.java
View file @ 3156c514
package pps.cloud.middle.service.data.third_daily_accumulation; package pps.cloud.middle.service.data.third_daily_accumulation;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/**
* 电站累积数据列表
*
* @author ZWT
* @date 2024/10/19
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class GetThirdDailyAccumulationInput { public class GetThirdDailyAccumulationInput {
@XText("ID") @XText("ID")
private Long id; private Long id;
...@@ -38,93 +52,4 @@ public class GetThirdDailyAccumulationInput { ...@@ -38,93 +52,4 @@ public class GetThirdDailyAccumulationInput {
@XText("储能累计放电量(KW·h)") @XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge; private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
} }
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationOutput.java
View file @ 3156c514
package pps.cloud.middle.service.data.third_daily_accumulation; package pps.cloud.middle.service.data.third_daily_accumulation;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/**
* 电站累积数据列表
*
* @author ZWT
* @date 2024/10/19
*/
@Data
public class GetThirdDailyAccumulationOutput { public class GetThirdDailyAccumulationOutput {
@XText("ID") @XText("ID")
private Long id; private Long id;
...@@ -38,93 +46,4 @@ public class GetThirdDailyAccumulationOutput { ...@@ -38,93 +46,4 @@ public class GetThirdDailyAccumulationOutput {
@XText("储能累计放电量(KW·h)") @XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge; private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
} }
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationViewInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class GetThirdDailyAccumulationViewInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/GetThirdDailyAccumulationViewOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class GetThirdDailyAccumulationViewOutput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/QueryThirdDailyAccumulationInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdDailyAccumulationInput extends XPageInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/QueryThirdDailyAccumulationOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdDailyAccumulationOutput extends XPageInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/QueryThirdDailyAccumulationViewInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdDailyAccumulationViewInput extends XPageInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/QueryThirdDailyAccumulationViewOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdDailyAccumulationViewOutput extends XPageInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/UpdateThirdDailyAccumulationInput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class UpdateThirdDailyAccumulationInput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_daily_accumulation/UpdateThirdDailyAccumulationOutput.java deleted 100644 → 0
View file @ 6469c575
package pps.cloud.middle.service.data.third_daily_accumulation;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class UpdateThirdDailyAccumulationOutput {
@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 Date saveDate;
@XText("来源系统")
private String systemSource;
@XText("储能累计放电量(KW·h)")
private BigDecimal energyStorageDischarge;
public Long getId() {
return this.id;
}
public void setId(Long value) {
this.id = value;
}
public String getStationName() {
return this.stationName;
}
public void setStationName(String value) {
this.stationName = value;
}
public String getStationId() {
return this.stationId;
}
public void setStationId(String value) {
this.stationId = value;
}
public Date getCreateDate() {
return this.createDate;
}
public void setCreateDate(Date value) {
this.createDate = value;
}
public BigDecimal getPhotovoltaicPower() {
return this.photovoltaicPower;
}
public void setPhotovoltaicPower(BigDecimal value) {
this.photovoltaicPower = value;
}
public BigDecimal getDailyElectricityConsumption() {
return this.dailyElectricityConsumption;
}
public void setDailyElectricityConsumption(BigDecimal value) {
this.dailyElectricityConsumption = value;
}
public BigDecimal getDailyLiquidProduction() {
return this.dailyLiquidProduction;
}
public void setDailyLiquidProduction(BigDecimal value) {
this.dailyLiquidProduction = value;
}
public BigDecimal getInPlaceConsumption() {
return this.inPlaceConsumption;
}
public void setInPlaceConsumption(BigDecimal value) {
this.inPlaceConsumption = value;
}
public Date getSaveDate() {
return this.saveDate;
}
public void setSaveDate(Date value) {
this.saveDate = value;
}
public String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
public BigDecimal getEnergyStorageDischarge() {
return this.energyStorageDischarge;
}
public void setEnergyStorageDischarge(BigDecimal value) {
this.energyStorageDischarge = value;
}
}
C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/ThirdDailyAccumulationEnt.java
View file @ 3156c514
...@@ -18,7 +18,7 @@ import java.util.Date; ...@@ -18,7 +18,7 @@ import java.util.Date;
* @date 2024/10/18 * @date 2024/10/18
*/ */
@Data @Data
@TableName("third_daily_accumulation") @TableName("THIRD_DAILY_ACCUMULATION")
public class ThirdDailyAccumulationEnt implements Serializable { public class ThirdDailyAccumulationEnt implements Serializable {
@XText("ID") @XText("ID")
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
......
C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/ThirdDailyAccumulationView.java
View file @ 3156c514
package pps.core.middle.entity; package pps.core.middle.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import java.io.Serializable; import java.io.Serializable;
...@@ -15,6 +18,9 @@ import java.util.Date; ...@@ -15,6 +18,9 @@ import java.util.Date;
* @date 2024/10/18 * @date 2024/10/18
*/ */
@Data @Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class ThirdDailyAccumulationView implements Serializable { public class ThirdDailyAccumulationView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
......
C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/ThirdDailyAccumulationViewMapper.java
View file @ 3156c514
...@@ -10,4 +10,12 @@ public interface ThirdDailyAccumulationViewMapper { ...@@ -10,4 +10,12 @@ public interface ThirdDailyAccumulationViewMapper {
ThirdDailyAccumulationView selectOne(ThirdDailyAccumulationView record); ThirdDailyAccumulationView selectOne(ThirdDailyAccumulationView record);
List<ThirdDailyAccumulationView> selectList(ThirdDailyAccumulationView record); List<ThirdDailyAccumulationView> selectList(ThirdDailyAccumulationView record);
/**
* 每日累积列表
*
* @param record 记录
* @return {@link List }<{@link ThirdDailyAccumulationView }>
*/
List<ThirdDailyAccumulationView> selectDailyAccumulationList(ThirdDailyAccumulationView record);
} }
C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/ThirdDailyAccumulationCloudServiceImpl.java 0 → 100644
View file @ 3156c514
package pps.core.middle.service;
import cn.hutool.core.date.DateUtil;
import pps.cloud.middle.service.IThirdDailyAccumulationCloudService;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationInput;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationOutput;
import pps.core.middle.entity.ThirdDailyAccumulationView;
import pps.core.middle.mapper.ThirdDailyAccumulationViewMapper;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XListResult;
import java.util.List;
/**
* 电站累积数据
*
* @author ZWT
* @date 2024/10/19 18:14
*/
@XService
public class ThirdDailyAccumulationCloudServiceImpl implements IThirdDailyAccumulationCloudService {
@Override
public XListResult<GetThirdDailyAccumulationOutput> getDailyAccumulationList(XContext context, GetThirdDailyAccumulationInput input) {
ThirdDailyAccumulationViewMapper viewMapper = context.getBean(ThirdDailyAccumulationViewMapper.class);
List<ThirdDailyAccumulationView> list = viewMapper.selectDailyAccumulationList(ThirdDailyAccumulationView.builder()
.createDate(DateUtil.beginOfDay(DateUtil.date()))
.build()
);
return XListResult.success(XCopyUtils.copyNewList(list, GetThirdDailyAccumulationOutput.class));
}
}
C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdDailyAccumulationViewMapper.xml
View file @ 3156c514
...@@ -42,4 +42,17 @@ ...@@ -42,4 +42,17 @@
where where
id=#{id} id=#{id}
</select> </select>
<select id="selectDailyAccumulationList" parameterType="pps.core.middle.entity.ThirdDailyAccumulationView" resultMap="BaseResultMap">
SELECT T.STATION_NAME,
T.CREATE_DATE,
T.PHOTOVOLTAIC_POWER,
0 AS DAILY_ELECTRICITY_CONSUMPTION,
0 AS DAILY_LIQUID_PRODUCTION,
0 AS IN_PLACE_CONSUMPTION,
0 AS ENERGY_STORAGE_DISCHARGE
FROM STATION_MAPPING S
LEFT JOIN THIRD_DAILY_ACCUMULATION T ON S.SYSTEM_STATION_NAME = T.STATION_NAME
WHERE T.CREATE_DATE >= #{createDate}
</select>
</mapper> </mapper>
\ No newline at end of file
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