Skip to content

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

feat(零碳): 长庆 

1.对接第三方接口,接入第三方数据,完成Token接口验证,抽取公用方法封装调用工具类;
2.对接第三方接口,完成获取日耗电日产液等信息接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
3.对接第三方接口,完成获取有功功率数据信息接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
4.对接第三方接口,完成获取甘特图数据接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
5.对接第三方接口,完成本日累计数据接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
6.对接第三方接口,完成光伏发电量接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
7.对接第三方接口,完成三叠登录接口调用,添加线上接口文档并完成接口及定时任务冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent c956b374
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 304 additions and 116 deletions
C09-base/pps-cloud-base/src/main/java/pps/cloud/base/service/data/base_power_line_wellhead/DynamicQueryBasePowerLineWellheadInput.java
View file @ 73487724
......@@ -23,6 +23,9 @@ public class DynamicQueryBasePowerLineWellheadInput {
@XText("线路ID")
private String lineId;
@XText("线路ID集合")
private List<String> lineIds;
@XText("井口ID集合")
private List<String> wellheadIds;
}
C09-base/pps-core-base/src/main/java/pps/core/base/entity/BasePowerLineWellheadView.java
View file @ 73487724
......@@ -66,4 +66,11 @@ public class BasePowerLineWellheadView extends BaseModel implements Serializable
@XText("井口ID集合")
@TableField(exist = false)
private List<String> wellheadIds;
/**
* 线路ID集合
*/
@XText("线路ID集合")
@TableField(exist = false)
private List<String> lineIds;
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineCloudServiceImpl.java
View file @ 73487724
......@@ -127,6 +127,7 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
List<BasePowerLineWellheadView> wellheadViews = wellheadViewMapper.selectWellheadListByParam(
BasePowerLineWellheadView.builder()
.lineId(input.getLineId())
.lineIds(input.getLineIds())
.wellheadIds(input.getWellheadIds())
.build()
);
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BasePowerLineWellheadViewMapper.xml
View file @ 73487724
......@@ -72,14 +72,23 @@
FROM
base_power_line_wellhead l
JOIN base_wellhead w ON l.wellhead_id = w.id
WHERE
l.line_id = #{lineId}
<if test="wellheadIds != null">
AND l.wellhead_id NOT IN
<foreach collection="wellheadIds" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</if>
<where>
<if test="lineId!=null and lineId!=''">
AND l.line_id = #{lineId}
</if>
<if test="lineIds != null">
AND l.line_id IN
<foreach collection="lineIds" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</if>
<if test="wellheadIds != null">
AND l.wellhead_id NOT IN
<foreach collection="wellheadIds" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</if>
</where>
</select>
<insert id="batchInsertList" parameterType="list">
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerInput.java
View file @ 73487724
package pps.core.prediction.service.data.third_photovoltaic_power;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import pps.core.prediction.enums.BusinessError;
import xstartup.annotation.XText;
import xstartup.base.exception.XServiceException;
import java.util.Date;
import java.math.BigDecimal;
/**
* 能耗分析
*
* @author ZWT
* @date 2024/03/20
*/
@Data
public class GetThirdPhotovoltaicPowerInput {
@XText("ID")
private Long id;
@XText("井组名称(线路/光伏电站)")
private String stationName;
@XText("创建时间")
private Date createDate;
@XText("光伏发电量(KW·h)")
private BigDecimal photovoltaicPower;
@XText("来源系统")
private String systemSource;
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;
/**
* 组织机构ID
*/
@NotBlank(message = "缺少组织机构ID")
@XText("组织机构ID")
private String ouId;
/**
* 日期类型(1_近7天,2_近30天,3_自定义)
*/
@NotNull(message = "缺少日期类型")
@XText("日期类型(1_近7天,2_近30天,3_自定义)")
private Integer dateType;
/**
* 开始时间
*/
@XText("开始时间")
private Date startTime;
/**
* 结束时间
*/
@XText("结束时间")
private Date endTime;
/**
* 初始化开始结束日期
* 近7天:昨天开始前七天;近30天:昨天开始前30天;上期:所选周期往前推一个周期
*/
public void getBetweenDate() {
switch (this.dateType) {
case 1:
this.endTime = DateUtil.beginOfDay(DateUtil.yesterday());
this.startTime = DateUtil.offsetDay(endTime, -6);
break;
case 2:
this.endTime = DateUtil.beginOfDay(DateUtil.yesterday());
this.startTime = DateUtil.offsetDay(endTime, -29);
break;
case 3:
if (ObjectUtil.isNull(this.endTime) || ObjectUtil.isNull(this.startTime)) {
throw new XServiceException(BusinessError.TheStartEndDateIsMissing);
}
break;
default:
throw new XServiceException(BusinessError.DateTypeError);
}
}
public void setSystemSource(String value) {
this.systemSource = value;
}
}
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/third_photovoltaic_power/GetThirdPhotovoltaicPowerOutput.java
View file @ 73487724
package pps.core.prediction.service.data.third_photovoltaic_power;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
import java.math.BigDecimal;
/**
* 能耗分析
*
* @author ZWT
* @date 2024/03/20
*/
@Data
public class GetThirdPhotovoltaicPowerOutput {
@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;
}
@XText("发电量(kWh)")
private BigDecimal powerGeneration;
public void setSystemSource(String value) {
this.systemSource = value;
}
@XText("用电量(kWh)")
private BigDecimal powerConsumption;
@XText("消纳率(%)")
private BigDecimal absorptionRate;
}
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