Commit 04a56045 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d81cbf34
...@@ -2,7 +2,6 @@ package pps.core.space.service; ...@@ -2,7 +2,6 @@ package pps.core.space.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -12,22 +11,21 @@ import pps.core.common.entity.BaseModel; ...@@ -12,22 +11,21 @@ import pps.core.common.entity.BaseModel;
import pps.core.space.entity.*; import pps.core.space.entity.*;
import pps.core.space.mapper.*; import pps.core.space.mapper.*;
import pps.core.space.service.data.space_optimize_long_duration.GetSpaceOptimizeLongDurationOutput; import pps.core.space.service.data.space_optimize_long_duration.GetSpaceOptimizeLongDurationOutput;
import pps.core.space.service.data.space_optimize_long_period.*; import pps.core.space.service.data.space_optimize_long_period.GetSpaceOptimizeLongPeriodViewInput;
import pps.core.space.service.data.space_optimize_long_period.GetSpaceOptimizeLongPeriodViewOutput;
import pps.core.space.service.data.space_optimize_long_period.QuerySpaceOptimizeLongPeriodViewInput;
import pps.core.space.service.data.space_optimize_long_period.QuerySpaceOptimizeLongPeriodViewOutput;
import pps.core.space.service.data.space_optimize_long_wellhead.GetSpaceOptimizeLongWellheadOutput; import pps.core.space.service.data.space_optimize_long_wellhead.GetSpaceOptimizeLongWellheadOutput;
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;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils; import xstartup.base.util.XCopyUtils;
import xstartup.data.XPageResult; import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult; import xstartup.data.XSingleResult;
import xstartup.error.XError; import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous; import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet; import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -143,87 +141,4 @@ public class SpaceOptimizeLongPeriodService { ...@@ -143,87 +141,4 @@ public class SpaceOptimizeLongPeriodService {
} }
return XSingleResult.success(output); return XSingleResult.success(output);
} }
}
\ No newline at end of file
@XApiAnonymous
@XApiPost
public XServiceResult createSpaceOptimizeLongPeriod(XContext context, CreateSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
SpaceOptimizeLongPeriodEnt entity = new SpaceOptimizeLongPeriodEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateSpaceOptimizeLongPeriod(XContext context, UpdateSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongPeriodEnt::getId, input.getId());
SpaceOptimizeLongPeriodEnt 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 deleteSpaceOptimizeLongPeriod(XContext context, DeleteSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongPeriodEnt::getId, input.getId());
SpaceOptimizeLongPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetSpaceOptimizeLongPeriodOutput> getSpaceOptimizeLongPeriod(XContext context, GetSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongPeriodEnt::getId, input.getId());
SpaceOptimizeLongPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceOptimizeLongPeriodOutput output = new GetSpaceOptimizeLongPeriodOutput();
XCopyUtils.copyObject(entity, output);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeLongPeriodOutput> querySpaceOptimizeLongPeriod(XContext context, QuerySpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeLongPeriodEnt::getId, input.getId())
.eq(SpaceOptimizeLongPeriodEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeLongPeriodEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeLongPeriodEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeLongPeriodEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeLongPeriodEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeLongPeriodEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeLongPeriodEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeLongPeriodEnt::getLineId, input.getLineId())
.like(SpaceOptimizeLongPeriodEnt::getInstitutionId, input.getInstitutionId())
.like(SpaceOptimizeLongPeriodEnt::getExecutionCycle, input.getExecutionCycle())
.eq(SpaceOptimizeLongPeriodEnt::getOptimizeState, input.getOptimizeState())
.eq(SpaceOptimizeLongPeriodEnt::getOptimizeDeadline, input.getOptimizeDeadline());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeLongPeriodOutput.class);
}
@XApiAnonymous
@XApiGet
public XPageResult<QuerySpaceOptimizeLongPeriodOutput> dynamicQuerySpaceOptimizeLongPeriod(XContext context, CustomQueryInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongPeriodEnt.class, QuerySpaceOptimizeLongPeriodOutput.class);
}
}
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