Skip to content

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

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e45492a8
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 50 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseEnergyStorageDeviceService.java
View file @ 75276860
......@@ -60,10 +60,9 @@ public class BaseEnergyStorageDeviceService {
if (this.checkMakerNumberExists(mapper, input.getMakerNumber(), null)) {
return XServiceResult.error(context, BusinessError.MakerNumberExists);
}
return XTransactionHelper.begin(context, () -> {
BaseEnergyStorageDeviceEnt entity = XCopyUtils.copyNewObject(input, BaseEnergyStorageDeviceEnt.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.insert(entity);
return XServiceResult.OK;
});
......@@ -91,10 +90,9 @@ public class BaseEnergyStorageDeviceService {
if (Objects.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
return XTransactionHelper.begin(context, () -> {
XCopyUtils.copyObject(input, entity);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.updateById(entity);
return XServiceResult.OK;
});
......@@ -118,17 +116,15 @@ public class BaseEnergyStorageDeviceService {
if (this.checkStorageIsReference(context, storageId)) {
return XServiceResult.error(context, BusinessError.StorageReference);
}
return XTransactionHelper.begin(context, () -> {
BaseEnergyStorageDeviceMapper mapper = context.getBean(BaseEnergyStorageDeviceMapper.class);
BaseEnergyStorageDeviceEnt entity = this.selectOneByDeviceId(storageId, mapper);
if (Objects.isNull(entity)) {
if (Objects.isNull(this.selectOneByDeviceId(storageId, mapper))) {
return XServiceResult.error(context, XError.NotFound);
}
entity = new BaseEnergyStorageDeviceEnt();
BaseEnergyStorageDeviceEnt entity = new BaseEnergyStorageDeviceEnt();
entity.setId(storageId);
entity.setIsDeleted(BusinessConstant.ZERO);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.updateById(entity);
return XServiceResult.OK;
});
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java
View file @ 75276860
......@@ -73,8 +73,7 @@ public class BasePhotovoltaicPlantService {
return XServiceResult.error(context, BusinessError.MakerNumberExists);
}
BasePhotovoltaicPlantEnt entity = XCopyUtils.copyNewObject(input, BasePhotovoltaicPlantEnt.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.insert(entity);
return XServiceResult.OK;
......@@ -104,8 +103,7 @@ public class BasePhotovoltaicPlantService {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.updateById(entity);
return XServiceResult.OK;
......@@ -130,17 +128,15 @@ public class BasePhotovoltaicPlantService {
if (this.checkPhotovoltaicIsReference(context, plantId)) {
return XServiceResult.error(context, BusinessError.PhotovoltaicReference);
}
return XTransactionHelper.begin(context, () -> {
BasePhotovoltaicPlantMapper mapper = context.getBean(BasePhotovoltaicPlantMapper.class);
BasePhotovoltaicPlantEnt entity = this.selectOneByPlantId(plantId, mapper);
if (Objects.isNull(entity)) {
if (Objects.isNull(this.selectOneByPlantId(plantId, mapper))) {
return XServiceResult.error(context, XError.NotFound);
}
entity = new BasePhotovoltaicPlantEnt();
BasePhotovoltaicPlantEnt entity = new BasePhotovoltaicPlantEnt();
entity.setId(plantId);
entity.setIsDeleted(BusinessConstant.ZERO);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.updateById(entity);
return XServiceResult.OK;
});
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWellheadService.java
View file @ 75276860
......@@ -62,10 +62,9 @@ public class BaseWellheadService {
if (this.checkWellNumberExists(mapper, input.getWellNumber(), null)) {
return XServiceResult.error(context, BusinessError.WellNumberExists);
}
return XTransactionHelper.begin(context, () -> {
BaseWellheadEnt entity = XCopyUtils.copyNewObject(input, BaseWellheadEnt.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.insert(entity);
return XServiceResult.OK;
});
......@@ -89,14 +88,13 @@ public class BaseWellheadService {
if (this.checkWellNumberExists(mapper, input.getWellNumber(), input.getId())) {
return XServiceResult.error(context, BusinessError.WellNumberExists);
}
return XTransactionHelper.begin(context, () -> {
BaseWellheadEnt entity = this.selectOneByWellheadId(input.getId(), mapper);
if (Objects.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.updateById(entity);
return XServiceResult.OK;
});
......@@ -123,17 +121,15 @@ public class BaseWellheadService {
if (this.checkWellheadIsSpaceReference(context, wellheadId)) {
return XServiceResult.error(context, BusinessError.WellheadReferenceSpace);
}
return XTransactionHelper.begin(context, () -> {
BaseWellheadMapper mapper = context.getBean(BaseWellheadMapper.class);
BaseWellheadEnt entity = this.selectOneByWellheadId(wellheadId, mapper);
if (Objects.isNull(entity)) {
if (Objects.isNull(this.selectOneByWellheadId(wellheadId, mapper))) {
return XServiceResult.error(context, XError.NotFound);
}
entity = new BaseWellheadEnt();
BaseWellheadEnt entity = new BaseWellheadEnt();
entity.setId(wellheadId);
entity.setIsDeleted(BusinessConstant.ZERO);
PpsUserSession session = context.getSession(PpsUserSession.class);
BaseUtils.setBaseModelDefault(entity, session);
BaseUtils.setBaseModelDefault(entity, context.getSession(PpsUserSession.class));
return XTransactionHelper.begin(context, () -> {
mapper.updateById(entity);
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