Commit 4e7507b4 authored by ZWT's avatar ZWT

feat(能源管理系统): 间开制度管理

1.修改基础信息配置-井口配置模块删除接口,增加私有方法校验井口是否已被线路引用;
2.修改基础信息配置-光伏电站配置模块删除接口,增加私有方法校验光伏电站是否已被线路引用;
3.修改基础信息配置-储能设备配置模块删除接口,增加私有方法校验储能设备是否已被线路引用;
4.修改基础信息配置-柴发设备配置模块删除接口,增加私有方法校验柴发设备是否已被线路引用;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 00d922aa
......@@ -64,10 +64,7 @@ public class SpaceCalibrationService {
@XApiPost
@XText("校准周期--新增")
public XServiceResult createSpaceCalibrationPeriod(XContext context, CreateSpaceCalibrationPeriodInput input) {
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
return XTransactionHelper.begin(context, () -> {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
SpaceCalibrationPeriodEnt periodEnt = this.getPeriodEntByParam(mapper, input.getLineId(), input.getOuId());
......@@ -92,10 +89,7 @@ public class SpaceCalibrationService {
@XApiPost
@XText("校准周期--修改")
public XServiceResult updateSpaceCalibrationPeriod(XContext context, UpdateSpaceCalibrationPeriodInput input) {
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
return XTransactionHelper.begin(context, () -> {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
SpaceCalibrationPeriodEnt entity = mapper.selectOne(
......@@ -135,8 +129,7 @@ public class SpaceCalibrationService {
ServiceUtil.getPowerLineNameById(context, lineId)
);
output.setOuName(
// ServiceUtil.getSysOrgNameById(context, ouId)
"测试"
ServiceUtil.getSysOrgNameById(context, ouId)
);
return XSingleResult.success(output);
}
......
......@@ -57,10 +57,7 @@ public class SpaceInstitutionDetailService {
@XApiPost
@XText("基础间开配置--新增")
public XServiceResult createSpaceInstitutionDetail(XContext context, CreateSpaceInstitutionDetailInput input) {
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
return XTransactionHelper.begin(context, () -> {
//新增间开配置
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
......@@ -88,10 +85,7 @@ public class SpaceInstitutionDetailService {
@XApiPost
@XText("基础间开配置--修改")
public XServiceResult updateSpaceInstitutionDetail(XContext context, UpdateSpaceInstitutionDetailInput input) {
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
// PpsUserSession session = context.getSession(PpsUserSession.class);
PpsUserSession session = context.getSession(PpsUserSession.class);
String institutionId = input.getId();
return XTransactionHelper.begin(context, () -> {
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
......@@ -119,10 +113,6 @@ public class SpaceInstitutionDetailService {
@XApiPost
@XText("基础间开配置--删除")
public XServiceResult deleteSpaceInstitutionDetail(XContext context, DeleteSpaceInstitutionDetailInput input) {
PpsUserSession session = new PpsUserSession();
session.setId("123");
session.setUserName("ceshi");
// PpsUserSession session = context.getSession(PpsUserSession.class);
String institutionId = input.getId();
return XTransactionHelper.begin(context, () -> {
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
......@@ -134,6 +124,7 @@ public class SpaceInstitutionDetailService {
if (isCurrentBasic.equals(0)) {
return XServiceResult.error(992, "基础制度无法删除");
}
PpsUserSession session = context.getSession(PpsUserSession.class);
SpaceInstitutionDurationMapper durationMapper = context.getBean(SpaceInstitutionDurationMapper.class);
durationMapper.update(null, new LambdaUpdateWrapper<SpaceInstitutionDurationEnt>()
.eq(SpaceInstitutionDurationEnt::getInstitutionId, institutionId)
......
......@@ -14,6 +14,7 @@ import xstartup.annotation.XText;
public class CreateSpaceCalibrationPeriodInput {
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("线路ID")
......
......@@ -14,6 +14,7 @@ import xstartup.annotation.XText;
public class GetSpaceCalibrationPeriodViewInput {
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("线路ID")
......
......@@ -18,6 +18,7 @@ public class UpdateSpaceCalibrationPeriodInput {
private String id;
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("线路ID")
......
......@@ -19,6 +19,7 @@ import java.util.List;
public class CreateSpaceInstitutionDetailInput {
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("线路ID")
......
......@@ -22,6 +22,7 @@ public class UpdateSpaceInstitutionDetailInput {
private String id;
@XText("组织机构ID")
@NotBlank(message = "缺少组织机构ID")
private String ouId;
@XText("线路ID")
......
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