Commit 91849374 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 77cab980
......@@ -27,7 +27,7 @@ public class EnergyConsumptionAnalysisJob implements XJob {
* @param xContext x上下文
* @return {@link XServiceResult}
*/
@XCronTrigger(value = TaskConstant.EVERY_DAY_30)
@XCronTrigger(value = XCronTrigger.PRE_10S)
@Override
public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ EnergyConsumptionAnalysisJob start:{}", System.currentTimeMillis());
......
......@@ -45,4 +45,8 @@ public class EnergyConsumptionAnalysisView implements Serializable {
@XText("日期")
@TableField
private Date dataDate;
@XText("来源系统")
@TableField
private String systemSource;
}
......@@ -175,7 +175,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
*/
@Override
public XServiceResult energyConsumptionAnalysisJob(XContext context) {
DateTime yesterday = DateUtil.yesterday();
DateTime yesterday = DateUtil.parseDate("2024-03-15");
//查昨日光伏发电量
ThirdPhotovoltaicPowerMapper powerMapper = context.getBean(ThirdPhotovoltaicPowerMapper.class);
List<ThirdPhotovoltaicPowerEnt> powerList = powerMapper.selectList(new LambdaQueryWrapper<ThirdPhotovoltaicPowerEnt>()
......@@ -191,7 +192,8 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.collect(Collectors.toMap(DynamicQueryBasePowerLineOutput::getLineName, DynamicQueryBasePowerLineOutput::getId));
//查昨日井口耗电量
WellheadDailyProductionSituationViewMapper mapper = context.getBean(WellheadDailyProductionSituationViewMapper.class);
Map<String, BigDecimal> collect = mapper.selectSumDailyElectricityConsumption(yesterday).stream()
List<WellheadDailyProductionSituationView> situationList = mapper.selectSumDailyElectricityConsumption(yesterday);
Map<String, BigDecimal> collect = situationList.stream()
.collect(Collectors.toMap(WellheadDailyProductionSituationView::getLineId, WellheadDailyProductionSituationView::getDailyElectricityConsumption));
//封装
List<EnergyConsumptionAnalysisView> analysisList = new ArrayList<>(powerList.size());
......@@ -203,6 +205,7 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
.powerGeneration(power.getPhotovoltaicPower())
.powerConsumption(collect.get(lineId))
.dataDate(power.getCreateDate())
.systemSource(ThirdPartyApiConstant.CQ_SOURCE)
.build());
}
return XTransactionHelper.begin(context, () -> {
......
......@@ -32,6 +32,20 @@
where
id=#{id}
</select>
<insert id=""
<insert id="batchInsertList" parameterType="list">
INSERT INTO energy_consumption_analysis ( line_id, station_name, power_generation, power_consumption,
data_date, system_source )
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.lineId},
#{item.stationName},
#{item.powerGeneration},
#{item.powerConsumption},
#{item.dataDate},
#{item.systemSource}
)
</foreach>
</insert>
</mapper>
\ No newline at end of file
......@@ -59,9 +59,10 @@
<result column="line_name" property="lineName" jdbcType="VARCHAR"/>
</resultMap>
<select id="selectSumDailyElectricityConsumption" parameterType="date">
SELECT w.line_id,
l.line_name,
<select id="selectSumDailyElectricityConsumption" parameterType="date"
resultType="pps.core.prediction.entity.WellheadDailyProductionSituationView">
SELECT w.line_id AS line_id,
l.line_name AS line_name,
IFNULL(SUM(s.daily_electricity_consumption), 0) AS daily_electricity_consumption
FROM base_power_line_wellhead w
JOIN wellhead_daily_production_situation s ON w.wellhead_id = s.wellhead_id
......
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