Commit 6072882a authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7173cdc9
...@@ -363,7 +363,7 @@ public class SpaceOptimizeBaseService { ...@@ -363,7 +363,7 @@ public class SpaceOptimizeBaseService {
firstStartTime = startTime; firstStartTime = startTime;
endTimeOptimize = endTime; endTimeOptimize = endTime;
} }
this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize); this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize, BusinessConstant.ZERO);
//计算时间偏移,取时间间隔(分钟) //计算时间偏移,取时间间隔(分钟)
between = BaseUtils.getTimeDifferenceMinute(startTimeOptimize, startTime); between = BaseUtils.getTimeDifferenceMinute(startTimeOptimize, startTime);
} }
...@@ -395,7 +395,7 @@ public class SpaceOptimizeBaseService { ...@@ -395,7 +395,7 @@ public class SpaceOptimizeBaseService {
endTimeOptimize = startTimeOffset.offsetNew(DateField.MINUTE, openDuration); endTimeOptimize = startTimeOffset.offsetNew(DateField.MINUTE, openDuration);
startTimeOptimize = startTimeOffset; startTimeOptimize = startTimeOffset;
} }
this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize); this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, startTimeOptimize, endTimeOptimize, BusinessConstant.ZERO);
//取时间间隔(分钟) //取时间间隔(分钟)
between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime); between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
} }
...@@ -403,7 +403,7 @@ public class SpaceOptimizeBaseService { ...@@ -403,7 +403,7 @@ public class SpaceOptimizeBaseService {
//计算偏移 //计算偏移
this.createDurationOffGridPeriod(offGridPeriodList, wellheadId, this.createDurationOffGridPeriod(offGridPeriodList, wellheadId,
DateUtil.offsetMinute(startTime, between), DateUtil.offsetMinute(startTime, between),
DateUtil.offsetMinute(endTime, between) DateUtil.offsetMinute(endTime, between), BusinessConstant.ONE
); );
} }
} }
...@@ -480,7 +480,7 @@ public class SpaceOptimizeBaseService { ...@@ -480,7 +480,7 @@ public class SpaceOptimizeBaseService {
} }
this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC, this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC,
DateUtil.date(durationDTO.getOpenTime()).toString(BusinessConstant.MINUTES_FORMAT), endTime, DateUtil.date(durationDTO.getOpenTime()).toString(BusinessConstant.MINUTES_FORMAT), endTime,
BusinessConstant.ONE durationDTO.getFirstStart()
); );
//-----------------------------------原始逻辑 //-----------------------------------原始逻辑
// Date openTime = durationDTO.getOpenTime(); // Date openTime = durationDTO.getOpenTime();
...@@ -813,7 +813,7 @@ public class SpaceOptimizeBaseService { ...@@ -813,7 +813,7 @@ public class SpaceOptimizeBaseService {
DateTime endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, openDuration); DateTime endTimeOptimize = startTimeOptimize.offsetNew(DateField.MINUTE, openDuration);
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null, this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
startTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT), BaseUtils.getEndTimeString(endTimeOptimize), startTimeOptimize.toString(BusinessConstant.MINUTES_FORMAT), BaseUtils.getEndTimeString(endTimeOptimize),
BusinessConstant.ONE BusinessConstant.ZERO
); );
//取时间间隔(分钟) //取时间间隔(分钟)
between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime); between = BaseUtils.getTimeDifferenceMinute(endTimeOptimize, endTime);
...@@ -1241,13 +1241,15 @@ public class SpaceOptimizeBaseService { ...@@ -1241,13 +1241,15 @@ public class SpaceOptimizeBaseService {
* @param wellheadId 井口id * @param wellheadId 井口id
* @param openTime 断开时间 * @param openTime 断开时间
* @param closeTime 关闭时间 * @param closeTime 关闭时间
* @param firstStart 是否第一次启动
*/ */
private void createDurationOffGridPeriod(List<SpaceOptimizeDurationDTO> offGridPeriodList, String wellheadId, private void createDurationOffGridPeriod(List<SpaceOptimizeDurationDTO> offGridPeriodList, String wellheadId,
Date openTime, Date closeTime) { Date openTime, Date closeTime, Integer firstStart) {
SpaceOptimizeDurationDTO durationDTO = new SpaceOptimizeDurationDTO(); SpaceOptimizeDurationDTO durationDTO = new SpaceOptimizeDurationDTO();
durationDTO.setWellheadId(wellheadId); durationDTO.setWellheadId(wellheadId);
durationDTO.setOpenTime(openTime); durationDTO.setOpenTime(openTime);
durationDTO.setCloseTime(closeTime); durationDTO.setCloseTime(closeTime);
durationDTO.setFirstStart(firstStart);
offGridPeriodList.add(durationDTO); offGridPeriodList.add(durationDTO);
} }
......
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