Skip to content

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

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

1.修改间开制度管理模块实体;
2.开发长期间开优化模块-长期优化分页列表接口,完成接口冒烟测试并生成接口文档;
3.开发长期间开优化模块-详情接口,完成接口冒烟测试并生成接口文档;
4.开发市电峰谷配置Cloud模块-查询策略配置详情列表接口;
5.修改开发长期间开优化模块-详情接口,添加获取策略配置详情列表逻辑,完成接口冒烟测试并生成接口文档;
6.开发中短期间开优化模块-中短期优化分页列表接口,完成接口冒烟测试并生成接口文档;
7.开发中短期间开优化模块-中短期优化详情接口,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 591d2c56
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 276 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortDurationMapper.java
View file @ 9183881c
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
/**
* 短期间开优化井口制度记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortDurationMapper")
public interface SpaceOptimizeShortDurationMapper extends BaseMapper<SpaceOptimizeShortDurationEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortDurationViewMapper.java
View file @ 9183881c
......@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceOptimizeShortDurationView;
import java.util.List;
/**
* 短期间开优化井口制度记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper")
public interface SpaceOptimizeShortDurationViewMapper {
SpaceOptimizeShortDurationView selectOne(SpaceOptimizeShortDurationView record);
......
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortPeriodMapper.java
View file @ 9183881c
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortPeriodEnt;
/**
* 短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortPeriodMapper")
public interface SpaceOptimizeShortPeriodMapper extends BaseMapper<SpaceOptimizeShortPeriodEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortPeriodViewMapper.java
View file @ 9183881c
......@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceOptimizeShortPeriodView;
import java.util.List;
/**
* 短期间开优化周期记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortPeriodViewMapper")
public interface SpaceOptimizeShortPeriodViewMapper {
SpaceOptimizeShortPeriodView selectOne(SpaceOptimizeShortPeriodView record);
......
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortWellheadMapper.java
View file @ 9183881c
......@@ -4,6 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
/**
* 短期间开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortWellheadMapper")
public interface SpaceOptimizeShortWellheadMapper extends BaseMapper<SpaceOptimizeShortWellheadEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortWellheadViewMapper.java
View file @ 9183881c
......@@ -5,6 +5,12 @@ import pps.core.space.entity.SpaceOptimizeShortWellheadView;
import java.util.List;
/**
* 短期间开优化井口记录
*
* @author ZWT
* @date 2023/09/07
*/
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortWellheadViewMapper")
public interface SpaceOptimizeShortWellheadViewMapper {
SpaceOptimizeShortWellheadView selectOne(SpaceOptimizeShortWellheadView record);
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortDurationService.java deleted 100644 → 0
View file @ 591d2c56
package pps.core.space.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
import pps.core.space.entity.SpaceOptimizeShortDurationView;
import pps.core.space.mapper.SpaceOptimizeShortDurationMapper;
import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
import pps.core.space.service.data.space_optimize_short_duration.*;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List;
@XService
public class SpaceOptimizeShortDurationService {
@XApiAnonymous
@XApiPost
public XServiceResult createSpaceOptimizeShortDuration(XContext context, CreateSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
SpaceOptimizeShortDurationEnt entity = new SpaceOptimizeShortDurationEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateSpaceOptimizeShortDuration(XContext context, UpdateSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDurationEnt::getId, input.getId());
SpaceOptimizeShortDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
mapper.updateById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult deleteSpaceOptimizeShortDuration(XContext context, DeleteSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDurationEnt::getId, input.getId());
SpaceOptimizeShortDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortDurationOutput> getSpaceOptimizeShortDuration(XContext context, GetSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDurationEnt::getId, input.getId());
SpaceOptimizeShortDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortDurationOutput output = new GetSpaceOptimizeShortDurationOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationOutput> querySpaceOptimizeShortDuration(XContext context, QuerySpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortDurationEnt::getId, input.getId())
.eq(SpaceOptimizeShortDurationEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortDurationEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortDurationEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortDurationEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortDurationEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortDurationEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortDurationEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortDurationEnt::getRecordId, input.getRecordId())
.like(SpaceOptimizeShortDurationEnt::getShortPeriodId, input.getShortPeriodId())
.like(SpaceOptimizeShortDurationEnt::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeShortDurationEnt::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeShortDurationEnt::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeShortDurationEnt::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeShortDurationEnt::getCloseWellTime, input.getCloseWellTime());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeShortDurationOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationOutput> dynamicQuerySpaceOptimizeShortDuration(XContext context, CustomQueryInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortDurationEnt.class, QuerySpaceOptimizeShortDurationOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortDurationViewOutput> getSpaceOptimizeShortDurationView(XContext context, GetSpaceOptimizeShortDurationViewInput input) {
SpaceOptimizeShortDurationViewMapper mapper = context.getBean(SpaceOptimizeShortDurationViewMapper.class);
SpaceOptimizeShortDurationView record = new SpaceOptimizeShortDurationView();
XCopyUtils.copyObject(input, record);
SpaceOptimizeShortDurationView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortDurationViewOutput output = new GetSpaceOptimizeShortDurationViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationViewOutput> querySpaceOptimizeShortDurationView(XContext context, QuerySpaceOptimizeShortDurationViewInput input) {
SpaceOptimizeShortDurationViewMapper mapper = context.getBean(SpaceOptimizeShortDurationViewMapper.class);
SpaceOptimizeShortDurationView record = new SpaceOptimizeShortDurationView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<SpaceOptimizeShortDurationView> list = mapper.selectList(record);
PageInfo<SpaceOptimizeShortDurationView> pageInfo = new PageInfo<>(list);
List<QuerySpaceOptimizeShortDurationViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceOptimizeShortDurationViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortPeriodService.java
View file @ 9183881c
......@@ -9,6 +9,7 @@ import pps.core.space.mapper.SpaceOptimizeShortPeriodMapper;
import pps.core.space.mapper.SpaceOptimizeShortPeriodViewMapper;
import pps.core.space.service.data.space_optimize_short_period.*;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
......@@ -23,8 +24,16 @@ import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List;
/**
* 短期间开优化模块
*
* @author ZWT
* @date 2023/09/07
*/
@XService
@XText("短期间开优化模块")
public class SpaceOptimizeShortPeriodService {
@XApiAnonymous
@XApiPost
public XServiceResult createSpaceOptimizeShortPeriod(XContext context, CreateSpaceOptimizeShortPeriodInput input) {
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortWellheadService.java deleted 100644 → 0
View file @ 591d2c56
package pps.core.space.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
import pps.core.space.entity.SpaceOptimizeShortWellheadView;
import pps.core.space.mapper.SpaceOptimizeShortWellheadMapper;
import pps.core.space.mapper.SpaceOptimizeShortWellheadViewMapper;
import pps.core.space.service.data.space_optimize_short_wellhead.*;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.List;
@XService
public class SpaceOptimizeShortWellheadService {
@XApiAnonymous
@XApiPost
public XServiceResult createSpaceOptimizeShortWellhead(XContext context, CreateSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
SpaceOptimizeShortWellheadEnt entity = new SpaceOptimizeShortWellheadEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateSpaceOptimizeShortWellhead(XContext context, UpdateSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellheadEnt::getId, input.getId());
SpaceOptimizeShortWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
mapper.updateById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult deleteSpaceOptimizeShortWellhead(XContext context, DeleteSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellheadEnt::getId, input.getId());
SpaceOptimizeShortWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortWellheadOutput> getSpaceOptimizeShortWellhead(XContext context, GetSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellheadEnt::getId, input.getId());
SpaceOptimizeShortWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortWellheadOutput output = new GetSpaceOptimizeShortWellheadOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadOutput> querySpaceOptimizeShortWellhead(XContext context, QuerySpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortWellheadEnt::getId, input.getId())
.eq(SpaceOptimizeShortWellheadEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortWellheadEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortWellheadEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortWellheadEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortWellheadEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortWellheadEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortWellheadEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortWellheadEnt::getShortPeriodId, input.getShortPeriodId())
.like(SpaceOptimizeShortWellheadEnt::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeShortWellheadEnt::getWellNumber, input.getWellNumber());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeShortWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadOutput> dynamicQuerySpaceOptimizeShortWellhead(XContext context, CustomQueryInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortWellheadEnt.class, QuerySpaceOptimizeShortWellheadOutput.class);
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeShortWellheadViewOutput> getSpaceOptimizeShortWellheadView(XContext context, GetSpaceOptimizeShortWellheadViewInput input) {
SpaceOptimizeShortWellheadViewMapper mapper = context.getBean(SpaceOptimizeShortWellheadViewMapper.class);
SpaceOptimizeShortWellheadView record = new SpaceOptimizeShortWellheadView();
XCopyUtils.copyObject(input, record);
SpaceOptimizeShortWellheadView view = mapper.selectOne(record);
if (view == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeShortWellheadViewOutput output = new GetSpaceOptimizeShortWellheadViewOutput();
XCopyUtils.copyObject(view, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadViewOutput> querySpaceOptimizeShortWellheadView(XContext context, QuerySpaceOptimizeShortWellheadViewInput input) {
SpaceOptimizeShortWellheadViewMapper mapper = context.getBean(SpaceOptimizeShortWellheadViewMapper.class);
SpaceOptimizeShortWellheadView record = new SpaceOptimizeShortWellheadView();
XCopyUtils.copyObject(input, record);
PageHelper.startPage(input.getPage(), input.getLimit());
List<SpaceOptimizeShortWellheadView> list = mapper.selectList(record);
PageInfo<SpaceOptimizeShortWellheadView> pageInfo = new PageInfo<>(list);
List<QuerySpaceOptimizeShortWellheadViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QuerySpaceOptimizeShortWellheadViewOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
}
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