Skip to content

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

feat(吉林演示): 松原 

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 5c32bde2
Show whitespace changes
Inline Side-by-side
Showing with 154 additions and 1058 deletions
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
View file @ fbcd7a70
...@@ -14,11 +14,14 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutp ...@@ -14,11 +14,14 @@ import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutp
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.IThirdDailyAccumulationCloudService;
import pps.cloud.middle.service.IThirdPhotovoltaicPowerCloudService;
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.GetThirdDailyAccumulationInput;
import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationOutput; import pps.cloud.middle.service.data.third_daily_accumulation.GetThirdDailyAccumulationOutput;
import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovoltaicPowerInput;
import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovoltaicPowerOutput;
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;
...@@ -224,17 +227,31 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer ...@@ -224,17 +227,31 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
*/ */
@Override @Override
public XServiceResult thirdPhotovoltaicPowerJob(XContext context) { public XServiceResult thirdPhotovoltaicPowerJob(XContext context) {
List<GetThirdPhotovoltaicPowerViewOutput> outputs;
//区分环境
String oilFieldCode = ServiceUtil.getOilFieldCode(context);
switch (oilFieldCode) {
case BusinessConstant.ENV_SY:
IThirdPhotovoltaicPowerCloudService service = context.getBean(IThirdPhotovoltaicPowerCloudService.class);
XListResult<GetThirdPhotovoltaicPowerOutput> result = service.getPhotovoltaicPowerList(context, new GetThirdPhotovoltaicPowerInput());
result.throwIfFail();
outputs = XCopyUtils.copyNewList(result.getResult(), GetThirdPhotovoltaicPowerViewOutput.class);
break;
case BusinessConstant.ENV_CQ:
Map<String, Object> param = new HashMap<>(4); Map<String, Object> param = new HashMap<>(4);
param.put("Calc_Date", DateUtil.yesterday().toString("yyyy-MM-dd")); param.put("Calc_Date", DateUtil.yesterday().toString("yyyy-MM-dd"));
String resultStr = ServiceUtil.doPostFormCq(context, String resultStr = ServiceUtil.doPostFormCq(context,
ThirdPartyApiConstant.CQ_STATION_DAILY_PV_DATA, ThirdPartyApiConstant.CQ_STATION_DAILY_PV_DATA,
param); param);
context.getLogger().info("*** CQ_STATION_DAILY_PV_DATA : {}", resultStr); context.getLogger().info("*** CQ_STATION_DAILY_PV_DATA : {}", resultStr);
List<GetThirdPhotovoltaicPowerViewOutput> outputs = JSON.parseArray(resultStr, GetThirdPhotovoltaicPowerViewOutput.class); outputs = JSON.parseArray(resultStr, GetThirdPhotovoltaicPowerViewOutput.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);
BigDecimal photovoltaicPower; BigDecimal photovoltaicPower;
List<ThirdPhotovoltaicPowerView> dtoList = new ArrayList<>(outputs.size()); List<ThirdPhotovoltaicPowerView> dtoList = new ArrayList<>(outputs.size());
for (GetThirdPhotovoltaicPowerViewOutput output : outputs) { for (GetThirdPhotovoltaicPowerViewOutput output : outputs) {
......
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/IThirdPhotovoltaicPowerCloudService.java 0 → 100644
View file @ fbcd7a70
package pps.cloud.middle.service;
import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovoltaicPowerInput;
import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovoltaicPowerOutput;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.data.XListResult;
/**
* 日发电量
*
* @author ZWT
* @date 2024/10/19 19:24
*/
@XText("日发电量Cloud模块")
@XService
public interface IThirdPhotovoltaicPowerCloudService {
/**
* 电站累积数据列表
*
* @param context 上下文
* @param input 输入
* @return {@link XListResult }<{@link GetThirdPhotovoltaicPowerOutput }>
*/
@XText("电站累积数据列表")
XListResult<GetThirdPhotovoltaicPowerOutput> getPhotovoltaicPowerList(XContext context, GetThirdPhotovoltaicPowerInput input);
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/CreateThirdPhotovoltaicPowerInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class CreateThirdPhotovoltaicPowerInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/CreateThirdPhotovoltaicPowerOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class CreateThirdPhotovoltaicPowerOutput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/DeleteThirdPhotovoltaicPowerInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DeleteThirdPhotovoltaicPowerInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/DeleteThirdPhotovoltaicPowerOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DeleteThirdPhotovoltaicPowerOutput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/DynamicQueryThirdPhotovoltaicPowerInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DynamicQueryThirdPhotovoltaicPowerInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/DynamicQueryThirdPhotovoltaicPowerOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DynamicQueryThirdPhotovoltaicPowerOutput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/DynamicQueryThirdPhotovoltaicPowerViewOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class DynamicQueryThirdPhotovoltaicPowerViewOutput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerInput.java
View file @ fbcd7a70
package pps.cloud.middle.service.data.third_photovoltaic_power; package pps.cloud.middle.service.data.third_photovoltaic_power;
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 GetThirdPhotovoltaicPowerInput { public class GetThirdPhotovoltaicPowerInput {
@XText("ID") @XText("ID")
private Long id; private Long id;
...@@ -20,45 +28,4 @@ public class GetThirdPhotovoltaicPowerInput { ...@@ -20,45 +28,4 @@ public class GetThirdPhotovoltaicPowerInput {
@XText("来源系统") @XText("来源系统")
private String systemSource; private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
} }
\ No newline at end of file
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerOutput.java
View file @ fbcd7a70
package pps.cloud.middle.service.data.third_photovoltaic_power; package pps.cloud.middle.service.data.third_photovoltaic_power;
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 GetThirdPhotovoltaicPowerOutput { public class GetThirdPhotovoltaicPowerOutput {
@XText("ID") @XText("ID")
private Long id; private Long id;
...@@ -20,45 +28,4 @@ public class GetThirdPhotovoltaicPowerOutput { ...@@ -20,45 +28,4 @@ public class GetThirdPhotovoltaicPowerOutput {
@XText("来源系统") @XText("来源系统")
private String systemSource; private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
} }
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerViewInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class GetThirdPhotovoltaicPowerViewInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerViewOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class GetThirdPhotovoltaicPowerViewOutput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/QueryThirdPhotovoltaicPowerInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdPhotovoltaicPowerInput extends XPageInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/QueryThirdPhotovoltaicPowerOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdPhotovoltaicPowerOutput extends XPageInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/QueryThirdPhotovoltaicPowerViewInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdPhotovoltaicPowerViewInput extends XPageInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/QueryThirdPhotovoltaicPowerViewOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import xstartup.base.data.XPageInput;
import java.math.BigDecimal;
import java.util.Date;
public class QueryThirdPhotovoltaicPowerViewOutput extends XPageInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/UpdateThirdPhotovoltaicPowerInput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class UpdateThirdPhotovoltaicPowerInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-cloud-middle/src/main/java/pps/cloud/middle/service/data/third_photovoltaic_power/UpdateThirdPhotovoltaicPowerOutput.java deleted 100644 → 0
View file @ 5c32bde2
package pps.cloud.middle.service.data.third_photovoltaic_power;
import xstartup.annotation.XText;
import java.math.BigDecimal;
import java.util.Date;
public class UpdateThirdPhotovoltaicPowerOutput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏日累积发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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 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 String getSystemSource() {
return this.systemSource;
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C13-middle/pps-core-middle/src/main/java/pps/core/middle/entity/ThirdPhotovoltaicPowerEnt.java
View file @ fbcd7a70
...@@ -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_photovoltaic_power") @TableName("THIRD_PHOTOVOLTAIC_POWER")
public class ThirdPhotovoltaicPowerEnt implements Serializable { public class ThirdPhotovoltaicPowerEnt 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/ThirdPhotovoltaicPowerView.java
View file @ fbcd7a70
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 ThirdPhotovoltaicPowerView implements Serializable { public class ThirdPhotovoltaicPowerView implements Serializable {
@XText("ID") @XText("ID")
@TableField @TableField
......
C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/ThirdCurrentWellConditionViewMapper.java
View file @ fbcd7a70
...@@ -5,6 +5,12 @@ import pps.core.middle.entity.ThirdCurrentWellConditionView; ...@@ -5,6 +5,12 @@ import pps.core.middle.entity.ThirdCurrentWellConditionView;
import java.util.List; import java.util.List;
/**
* 油井状态
*
* @author ZWT
* @date 2024/10/19
*/
@Repository(value = "pps.core.middle.mapper.ThirdCurrentWellConditionViewMapper") @Repository(value = "pps.core.middle.mapper.ThirdCurrentWellConditionViewMapper")
public interface ThirdCurrentWellConditionViewMapper { public interface ThirdCurrentWellConditionViewMapper {
......
C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/ThirdDailyAccumulationMapper.java
View file @ fbcd7a70
...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.middle.entity.ThirdDailyAccumulationEnt; import pps.core.middle.entity.ThirdDailyAccumulationEnt;
/**
* 日累积数据
*
* @author ZWT
* @date 2024/10/19
*/
@Repository(value = "pps.core.middle.mapper.ThirdDailyAccumulationMapper") @Repository(value = "pps.core.middle.mapper.ThirdDailyAccumulationMapper")
public interface ThirdDailyAccumulationMapper extends BaseMapper<ThirdDailyAccumulationEnt> { public interface ThirdDailyAccumulationMapper extends BaseMapper<ThirdDailyAccumulationEnt> {
} }
C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/ThirdPhotovoltaicPowerMapper.java
View file @ fbcd7a70
...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import pps.core.middle.entity.ThirdPhotovoltaicPowerEnt; import pps.core.middle.entity.ThirdPhotovoltaicPowerEnt;
/**
* 日发电量
*
* @author ZWT
* @date 2024/10/19
*/
@Repository(value = "pps.core.middle.mapper.ThirdPhotovoltaicPowerMapper") @Repository(value = "pps.core.middle.mapper.ThirdPhotovoltaicPowerMapper")
public interface ThirdPhotovoltaicPowerMapper extends BaseMapper<ThirdPhotovoltaicPowerEnt> { public interface ThirdPhotovoltaicPowerMapper extends BaseMapper<ThirdPhotovoltaicPowerEnt> {
} }
C13-middle/pps-core-middle/src/main/java/pps/core/middle/mapper/ThirdPhotovoltaicPowerViewMapper.java
View file @ fbcd7a70
...@@ -5,9 +5,23 @@ import pps.core.middle.entity.ThirdPhotovoltaicPowerView; ...@@ -5,9 +5,23 @@ import pps.core.middle.entity.ThirdPhotovoltaicPowerView;
import java.util.List; import java.util.List;
/**
* 日发电量
*
* @author ZWT
* @date 2024/10/19
*/
@Repository(value = "pps.core.middle.mapper.ThirdPhotovoltaicPowerViewMapper") @Repository(value = "pps.core.middle.mapper.ThirdPhotovoltaicPowerViewMapper")
public interface ThirdPhotovoltaicPowerViewMapper { public interface ThirdPhotovoltaicPowerViewMapper {
ThirdPhotovoltaicPowerView selectOne(ThirdPhotovoltaicPowerView record); ThirdPhotovoltaicPowerView selectOne(ThirdPhotovoltaicPowerView record);
List<ThirdPhotovoltaicPowerView> selectList(ThirdPhotovoltaicPowerView record); List<ThirdPhotovoltaicPowerView> selectList(ThirdPhotovoltaicPowerView record);
/**
* 日发电量列表
*
* @param record 记录
* @return {@link List }<{@link ThirdPhotovoltaicPowerView }>
*/
List<ThirdPhotovoltaicPowerView> selectPhotovoltaicPowerList(ThirdPhotovoltaicPowerView record);
} }
C13-middle/pps-core-middle/src/main/java/pps/core/middle/service/ThirdPhotovoltaicPowerCloudServiceImpl.java 0 → 100644
View file @ fbcd7a70
package pps.core.middle.service;
import cn.hutool.core.date.DateUtil;
import pps.cloud.middle.service.IThirdPhotovoltaicPowerCloudService;
import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovoltaicPowerInput;
import pps.cloud.middle.service.data.third_photovoltaic_power.GetThirdPhotovoltaicPowerOutput;
import pps.core.middle.entity.ThirdPhotovoltaicPowerView;
import pps.core.middle.mapper.ThirdPhotovoltaicPowerViewMapper;
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 19:25
*/
@XService
public class ThirdPhotovoltaicPowerCloudServiceImpl implements IThirdPhotovoltaicPowerCloudService {
@Override
public XListResult<GetThirdPhotovoltaicPowerOutput> getPhotovoltaicPowerList(XContext context, GetThirdPhotovoltaicPowerInput input) {
ThirdPhotovoltaicPowerViewMapper viewMapper = context.getBean(ThirdPhotovoltaicPowerViewMapper.class);
List<ThirdPhotovoltaicPowerView> list = viewMapper.selectPhotovoltaicPowerList(ThirdPhotovoltaicPowerView.builder()
.createDate(DateUtil.beginOfDay(DateUtil.yesterday()))
.build());
return XListResult.success(XCopyUtils.copyNewList(list, GetThirdPhotovoltaicPowerOutput.class));
}
}
C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdActivePowerViewMapper.xml
View file @ fbcd7a70
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
SUM(T.PHOTOVOLTAIC_POWER) AS PHOTOVOLTAIC_POWER, SUM(T.PHOTOVOLTAIC_POWER) AS PHOTOVOLTAIC_POWER,
T.CREATE_DATE T.CREATE_DATE
FROM STATION_MAPPING S FROM STATION_MAPPING S
LEFT JOIN THIRD_ACTIVE_POWER T ON S.SYSTEM_STATION_NAME = T.STATION_NAME JOIN THIRD_ACTIVE_POWER T ON S.SYSTEM_STATION_NAME = T.STATION_NAME
WHERE T.STATION_NAME IS NOT NULL WHERE T.STATION_NAME IS NOT NULL
<if test="createDate != null"> <if test="createDate != null">
AND T.CREATE_DATE > #{createDate} AND T.CREATE_DATE > #{createDate}
......
C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdDailyAccumulationViewMapper.xml
View file @ fbcd7a70
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
0 AS IN_PLACE_CONSUMPTION, 0 AS IN_PLACE_CONSUMPTION,
0 AS ENERGY_STORAGE_DISCHARGE 0 AS ENERGY_STORAGE_DISCHARGE
FROM STATION_MAPPING S FROM STATION_MAPPING S
LEFT JOIN THIRD_DAILY_ACCUMULATION T ON S.SYSTEM_STATION_NAME = T.STATION_NAME JOIN THIRD_DAILY_ACCUMULATION T ON S.SYSTEM_STATION_NAME = T.STATION_NAME
WHERE T.CREATE_DATE >= #{createDate} WHERE T.CREATE_DATE >= #{createDate}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
C13-middle/pps-core-middle/src/main/resources/mybatis/mapper/pps/core/middle/ThirdPhotovoltaicPowerViewMapper.xml
View file @ fbcd7a70
...@@ -30,4 +30,13 @@ ...@@ -30,4 +30,13 @@
where where
id=#{id} id=#{id}
</select> </select>
<select id="selectPhotovoltaicPowerList" parameterType="pps.core.middle.entity.ThirdPhotovoltaicPowerView" resultMap="BaseResultMap">
SELECT T.STATION_NAME,
T.PHOTOVOLTAIC_POWER,
TRUNC(CREATE_DATE) AS CREATE_DATE
FROM STATION_MAPPING S
JOIN THIRD_PHOTOVOLTAIC_POWER T ON S.SYSTEM_STATION_NAME = T.STATION_NAME
WHERE TRUNC(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