Commit 22fc10c7 authored by ZWT's avatar ZWT

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

[
1.修改日耗电日产液信息定时任务及井口生产情况表表结构,增加来源系统字段,同时修改代码批量插入逻辑;
2.修改日用电趋势计算定时任务,修改代码逻辑,增加区分来源系统逻辑;
3.修改能耗分析定时任务定时任务,修改代码逻辑,增加区分来源系统逻辑;
4.修改第三方有功功率定时任务,修改代码逻辑,增加区分来源系统逻辑;
5.修改第三方当日油井状态定时任务,修改代码逻辑,增加区分来源系统逻辑;
6.修改第三方井场日累计数据定时任务,修改代码逻辑,增加区分来源系统逻辑;
7.修改第三方光伏日发电量定时任务,修改代码逻辑,增加区分来源系统逻辑;
8.修改第三井平均有功功率作业定时任务,修改代码逻辑,增加区分来源系统逻辑;
9.修改日耗电日产液信息定时任务,修改代码逻辑,增加区分来源系统逻辑;
10.修改查15分钟电站实际功率接口,修改代码逻辑,增加区分来源系统逻辑;
]
parent 8ee234c7
...@@ -158,6 +158,21 @@ public class BusinessConstant { ...@@ -158,6 +158,21 @@ public class BusinessConstant {
*/ */
public static final BigDecimal BIG_DECIMAL_6_67 = BigDecimal.valueOf(6.67); public static final BigDecimal BIG_DECIMAL_6_67 = BigDecimal.valueOf(6.67);
/**
* 2
*/
public static final BigDecimal BIG_DECIMAL_2 = BigDecimal.valueOf(2);
/**
* 3
*/
public static final BigDecimal BIG_DECIMAL_3 = BigDecimal.valueOf(3);
/**
* 4
*/
public static final BigDecimal BIG_DECIMAL_4 = BigDecimal.valueOf(4);
/** /**
* 60 * 60
*/ */
......
...@@ -1074,17 +1074,21 @@ public class EnergyConsumptionAnalysisService { ...@@ -1074,17 +1074,21 @@ public class EnergyConsumptionAnalysisService {
plantInput.setOuIds(orgIds); plantInput.setOuIds(orgIds);
} }
input.getBetweenDate(); input.getBetweenDate();
BigDecimal electricityFees;
BigDecimal divide;
//封装数据 //封装数据
List<DateTime> rangeToList = DateUtil.rangeToList(input.getStartTime(), input.getEndTime(), DateField.DAY_OF_YEAR); List<DateTime> rangeToList = DateUtil.rangeToList(input.getStartTime(), input.getEndTime(), DateField.DAY_OF_YEAR);
List<GetEnergyComparisonAnalysisOutput> outputs = new ArrayList<>(rangeToList.size()); List<GetEnergyComparisonAnalysisOutput> outputs = new ArrayList<>(rangeToList.size());
for (DateTime dateTime : rangeToList) { for (DateTime dateTime : rangeToList) {
electricityFees = RandomUtil.randomBigDecimal(BusinessConstant.BIG_DECIMAL_60, BusinessConstant.BIG_DECIMAL_10000);
divide = BaseUtils.divide(electricityFees, BigDecimal.TEN);
outputs.add(GetEnergyComparisonAnalysisOutput.builder() outputs.add(GetEnergyComparisonAnalysisOutput.builder()
.dateFormat(dateTime.toString()) .dateFormat(dateTime.toString())
.electricityFees(RandomUtil.randomBigDecimal(BusinessConstant.BIG_DECIMAL_60, BusinessConstant.BIG_DECIMAL_10000).setScale(2, RoundingMode.HALF_UP)) .electricityFees(electricityFees.setScale(2, RoundingMode.HALF_UP))
.valleyElectricPower(RandomUtil.randomBigDecimal(BusinessConstant.BIG_DECIMAL_60, BusinessConstant.BIG_DECIMAL_10000).setScale(2, RoundingMode.HALF_UP)) .valleyElectricPower(divide.multiply(BusinessConstant.BIG_DECIMAL_4))
.ordinaryElectricPower(RandomUtil.randomBigDecimal(BusinessConstant.BIG_DECIMAL_60, BusinessConstant.BIG_DECIMAL_10000).setScale(2, RoundingMode.HALF_UP)) .ordinaryElectricPower(divide.multiply(BusinessConstant.BIG_DECIMAL_3))
.highElectricPower(RandomUtil.randomBigDecimal(BusinessConstant.BIG_DECIMAL_60, BusinessConstant.BIG_DECIMAL_10000).setScale(2, RoundingMode.HALF_UP)) .highElectricPower(divide.multiply(BusinessConstant.BIG_DECIMAL_2))
.peakElectricPower(RandomUtil.randomBigDecimal(BusinessConstant.BIG_DECIMAL_60, BusinessConstant.BIG_DECIMAL_10000).setScale(2, RoundingMode.HALF_UP)) .peakElectricPower(divide)
.build()); .build());
} }
return XListResult.success(outputs); return XListResult.success(outputs);
......
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