Commit 2f8e3a65 authored by ZWT's avatar ZWT

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

1.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,优化查询sql逻辑;
2.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,修改井口视图增加间开类型和运行类型字段;
3.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,修改井口视图增加没有区间配置的井口设置默认全关;
4.修改间开制度管理-短期极端天气优化模块,查询优化详情接口,修改井口视图增加字段同时修改代码逻辑,增加大间开类型井口启动时间初始化计算逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d608aed1
...@@ -16,6 +16,7 @@ public enum BusinessError implements XError { ...@@ -16,6 +16,7 @@ public enum BusinessError implements XError {
DidNotFindPlant(2104, "未发现可用光伏电站"), DidNotFindPlant(2104, "未发现可用光伏电站"),
DidNotFindCalibration(2105, "未发现可用周期配置"), DidNotFindCalibration(2105, "未发现可用周期配置"),
UnableToOptimize(2106, "无法优化"), UnableToOptimize(2106, "无法优化"),
LackOfHistoryRecord(2107, "缺少历史记录"),
; ;
private int code; private int code;
......
...@@ -10,15 +10,9 @@ import pps.core.common.constant.BusinessConstant; ...@@ -10,15 +10,9 @@ import pps.core.common.constant.BusinessConstant;
import pps.core.common.entity.BaseModel; import pps.core.common.entity.BaseModel;
import pps.core.common.session.PpsUserSession; 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.*;
import pps.core.space.entity.SpaceCalibrationPeriodEnt;
import pps.core.space.entity.SpaceInstitutionDetailEnt;
import pps.core.space.entity.SpaceInstitutionWellheadEnt;
import pps.core.space.enums.BusinessError; import pps.core.space.enums.BusinessError;
import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper; import pps.core.space.mapper.*;
import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
import pps.core.space.mapper.SpaceInstitutionDetailMapper;
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.QuerySpaceCalibrationHistoryInput;
import pps.core.space.service.data.space_calibration_history.QuerySpaceCalibrationHistoryOutput; 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;
...@@ -27,6 +21,8 @@ import pps.core.space.service.data.space_calibration_period.CreateSpaceCalibrati ...@@ -27,6 +21,8 @@ import pps.core.space.service.data.space_calibration_period.CreateSpaceCalibrati
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.GetSpaceInstitutionWellheadInput;
import pps.core.space.service.data.space_institution_wellhead.GetSpaceInstitutionWellheadOutput;
import pps.core.space.service.data.space_institution_wellhead.QuerySpaceInstitutionWellheadOutput; 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;
...@@ -225,6 +221,35 @@ public class SpaceCalibrationService { ...@@ -225,6 +221,35 @@ public class SpaceCalibrationService {
return XSingleResult.success(output); return XSingleResult.success(output);
} }
/**
* 校准周期--间开制度跟踪
*
* @param context 上下文
* @param input 输入
* @return {@link XSingleResult}<{@link GetSpaceInstitutionWellheadOutput}>
*/
@XApiAnonymous
@XApiGet
@XText("校准周期--间开制度跟踪")
public XSingleResult<GetSpaceInstitutionWellheadOutput> getSpaceInstitutionTrack(XContext context, GetSpaceInstitutionWellheadInput input) {
DateTime beginOfDay = DateUtil.beginOfDay(DateUtil.date());
Date inputDate = input.getDate();
//查历史记录
SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class);
SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(input.getCalibrationId());
if (Objects.isNull(historyEnt)) {
//缺少历史记录
return XSingleResult.error(context, BusinessError.LackOfHistoryRecord);
}
if (beginOfDay.compareTo(inputDate) < 0) {
//日期小于当天,查短期优化数据
} else {
//日期大于等于当天,查中短期/长期优化数据
}
return XSingleResult.success();
}
/*-----------------------------------private-----------------------------------*/ /*-----------------------------------private-----------------------------------*/
/** /**
......
package pps.core.space.service.data.space_institution_wellhead;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import xstartup.annotation.XText;
import java.util.Date;
/**
* 间开制度井口配置
*
* @author ZWT
* @date 2023/09/05
*/
@Data
public class GetSpaceInstitutionWellheadInput {
@XText("井口ID")
@NotBlank(message = "缺少井口ID")
private String wellheadId;
@XText("校准周期ID")
@NotBlank(message = "缺少校准周期ID")
private String calibrationId;
@XText("日期")
@NotNull(message = "缺少日期")
private Date date;
}
package pps.core.space.service.data.space_institution_wellhead;
import lombok.Data;
import pps.core.space.service.data.SpaceOptimizeDateDuration;
import xstartup.annotation.XText;
import java.util.List;
/**
* 间开制度井口配置
*
* @author ZWT
* @date 2023/09/05
*/
@Data
public class GetSpaceInstitutionWellheadOutput {
@XText("井口ID")
private String wellheadId;
@XText("井号")
private String wellNumber;
/**
* 井口时段配置
*/
@XText("井口时段配置")
private List<SpaceOptimizeDateDuration> durationList;
}
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