Commit dff7f62f authored by ZWT's avatar ZWT

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

1.开发定期校准模块-校准周期新增接口,完成接口冒烟测试并生成接口文档;
2.开发定期校准模块-校准周期修改接口,完成接口冒烟测试并生成接口文档;
3.开发定期校准模块-校准周期详情接口,完成接口冒烟测试并生成接口文档;
4.开发定期校准模块-校准历史分页列表接口,完成接口冒烟测试并生成接口文档;
5.开发定期校准模块-校准历史获取线路及井口树接口,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 75fe85ff
...@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceInstitutionDetailView; ...@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceInstitutionDetailView;
import java.util.List; import java.util.List;
/**
* 基础间开配置
*
* @author ZWT
* @date 2023/09/06
*/
@Repository(value = "pps.core.space.mapper.SpaceInstitutionDetailViewMapper") @Repository(value = "pps.core.space.mapper.SpaceInstitutionDetailViewMapper")
public interface SpaceInstitutionDetailViewMapper { public interface SpaceInstitutionDetailViewMapper {
SpaceInstitutionDetailView selectOne(SpaceInstitutionDetailView record); SpaceInstitutionDetailView selectOne(SpaceInstitutionDetailView record);
......
...@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceInstitutionDurationView; ...@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceInstitutionDurationView;
import java.util.List; import java.util.List;
/**
* 间开制度小间开时段配置
*
* @author ZWT
* @date 2023/09/06
*/
@Repository(value = "pps.core.space.mapper.SpaceInstitutionDurationViewMapper") @Repository(value = "pps.core.space.mapper.SpaceInstitutionDurationViewMapper")
public interface SpaceInstitutionDurationViewMapper { public interface SpaceInstitutionDurationViewMapper {
SpaceInstitutionDurationView selectOne(SpaceInstitutionDurationView record); SpaceInstitutionDurationView selectOne(SpaceInstitutionDurationView record);
......
...@@ -10,14 +10,19 @@ import pps.core.common.session.PpsUserSession; ...@@ -10,14 +10,19 @@ import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseUtils; import pps.core.common.utils.BaseUtils;
import pps.core.space.entity.SpaceCalibrationHistoryView; import pps.core.space.entity.SpaceCalibrationHistoryView;
import pps.core.space.entity.SpaceCalibrationPeriodEnt; import pps.core.space.entity.SpaceCalibrationPeriodEnt;
import pps.core.space.entity.SpaceInstitutionWellheadEnt;
import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper; import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper;
import pps.core.space.mapper.SpaceCalibrationPeriodMapper; import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
import pps.core.space.mapper.SpaceInstitutionWellheadMapper;
import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryInput;
import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryOutput;
import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryViewInput; import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryViewInput;
import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryViewOutput; import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryViewOutput;
import pps.core.space.service.data.space_calibration_period.CreateSpaceCalibrationPeriodInput; import pps.core.space.service.data.space_calibration_period.CreateSpaceCalibrationPeriodInput;
import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewInput; import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewInput;
import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewOutput; import pps.core.space.service.data.space_calibration_period.GetSpaceCalibrationPeriodViewOutput;
import pps.core.space.service.data.space_calibration_period.UpdateSpaceCalibrationPeriodInput; import pps.core.space.service.data.space_calibration_period.UpdateSpaceCalibrationPeriodInput;
import pps.core.space.service.data.space_institution_wellhead.QuerySpaceInstitutionWellheadOutput;
import pps.core.space.utils.ServiceUtil; import pps.core.space.utils.ServiceUtil;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
...@@ -32,6 +37,7 @@ import xstartup.feature.api.annotation.XApiGet; ...@@ -32,6 +37,7 @@ 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;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
...@@ -168,6 +174,37 @@ public class SpaceCalibrationService { ...@@ -168,6 +174,37 @@ public class SpaceCalibrationService {
return XPageResult.success(outputs, input, pageInfo.getTotal()); return XPageResult.success(outputs, input, pageInfo.getTotal());
} }
/**
* 校准周期--获取线路及井口树
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link QuerySpaceCalibrationHistoryOutput}>
*/
@XApiAnonymous
@XApiGet
@XText("校准周期--获取线路及井口树")
public XSingleResult<QuerySpaceCalibrationHistoryOutput> querySpaceCalibrationLineView(XContext context, QuerySpaceCalibrationHistoryInput input) {
QuerySpaceCalibrationHistoryOutput output = new QuerySpaceCalibrationHistoryOutput();
String institutionId = input.getInstitutionId();
String lineId = input.getLineId();
SpaceInstitutionWellheadMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadMapper.class);
//查井口列表
List<SpaceInstitutionWellheadEnt> wellheadEntList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceInstitutionWellheadEnt>()
.eq(SpaceInstitutionWellheadEnt::getInstitutionId, institutionId)
.orderByAsc(SpaceInstitutionWellheadEnt::getStartSeq)
);
if (CollUtil.isNotEmpty(wellheadEntList)) {
output.setWellheadList(XCopyUtils.copyNewList(wellheadEntList, QuerySpaceInstitutionWellheadOutput.class));
} else {
output.setWellheadList(new ArrayList<>(0));
}
output.setInstitutionId(institutionId);
output.setLineId(lineId);
output.setLineName(ServiceUtil.getPowerLineNameById(context, lineId));
return XSingleResult.success(output);
}
/*-----------------------------------private-----------------------------------*/ /*-----------------------------------private-----------------------------------*/
/** /**
......
package pps.core.space.service.data.space_calibration_history;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 校准历史
*
* @author ZWT
* @date 2023/09/06
*/
@Data
public class QuerySpaceCalibrationHistoryInput {
@XText("间开制度ID")
@NotBlank(message = "缺少间开制度ID")
private String institutionId;
@XText("线路ID")
@NotBlank(message = "缺少线路ID")
private String lineId;
}
package pps.core.space.service.data.space_calibration_history;
import lombok.Data;
import pps.core.space.service.data.space_institution_wellhead.QuerySpaceInstitutionWellheadOutput;
import xstartup.annotation.XText;
import java.util.List;
/**
* 校准历史
*
* @author ZWT
* @date 2023/09/06
*/
@Data
public class QuerySpaceCalibrationHistoryOutput {
@XText("线路ID")
private String lineId;
@XText("间开制度ID")
private String institutionId;
/**
* 线路名称
*/
@XText("线路名称")
private String lineName;
/**
* 间开制度井口配置
*/
@XText("间开制度井口配置")
private List<QuerySpaceInstitutionWellheadOutput> wellheadList;
}
...@@ -62,5 +62,5 @@ public class GetSpaceInstitutionDetailViewOutput { ...@@ -62,5 +62,5 @@ public class GetSpaceInstitutionDetailViewOutput {
* 间开制度井口配置 * 间开制度井口配置
*/ */
@XText("间开制度井口配置") @XText("间开制度井口配置")
List<GetSpaceInstitutionWellheadViewOutput> wellheadList; private List<GetSpaceInstitutionWellheadViewOutput> wellheadList;
} }
package pps.core.space.service.data.space_institution_wellhead;
import lombok.Data;
import xstartup.annotation.XText;
/**
* 间开制度井口配置
*
* @author ZWT
* @date 2023/09/06
*/
@Data
public class QuerySpaceInstitutionWellheadOutput {
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
@XText("运行类型key(字典获取)")
private String runTypeKey;
@XText("间开类型key(字典获取)")
private String intervalTypeKey;
@XText("启动顺序")
private Integer startSeq;
}
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