feat[零碳项目]: 松原演示

[
1.统计分析-井组监控页功能开发,开发井组生产详情接口,完成接口冒烟测试并编写线上接口文档生成接口用例;
2.统计分析-井组监控页功能开发,开发井口实时信息接口,完成接口冒烟测试并编写线上接口文档生成接口用例;
3.统计分析-井组监控页功能开发,开发光伏电站发电详情接口,完成接口冒烟测试并编写线上接口文档生成接口用例;
4.统计分析-能耗分析页功能开发,开发今日/昨日/同期电量统计接口,完成接口冒烟测试并编写线上接口文档生成接口用例;
5.统计分析-能耗分析页功能开发,开发光伏发电趋势统计接口,完成接口冒烟测试并编写线上接口文档生成接口用例;
]

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/EnergyConsumptionAnalysisService.java

@@ -194,10 +194,11 @@ public class EnergyConsumptionAnalysisService {
             List<String> collect = plantList.stream()
                     .map(DynamicQueryBasePowerLinePlantViewOutput::getStationName)
                     .collect(Collectors.toList());
+            String oilFieldCode = ServiceUtil.getOilFieldCode(context);
             //查本期
             DateTime endTime = DateUtil.offsetDay(input.getEndTime(), 1);
-            nowMap = this.getPowerMap(context, input.getStartTime(), endTime, collect, 1, null, null);
-            lastMap = this.getPowerMap(context, DateUtil.offset(input.getStartTime(), DateField.YEAR, -1), DateUtil.offset(endTime, DateField.YEAR, -1), collect, 1, null, null);
+            nowMap = this.getPowerMap(context, input.getStartTime(), endTime, collect, 1, oilFieldCode, null);
+            lastMap = this.getPowerMap(context, DateUtil.offset(input.getStartTime(), DateField.YEAR, -1), DateUtil.offset(endTime, DateField.YEAR, -1), collect, 1, oilFieldCode, null);
         } else {
             nowMap = Collections.emptyMap();
             lastMap = Collections.emptyMap();