Commit 17508c29 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.长庆演示首页功能开发,新增查询井场/场站列表接口,添加接口文档并完成接口冒烟测试;
2.长庆演示首页功能开发,新增总览信息统计接口,添加接口文档并完成接口冒烟测试;
3.长庆演示首页功能开发,新增用能分析统计接口,添加接口文档并完成接口冒烟测试;
4.长庆演示首页功能开发,新增累计用电统计接口,添加接口文档并完成接口冒烟测试;
5.长庆演示首页功能开发,新增光伏实时监控统计接口,添加接口文档并完成接口冒烟测试;
6.长庆演示首页功能开发,新增先导实验井间开制度统计接口,添加接口文档并完成接口冒烟测试;
7.长庆演示首页功能开发,新增零碳井场收益分析统计接口,添加接口文档并完成接口冒烟测试;
8.长庆演示首页功能开发,新增零碳井场实时监控接口,添加接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 64f21e09
......@@ -400,14 +400,10 @@ public class SpaceOptimizeBaseService {
between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
}
} else {
DateTime offset = startTime.offsetNew(DateField.MINUTE, between);
if (offset.compareTo(BusinessConstant.DATE_FLAG) >= 0) {
//如果时间超过当天,舍弃
continue;
}
//计算偏移
this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, offset,
endTime.offsetNew(DateField.MINUTE, between)
this.createDurationOffGridPeriod(offGridPeriodList, wellheadId,
DateUtil.offsetMinute(startTime, between),
DateUtil.offsetMinute(endTime, between)
);
}
}
......@@ -819,15 +815,10 @@ public class SpaceOptimizeBaseService {
}
}
} else {
DateTime offset = startTime.offsetNew(DateField.MINUTE, between);
if (offset.compareTo(BusinessConstant.DATE_FLAG) >= 0) {
//如果时间超过当天,舍弃
continue;
}
//计算偏移
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
offset.toString(BusinessConstant.MINUTES_FORMAT),
BaseUtils.getEndTimeString(endTime.offsetNew(DateField.MINUTE, between))
DateUtil.offsetMinute(startTime, between).toString(BusinessConstant.MINUTES_FORMAT),
DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT)
);
}
}
......@@ -943,15 +934,9 @@ public class SpaceOptimizeBaseService {
}
} else {
//计算偏移
DateTime offset = startTime.offsetNew(DateField.MINUTE, between);
if (offset.compareTo(BusinessConstant.DATE_FLAG) >= 0) {
//如果时间超过当天,舍弃
continue;
}
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
offset.toString(BusinessConstant.MINUTES_FORMAT), BaseUtils.getEndTimeString(
endTime.offsetNew(DateField.MINUTE, between)
)
DateUtil.offsetMinute(startTime, between).toString(BusinessConstant.MINUTES_FORMAT),
DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT)
);
}
}
......
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