Commit 4d6d6431 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
6.超短期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;
7.组织线路树功能修改,重构查询逻辑;
8.间开优化历史功能修改,重构查询逻辑;
9.开发当日已优化间开结果列表查询接口,生成对应接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e776789f
...@@ -19,6 +19,7 @@ public enum BusinessError implements XError { ...@@ -19,6 +19,7 @@ public enum BusinessError implements XError {
LackOfHistoryRecord(2107, "缺少历史记录"), LackOfHistoryRecord(2107, "缺少历史记录"),
CannotBeDeleted(2108, "基础制度无法删除"), CannotBeDeleted(2108, "基础制度无法删除"),
Expired(2109, "已过期,无法重新校准"), Expired(2109, "已过期,无法重新校准"),
UnOpen(2110, "功能暂未开放"),
; ;
private int code; private int code;
......
...@@ -325,33 +325,34 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -325,33 +325,34 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
@XApiPost @XApiPost
@XText("校准历史--重新优化") @XText("校准历史--重新优化")
public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) { public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
String historyId = input.getHistoryId(); return XServiceResult.error(context, BusinessError.UnOpen);
if (StringUtils.isEmpty(historyId)) { // String historyId = input.getHistoryId();
return XServiceResult.error(context, BusinessError.LackOfHistoryRecord); // if (StringUtils.isEmpty(historyId)) {
} // return XServiceResult.error(context, BusinessError.LackOfHistoryRecord);
String institutionId = input.getId(); // }
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class); // String institutionId = input.getId();
SpaceInstitutionDetailEnt detail = this.getInstitutionDetail(mapper, institutionId); // SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
if (Objects.isNull(detail)) { // SpaceInstitutionDetailEnt detail = this.getInstitutionDetail(mapper, institutionId);
return XServiceResult.error(context, XError.NotFound); // if (Objects.isNull(detail)) {
} // return XServiceResult.error(context, XError.NotFound);
//查校准历史详情 // }
SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class); // //查校准历史详情
SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(historyId); // SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class);
//过了校准日期不能再校准 // SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(historyId);
Date calibrationDate = historyEnt.getCalibrationDate(); // //过了校准日期不能再校准
if (DateUtil.date().compareTo(calibrationDate) > 0) { // Date calibrationDate = historyEnt.getCalibrationDate();
return XServiceResult.error(context, BusinessError.Expired); // if (DateUtil.date().compareTo(calibrationDate) > 0) {
} // return XServiceResult.error(context, BusinessError.Expired);
PpsUserSession session = context.getSession(PpsUserSession.class); // }
return XTransactionHelper.begin(context, () -> { // PpsUserSession session = context.getSession(PpsUserSession.class);
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