Commit 1811d3b5 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7fd4f6e1
...@@ -34,7 +34,6 @@ import xstartup.data.XPageResult; ...@@ -34,7 +34,6 @@ import xstartup.data.XPageResult;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
import xstartup.error.XError; import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
...@@ -320,40 +319,37 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -320,40 +319,37 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
* @param input 输入 * @param input 输入
* @return {@link XServiceResult} * @return {@link XServiceResult}
*/ */
@XApiAnonymous
@XApiPost @XApiPost
@XText("校准历史--重新优化") @XText("校准历史--重新优化")
public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) { public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
// return XServiceResult.error(context, BusinessError.UnOpen); return XServiceResult.error(context, BusinessError.UnOpen);
String historyId = input.getHistoryId(); // String historyId = input.getHistoryId();
if (StringUtils.isEmpty(historyId)) { // if (StringUtils.isEmpty(historyId)) {
return XServiceResult.error(context, BusinessError.LackOfHistoryRecord); // return XServiceResult.error(context, BusinessError.LackOfHistoryRecord);
} // }
String institutionId = input.getId(); // String institutionId = input.getId();
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class); // SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt detail = this.getInstitutionDetail(mapper, institutionId); // SpaceInstitutionDetailEnt detail = this.getInstitutionDetail(mapper, institutionId);
if (Objects.isNull(detail)) { // if (Objects.isNull(detail)) {
return XServiceResult.error(context, XError.NotFound); // return XServiceResult.error(context, XError.NotFound);
} // }
//查校准历史详情 // //查校准历史详情
SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class); // SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class);
SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(historyId); // SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(historyId);
//过了校准日期不能再校准 // //过了校准日期不能再校准
Date calibrationDate = historyEnt.getCalibrationDate(); // Date calibrationDate = historyEnt.getCalibrationDate();
if (DateUtil.date().compareTo(calibrationDate) > 0) { // if (DateUtil.date().compareTo(calibrationDate) > 0) {
return XServiceResult.error(context, BusinessError.Expired); // return XServiceResult.error(context, BusinessError.Expired);
} // }
PpsUserSession session = new PpsUserSession(); // PpsUserSession session = context.getSession(PpsUserSession.class);
session.setId("123"); // return XTransactionHelper.begin(context, () -> {
session.setUserName("123"); // this.updateInstitutionDetail(context, session, mapper, institutionId, input, detail);
return XTransactionHelper.begin(context, () -> { // //制度优化
this.updateInstitutionDetail(context, session, mapper, institutionId, input, detail); // this.institutionOptimizeInitialize(context, detail);
//制度优化 // //校准周期初始化
this.institutionOptimizeInitialize(context, detail); // this.calibrationHistoryInitialize(context, detail, session);
//校准周期初始化 // return XServiceResult.OK;
this.calibrationHistoryInitialize(context, detail, session); // });
return XServiceResult.OK;
});
} }
/** /**
......
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