Skip to content

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

feat(零碳): 长庆 

1.长庆演示首页功能开发,新增采油厂统计信息查询接口,添加线上接口并完成接口冒烟测试;
2.长庆演示首页功能开发,新增线路图查询接口,添加线上接口并完成接口冒烟测试;
3.长庆演示首页功能开发,新增线路详情查询接口,添加线上接口并完成接口冒烟测试;
4.对接第三方接口,完成获取井场日累计数据接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2ec4483f
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 6 deletions
C10-task/pps-core-task/src/main/java/pps/core/task/job/ThirdDailyAccumulationJob.java
View file @ e288625f
......@@ -27,7 +27,7 @@ public class ThirdDailyAccumulationJob implements XJob {
* @param xContext x上下文
* @return {@link XServiceResult}
*/
@XCronTrigger(value = TaskConstant.HALF_HOUR_ZERO)
@XCronTrigger(value = XCronTrigger.PRE_10S)
@Override
public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ ThirdDailyAccumulationJob start:{}", System.currentTimeMillis());
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/ThirdDataAccessCloudServiceImpl.java
View file @ e288625f
......@@ -253,9 +253,216 @@ public class ThirdDataAccessCloudServiceImpl implements IThirdDataAccessCloudSer
*/
@Override
public XServiceResult thirdDailyAccumulationJob(XContext context) {
String resultStr = ServiceUtil.doPostFormCq(context,
ThirdPartyApiConstant.CQ_GROUP_REAL_PV_DATA,
new HashMap<>(0));
String resultStr = "[\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"王11-8\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 80.8,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 3.73,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 26.51,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0.27\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山31-14\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 305.5,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 5.21,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 191.85,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 61.39\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山33-15\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 448.8,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 6.17,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 319.5,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 102.24\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山37-11\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 287.99,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 4.49,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 23,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 7.36\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山32-1\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 4.59,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午218-207X\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 20.45,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午222-210X\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 453.6,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 1.11,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 25.56,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 8.18\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午291\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 1.35,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午平231-04\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 786,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 5.96,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 40.04,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 12.81\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山34-13\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 159,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 8.04,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 27.83,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 8.91\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山35-12\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 339.6,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 3.55,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 124.11,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 39.72\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山40-11\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 462.7,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 20.51,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 99.68,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 31.91\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"山43-9\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 859.2,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 1.9,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 56.09,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 17.95\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午249-8\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 72.66,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 24.84,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 214.57,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 68.66\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午252-9\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 168.6,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 14.85,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 44.31,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 14.18\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"午平276-2\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 435.2,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 0.55,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"沙28-22\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 361.6,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 0,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"塬47-93扩\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 30.27,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"塬48-92\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 6.04,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"沙25-12\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 8.04,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"沙30-23\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 179.09,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 0,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"塬39-96\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 10.78,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"沙24-13\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 9.58,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"塬49-92\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 8.47,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"黄120\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 0,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 6.88,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t},\n" +
"\t\t{\n" +
"\t\t\t\"stationname\": \"塬平57-17\",\n" +
"\t\t\t\"calC_DATE\": null,\n" +
"\t\t\t\"pV_DAY_ELECTRIC_POWER\": 792,\n" +
"\t\t\t\"reaL_LIQUID_DAILY\": 0,\n" +
"\t\t\t\"poweR_CONSUME_DAILY\": 0,\n" +
"\t\t\t\"pV_CONSUMP_ELECTRIC\": 0\n" +
"\t\t}\n" +
"\t]";
context.getLogger().info("*** CQ_GROUP_REAL_PV_DATA : {}", resultStr);
List<GetCumulativePowerGenerationOutput> outputs = JSON.parseArray(resultStr, GetCumulativePowerGenerationOutput.class);
if (CollUtil.isEmpty(outputs)) {
......
C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/ThirdDailyAccumulationViewMapper.xml
View file @ e288625f
......@@ -11,6 +11,7 @@
<result column="daily_liquid_production" property="dailyLiquidProduction" jdbcType="DECIMAL"/>
<result column="in_place_consumption" property="inPlaceConsumption" jdbcType="DECIMAL"/>
<result column="save_date" property="saveDate" jdbcType="DATE"/>
<result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id
......@@ -42,14 +43,13 @@
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO third_daily_accumulation ( station_name, station_id, create_date, photovoltaic_power,
INSERT INTO third_daily_accumulation ( station_name, station_id, photovoltaic_power,
daily_electricity_consumption, daily_liquid_production, in_place_consumption, save_date, system_source )
VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.stationName},
#{item.stationId},
#{item.createDate},
#{item.photovoltaicPower},
#{item.dailyElectricityConsumption},
#{item.dailyLiquidProduction},
......
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