Skip to content

G
gf_back
Commit 5497d785 authored by ZWT's avatar ZWT
Browse files
Options

feat(零碳): 长庆 

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2f82d43b
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 26 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java
View file @ 5497d785
...@@ -55,14 +55,14 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -55,14 +55,14 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
@XApiAnonymous @XApiAnonymous
@XApiGet @XApiGet
public XServiceResult test(XContext context) { public XServiceResult test(XContext context) {
// SpaceOptimizeLongCloudServiceImpl bean = context.getBean(SpaceOptimizeLongCloudServiceImpl.class); SpaceOptimizeLongCloudServiceImpl bean = context.getBean(SpaceOptimizeLongCloudServiceImpl.class);
// bean.optimizeLongJob(context); bean.optimizeLongJob(context);
// SpaceOptimizeMidCloudServiceImpl bean1 = context.getBean(SpaceOptimizeMidCloudServiceImpl.class); SpaceOptimizeMidCloudServiceImpl bean1 = context.getBean(SpaceOptimizeMidCloudServiceImpl.class);
// bean1.optimizeMidJob(context); bean1.optimizeMidJob(context);
SpaceOptimizeShortCloudServiceImpl bean2 = context.getBean(SpaceOptimizeShortCloudServiceImpl.class); SpaceOptimizeShortCloudServiceImpl bean2 = context.getBean(SpaceOptimizeShortCloudServiceImpl.class);
return bean2.optimizeShortJob(context); bean2.optimizeShortJob(context);
// SpaceOptimizeUltraCloudServiceImpl bean3 = context.getBean(SpaceOptimizeUltraCloudServiceImpl.class); SpaceOptimizeUltraCloudServiceImpl bean3 = context.getBean(SpaceOptimizeUltraCloudServiceImpl.class);
// return bean3.optimizeUltraJob(context); return bean3.optimizeUltraJob(context);
} }
/** /**
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeBaseService.java
View file @ 5497d785
...@@ -473,15 +473,23 @@ public class SpaceOptimizeBaseService { ...@@ -473,15 +473,23 @@ public class SpaceOptimizeBaseService {
//拆分时间段 //拆分时间段
for (SpaceOptimizeDurationDTO durationDTO : offGridPeriodList) { for (SpaceOptimizeDurationDTO durationDTO : offGridPeriodList) {
//-----------------------------------大庆暂时不用储能 //-----------------------------------大庆暂时不用储能
DateTime openTime = DateUtil.date(durationDTO.getOpenTime());
DateTime closeTime = DateUtil.date(durationDTO.getCloseTime()); DateTime closeTime = DateUtil.date(durationDTO.getCloseTime());
String endTime = closeTime.toString(BusinessConstant.MINUTES_FORMAT); if (openTime.compareTo(BusinessConstant.DATE_FLAG) < 0 && closeTime.compareTo(BusinessConstant.DATE_FLAG) > 0) {
if (closeTime.compareTo(BusinessConstant.DATE_FLAG) > 0) { this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC,
endTime = BusinessConstant.END_OF_DAY_TIME; openTime.toString(BusinessConstant.MINUTES_FORMAT), BusinessConstant.END_OF_DAY_TIME,
durationDTO.getFirstStart()
);
this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC,
BusinessConstant.START_OF_DAY_TIME, closeTime.toString(BusinessConstant.MINUTES_FORMAT),
durationDTO.getFirstStart()
);
} else {
this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC,
openTime.toString(BusinessConstant.MINUTES_FORMAT), closeTime.toString(BusinessConstant.MINUTES_FORMAT),
durationDTO.getFirstStart()
);
} }
this.createOptimizeDuration(durationDTOList, periodId, durationDTO.getRecordId(), durationDTO.getWellheadId(), BusinessConstant.PHOTOVOLTAIC,
DateUtil.date(durationDTO.getOpenTime()).toString(BusinessConstant.MINUTES_FORMAT), endTime,
durationDTO.getFirstStart()
);
//-----------------------------------原始逻辑 //-----------------------------------原始逻辑
// Date openTime = durationDTO.getOpenTime(); // Date openTime = durationDTO.getOpenTime();
// Date closeTime = durationDTO.getCloseTime(); // Date closeTime = durationDTO.getCloseTime();
...@@ -822,12 +830,28 @@ public class SpaceOptimizeBaseService { ...@@ -822,12 +830,28 @@ public class SpaceOptimizeBaseService {
} }
} }
} else { } else {
//计算偏移 DateTime startOffset = DateUtil.offsetMinute(startTime, between);
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null, DateTime endOffset = DateUtil.offsetMinute(endTime, between);
DateUtil.offsetMinute(startTime, between).toString(BusinessConstant.MINUTES_FORMAT), if (startOffset.compareTo(BusinessConstant.DATE_FLAG) < 0 && endOffset.compareTo(BusinessConstant.DATE_FLAG) > 0) {
DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT), //如果时间超过当天,舍弃
BusinessConstant.ONE this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
); startOffset.toString(BusinessConstant.MINUTES_FORMAT),
BusinessConstant.END_OF_DAY_TIME,
BusinessConstant.ONE
);
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
BusinessConstant.START_OF_DAY_TIME,
endOffset.toString(BusinessConstant.MINUTES_FORMAT),
BusinessConstant.ONE
);
} else {
//计算偏移
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
startOffset.toString(BusinessConstant.MINUTES_FORMAT),
endOffset.toString(BusinessConstant.MINUTES_FORMAT),
BusinessConstant.ONE
);
}
} }
} }
} }
...@@ -943,12 +967,28 @@ public class SpaceOptimizeBaseService { ...@@ -943,12 +967,28 @@ public class SpaceOptimizeBaseService {
); );
} }
} else { } else {
//计算偏移 DateTime startOffset = DateUtil.offsetMinute(startTime, between);
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null, DateTime endOffset = DateUtil.offsetMinute(endTime, between);
DateUtil.offsetMinute(startTime, between).toString(BusinessConstant.MINUTES_FORMAT), if (startOffset.compareTo(BusinessConstant.DATE_FLAG) < 0 && endOffset.compareTo(BusinessConstant.DATE_FLAG) > 0) {
DateUtil.offsetMinute(endTime, between).toString(BusinessConstant.MINUTES_FORMAT), //如果时间超过当天,舍弃
BusinessConstant.ONE this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
); startOffset.toString(BusinessConstant.MINUTES_FORMAT),
BusinessConstant.END_OF_DAY_TIME,
BusinessConstant.ONE
);
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
BusinessConstant.START_OF_DAY_TIME,
endOffset.toString(BusinessConstant.MINUTES_FORMAT),
BusinessConstant.ONE
);
} else {
//计算偏移
this.createOptimizeDuration(durationDTOList, periodId, recordId, wellheadId, null,
startOffset.toString(BusinessConstant.MINUTES_FORMAT),
endOffset.toString(BusinessConstant.MINUTES_FORMAT),
BusinessConstant.ONE
);
}
} }
} }
} }
......
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