Commit a234f52f authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;
12.修改极短期间开优化模块井口生产情况油井状态接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 87a1a1dc
...@@ -73,6 +73,11 @@ public class BusinessConstant { ...@@ -73,6 +73,11 @@ public class BusinessConstant {
*/ */
public static final String DIESEL_POWER = "cf"; public static final String DIESEL_POWER = "cf";
/**
* 时段类型_低
*/
public static final String PERIOD_TYPE_LOW = "LOW";
/** /**
* 间抽井 * 间抽井
*/ */
......
...@@ -91,7 +91,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT ...@@ -91,7 +91,7 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
//峰谷策略ID/峰谷策略LIST Map //峰谷策略ID/峰谷策略LIST Map
Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = ServiceUtil.getStrategyDetailList(context, GetBasePriceStrategyDetailInput.builder() Map<String, List<GetBasePriceStrategyDetailOutput>> strategyMap = ServiceUtil.getStrategyDetailList(context, GetBasePriceStrategyDetailInput.builder()
.strategyMonth(String.valueOf(yesterday.monthBaseOne())) .strategyMonth(String.valueOf(yesterday.monthBaseOne()))
.periodTypeKey("LOW") .periodTypeKey(BusinessConstant.PERIOD_TYPE_LOW)
.build()).stream() .build()).stream()
.collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId)); .collect(Collectors.groupingBy(GetBasePriceStrategyDetailOutput::getStrategyId));
//电站名/市电峰谷ID Map //电站名/市电峰谷ID Map
......
...@@ -110,7 +110,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService { ...@@ -110,7 +110,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
//查线路关联市电峰谷 //查线路关联市电峰谷
strategyResult = strategyCloudService.queryStrategyDetailList(context, GetBasePriceStrategyDetailInput.builder() strategyResult = strategyCloudService.queryStrategyDetailList(context, GetBasePriceStrategyDetailInput.builder()
.lineId(line.getId()) .lineId(line.getId())
.periodTypeKey("LOW") .periodTypeKey(BusinessConstant.PERIOD_TYPE_LOW)
.strategyMonth("4") .strategyMonth("4")
.build()); .build());
strategyList = strategyResult.getResult(); strategyList = strategyResult.getResult();
......
...@@ -1579,7 +1579,7 @@ public class SpaceOptimizeBaseService { ...@@ -1579,7 +1579,7 @@ public class SpaceOptimizeBaseService {
if (CollUtil.isNotEmpty(strategyDetailList)) { if (CollUtil.isNotEmpty(strategyDetailList)) {
//获取第一段谷电阶段的开始时间为第一口井的开井时间 //获取第一段谷电阶段的开始时间为第一口井的开井时间
Optional<GetBasePriceStrategyDetailOutput> low = strategyDetailList.stream() Optional<GetBasePriceStrategyDetailOutput> low = strategyDetailList.stream()
.filter(s -> CharSequenceUtil.isAllNotBlank(s.getEndTime(), s.getStartTime()) && CharSequenceUtil.equals("LOW", s.getPeriodTypeKey())) .filter(s -> CharSequenceUtil.isAllNotBlank(s.getEndTime(), s.getStartTime()) && CharSequenceUtil.equals(BusinessConstant.PERIOD_TYPE_LOW, s.getPeriodTypeKey()))
.findFirst(); .findFirst();
if (low.isPresent()) { if (low.isPresent()) {
GetBasePriceStrategyDetailOutput strategyDetailOutput = low.get(); GetBasePriceStrategyDetailOutput strategyDetailOutput = low.get();
...@@ -2017,7 +2017,7 @@ public class SpaceOptimizeBaseService { ...@@ -2017,7 +2017,7 @@ public class SpaceOptimizeBaseService {
*/ */
private int getWeightByPeriodTypeKey(String periodTypeKey) { private int getWeightByPeriodTypeKey(String periodTypeKey) {
switch (periodTypeKey) { switch (periodTypeKey) {
case "LOW": case BusinessConstant.PERIOD_TYPE_LOW:
return 5; return 5;
case "PEACE": case "PEACE":
return 3; return 3;
......
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