Commit 33ebcb83 authored by ZWT's avatar ZWT

feat(能源管理系统): 测试问题修复

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;
3.修改基础信息配置--柴发设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
4.修改基础信息配置--储能设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
5.修改基础信息配置--光伏电站配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent f3f31973
...@@ -294,7 +294,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -294,7 +294,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
String ouId = input.getOuId(); String ouId = input.getOuId();
String lineId = input.getLineId(); String lineId = input.getLineId();
String institutionId = input.getId(); String institutionId = input.getId();
return XTransactionHelper.begin(context, () -> {
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)) {
...@@ -304,6 +303,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -304,6 +303,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
if (isCurrentBasic.equals(BusinessConstant.ZERO)) { if (isCurrentBasic.equals(BusinessConstant.ZERO)) {
return XServiceResult.error(context, BusinessError.RepeatSetting); return XServiceResult.error(context, BusinessError.RepeatSetting);
} }
return XTransactionHelper.begin(context, () -> {
//关闭当前基础制度 //关闭当前基础制度
mapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDetailEnt>() mapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDetailEnt>()
.eq(SpaceInstitutionDetailEnt::getOuId, ouId) .eq(SpaceInstitutionDetailEnt::getOuId, ouId)
...@@ -324,6 +324,8 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -324,6 +324,8 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
); );
//长期/中短期制度优化初始化 //长期/中短期制度优化初始化
this.institutionOptimizeInitialize(context, detail); this.institutionOptimizeInitialize(context, detail);
//校准周期初始化
return XServiceResult.OK; 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