Skip to content

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

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

1.新建数据库表:
	基础间开:
		space_institution_institution
间开制度详情
		space_institution_wellhead
间开制度井口配置
		space_institution_duration
间开制度小间开时段配置

	定期校准:
		space_calibration_period
周期设定
		space_calibration_history
执行历史

	长期:
		space_optimize_long_period	长期间开优化周期记录
		space_optimize_long_wellhead
长期间开优化井口记录
		space_optimize_long_duration
长期间开优化井口制度记录

	中短期:
		space_optimize_mid_period
中短期间开优化周期记录
		space_optimize_mid_wellhead
中短期间开优化井口记录
		space_optimize_mid_duration
中短期间开优化井口制度记录

	短期:
		space_optimize_short_period
短期间开优化周期记录
		space_optimize_short_wellhead
短期间开优化井口记录
		space_optimize_short_duration 短期间开优化井口制度记录
2.生成代码

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 05912478
Show whitespace changes
Inline Side-by-side
Showing with 365 additions and 358 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationHistory.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationHistoryEnt.java
View file @ bfc386d0
......@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@TableName("space_calibration_history")
public class SpaceCalibrationHistory extends BaseModel implements Serializable {
public class SpaceCalibrationHistoryEnt extends BaseModel implements Serializable {
@XText("线路ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationPeriod.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceCalibrationPeriodEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_calibration_period")
public class SpaceCalibrationPeriod extends BaseModel implements Serializable {
public class SpaceCalibrationPeriodEnt extends BaseModel implements Serializable {
@XText("线路ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionDuration.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionDurationEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_institution_duration")
public class SpaceInstitutionDuration extends BaseModel implements Serializable {
public class SpaceInstitutionDurationEnt extends BaseModel implements Serializable {
@XText("间开制度ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionInstitution.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionInstitutionEnt.java
View file @ bfc386d0
......@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@TableName("space_institution_institution")
public class SpaceInstitutionInstitution extends BaseModel implements Serializable {
public class SpaceInstitutionInstitutionEnt extends BaseModel implements Serializable {
@XText("组织机构ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionWellhead.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionWellheadEnt.java
View file @ bfc386d0
......@@ -17,7 +17,7 @@ import java.math.BigDecimal;
*/
@Data
@TableName("space_institution_wellhead")
public class SpaceInstitutionWellhead extends BaseModel implements Serializable {
public class SpaceInstitutionWellheadEnt extends BaseModel implements Serializable {
@XText("间开制度ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceInstitutionWellheadView.java
View file @ bfc386d0
......@@ -63,5 +63,5 @@ public class SpaceInstitutionWellheadView extends BaseModel implements Serializa
*/
@XText("启动间隔(分钟)")
@TableField(exist = false)
private List<SpaceInstitutionDuration> durationList;
private List<SpaceInstitutionDurationEnt> durationList;
}
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongDuration.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongDurationEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_optimize_long_duration")
public class SpaceOptimizeLongDuration extends BaseModel implements Serializable {
public class SpaceOptimizeLongDurationEnt extends BaseModel implements Serializable {
@XText("井口记录ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongPeriod.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongPeriodEnt.java
View file @ bfc386d0
......@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@TableName("space_optimize_long_period")
public class SpaceOptimizeLongPeriod extends BaseModel implements Serializable {
public class SpaceOptimizeLongPeriodEnt extends BaseModel implements Serializable {
@XText("线路ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongWellhead.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeLongWellheadEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_optimize_long_wellhead")
public class SpaceOptimizeLongWellhead extends BaseModel implements Serializable {
public class SpaceOptimizeLongWellheadEnt extends BaseModel implements Serializable {
@XText("长期优化周期ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidDuration.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidDurationEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_optimize_mid_duration")
public class SpaceOptimizeMidDuration extends BaseModel implements Serializable {
public class SpaceOptimizeMidDurationEnt extends BaseModel implements Serializable {
@XText("井口记录ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidPeriod.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidPeriodEnt.java
View file @ bfc386d0
......@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@TableName("space_optimize_mid_period")
public class SpaceOptimizeMidPeriod extends BaseModel implements Serializable {
public class SpaceOptimizeMidPeriodEnt extends BaseModel implements Serializable {
@XText("线路ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidWellhead.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeMidWellheadEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_optimize_mid_wellhead")
public class SpaceOptimizeMidWellhead extends BaseModel implements Serializable {
public class SpaceOptimizeMidWellheadEnt extends BaseModel implements Serializable {
@XText("中短期优化周期ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortDuration.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortDurationEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_optimize_short_duration")
public class SpaceOptimizeShortDuration extends BaseModel implements Serializable {
public class SpaceOptimizeShortDurationEnt extends BaseModel implements Serializable {
@XText("井口记录ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortPeriod.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortPeriodEnt.java
View file @ bfc386d0
......@@ -17,7 +17,7 @@ import java.util.Date;
*/
@Data
@TableName("space_optimize_short_period")
public class SpaceOptimizeShortPeriod extends BaseModel implements Serializable {
public class SpaceOptimizeShortPeriodEnt extends BaseModel implements Serializable {
@XText("线路ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortWellhead.java → C11-space/pps-core-space/src/main/java/pps/core/space/entity/SpaceOptimizeShortWellheadEnt.java
View file @ bfc386d0
......@@ -16,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@TableName("space_optimize_short_wellhead")
public class SpaceOptimizeShortWellhead extends BaseModel implements Serializable {
public class SpaceOptimizeShortWellheadEnt extends BaseModel implements Serializable {
@XText("短期优化周期ID")
@TableField
......
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceCalibrationHistoryMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceCalibrationHistory;
import pps.core.space.entity.SpaceCalibrationHistoryEnt;
@Repository(value = "pps.core.space.mapper.SpaceCalibrationHistoryMapper")
public interface SpaceCalibrationHistoryMapper extends BaseMapper<SpaceCalibrationHistory> {
public interface SpaceCalibrationHistoryMapper extends BaseMapper<SpaceCalibrationHistoryEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceCalibrationPeriodMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceCalibrationPeriod;
import pps.core.space.entity.SpaceCalibrationPeriodEnt;
@Repository(value = "pps.core.space.mapper.SpaceCalibrationPeriodMapper")
public interface SpaceCalibrationPeriodMapper extends BaseMapper<SpaceCalibrationPeriod> {
public interface SpaceCalibrationPeriodMapper extends BaseMapper<SpaceCalibrationPeriodEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionDurationMapper.java
View file @ bfc386d0
......@@ -2,8 +2,14 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceInstitutionDuration;
import pps.core.space.entity.SpaceInstitutionDurationEnt;
/**
* 间开制度小间开时段配置
*
* @author ZWT
* @date 2023/09/05
*/
@Repository(value = "pps.core.space.mapper.SpaceInstitutionDurationMapper")
public interface SpaceInstitutionDurationMapper extends BaseMapper<SpaceInstitutionDuration> {
public interface SpaceInstitutionDurationMapper extends BaseMapper<SpaceInstitutionDurationEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionInstitutionMapper.java
View file @ bfc386d0
......@@ -2,7 +2,7 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceInstitutionInstitution;
import pps.core.space.entity.SpaceInstitutionInstitutionEnt;
/**
* 基础间开配置
......@@ -11,5 +11,5 @@ import pps.core.space.entity.SpaceInstitutionInstitution;
* @date 2023/09/05
*/
@Repository(value = "pps.core.space.mapper.SpaceInstitutionInstitutionMapper")
public interface SpaceInstitutionInstitutionMapper extends BaseMapper<SpaceInstitutionInstitution> {
public interface SpaceInstitutionInstitutionMapper extends BaseMapper<SpaceInstitutionInstitutionEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceInstitutionWellheadMapper.java
View file @ bfc386d0
......@@ -2,7 +2,7 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceInstitutionWellhead;
import pps.core.space.entity.SpaceInstitutionWellheadEnt;
/**
* 间开制度井口配置
......@@ -11,5 +11,5 @@ import pps.core.space.entity.SpaceInstitutionWellhead;
* @date 2023/09/05
*/
@Repository(value = "pps.core.space.mapper.SpaceInstitutionWellheadMapper")
public interface SpaceInstitutionWellheadMapper extends BaseMapper<SpaceInstitutionWellhead> {
public interface SpaceInstitutionWellheadMapper extends BaseMapper<SpaceInstitutionWellheadEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeLongDurationMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeLongDuration;
import pps.core.space.entity.SpaceOptimizeLongDurationEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeLongDurationMapper")
public interface SpaceOptimizeLongDurationMapper extends BaseMapper<SpaceOptimizeLongDuration> {
public interface SpaceOptimizeLongDurationMapper extends BaseMapper<SpaceOptimizeLongDurationEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeLongPeriodMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeLongPeriod;
import pps.core.space.entity.SpaceOptimizeLongPeriodEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeLongPeriodMapper")
public interface SpaceOptimizeLongPeriodMapper extends BaseMapper<SpaceOptimizeLongPeriod> {
public interface SpaceOptimizeLongPeriodMapper extends BaseMapper<SpaceOptimizeLongPeriodEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeLongWellheadMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeLongWellhead;
import pps.core.space.entity.SpaceOptimizeLongWellheadEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeLongWellheadMapper")
public interface SpaceOptimizeLongWellheadMapper extends BaseMapper<SpaceOptimizeLongWellhead> {
public interface SpaceOptimizeLongWellheadMapper extends BaseMapper<SpaceOptimizeLongWellheadEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeMidDurationMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeMidDuration;
import pps.core.space.entity.SpaceOptimizeMidDurationEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeMidDurationMapper")
public interface SpaceOptimizeMidDurationMapper extends BaseMapper<SpaceOptimizeMidDuration> {
public interface SpaceOptimizeMidDurationMapper extends BaseMapper<SpaceOptimizeMidDurationEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeMidPeriodMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeMidPeriod;
import pps.core.space.entity.SpaceOptimizeMidPeriodEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeMidPeriodMapper")
public interface SpaceOptimizeMidPeriodMapper extends BaseMapper<SpaceOptimizeMidPeriod> {
public interface SpaceOptimizeMidPeriodMapper extends BaseMapper<SpaceOptimizeMidPeriodEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeMidWellheadMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeMidWellhead;
import pps.core.space.entity.SpaceOptimizeMidWellheadEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeMidWellheadMapper")
public interface SpaceOptimizeMidWellheadMapper extends BaseMapper<SpaceOptimizeMidWellhead> {
public interface SpaceOptimizeMidWellheadMapper extends BaseMapper<SpaceOptimizeMidWellheadEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortDurationMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortDuration;
import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortDurationMapper")
public interface SpaceOptimizeShortDurationMapper extends BaseMapper<SpaceOptimizeShortDuration> {
public interface SpaceOptimizeShortDurationMapper extends BaseMapper<SpaceOptimizeShortDurationEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortPeriodMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortPeriod;
import pps.core.space.entity.SpaceOptimizeShortPeriodEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortPeriodMapper")
public interface SpaceOptimizeShortPeriodMapper extends BaseMapper<SpaceOptimizeShortPeriod> {
public interface SpaceOptimizeShortPeriodMapper extends BaseMapper<SpaceOptimizeShortPeriodEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/mapper/SpaceOptimizeShortWellheadMapper.java
View file @ bfc386d0
......@@ -2,8 +2,8 @@ package pps.core.space.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository;
import pps.core.space.entity.SpaceOptimizeShortWellhead;
import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
@Repository(value = "pps.core.space.mapper.SpaceOptimizeShortWellheadMapper")
public interface SpaceOptimizeShortWellheadMapper extends BaseMapper<SpaceOptimizeShortWellhead> {
public interface SpaceOptimizeShortWellheadMapper extends BaseMapper<SpaceOptimizeShortWellheadEnt> {
}
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationHistoryService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceCalibrationHistory;
import pps.core.space.entity.SpaceCalibrationHistoryEnt;
import pps.core.space.entity.SpaceCalibrationHistoryView;
import pps.core.space.mapper.SpaceCalibrationHistoryMapper;
import pps.core.space.mapper.SpaceCalibrationHistoryViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceCalibrationHistoryService {
@XApiPost
public XServiceResult createSpaceCalibrationHistory(XContext context, CreateSpaceCalibrationHistoryInput input) {
SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
SpaceCalibrationHistory entity = new SpaceCalibrationHistory();
SpaceCalibrationHistoryEnt entity = new SpaceCalibrationHistoryEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceCalibrationHistoryService {
@XApiPost
public XServiceResult updateSpaceCalibrationHistory(XContext context, UpdateSpaceCalibrationHistoryInput input) {
SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
QueryWrapper<SpaceCalibrationHistory> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationHistory::getId, input.getId());
SpaceCalibrationHistory entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationHistoryEnt::getId, input.getId());
SpaceCalibrationHistoryEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceCalibrationHistoryService {
@XApiPost
public XServiceResult deleteSpaceCalibrationHistory(XContext context, DeleteSpaceCalibrationHistoryInput input) {
SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
QueryWrapper<SpaceCalibrationHistory> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationHistory::getId, input.getId());
SpaceCalibrationHistory entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationHistoryEnt::getId, input.getId());
SpaceCalibrationHistoryEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceCalibrationHistoryService {
@XApiGet
public XSingleResult<GetSpaceCalibrationHistoryOutput> getSpaceCalibrationHistory(XContext context, GetSpaceCalibrationHistoryInput input) {
SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
QueryWrapper<SpaceCalibrationHistory> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationHistory::getId, input.getId());
SpaceCalibrationHistory entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationHistoryEnt::getId, input.getId());
SpaceCalibrationHistoryEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,19 +83,19 @@ public class SpaceCalibrationHistoryService {
@XApiGet
public XPageResult<QuerySpaceCalibrationHistoryOutput> querySpaceCalibrationHistory(XContext context, QuerySpaceCalibrationHistoryInput input) {
SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
QueryWrapper<SpaceCalibrationHistory> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceCalibrationHistory::getId, input.getId())
.eq(SpaceCalibrationHistory::getIsDeleted, input.getIsDeleted())
.like(SpaceCalibrationHistory::getCreateById, input.getCreateById())
.like(SpaceCalibrationHistory::getCreateByName, input.getCreateByName())
.eq(SpaceCalibrationHistory::getCreateTime, input.getCreateTime())
.like(SpaceCalibrationHistory::getModifyById, input.getModifyById())
.like(SpaceCalibrationHistory::getModifyByName, input.getModifyByName())
.eq(SpaceCalibrationHistory::getModifyTime, input.getModifyTime())
.like(SpaceCalibrationHistory::getLineId, input.getLineId())
.like(SpaceCalibrationHistory::getInstitutionId, input.getInstitutionId())
.like(SpaceCalibrationHistory::getExecutionCycle, input.getExecutionCycle())
.eq(SpaceCalibrationHistory::getCalibrationDate, input.getCalibrationDate());
QueryWrapper<SpaceCalibrationHistoryEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceCalibrationHistoryEnt::getId, input.getId())
.eq(SpaceCalibrationHistoryEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceCalibrationHistoryEnt::getCreateById, input.getCreateById())
.like(SpaceCalibrationHistoryEnt::getCreateByName, input.getCreateByName())
.eq(SpaceCalibrationHistoryEnt::getCreateTime, input.getCreateTime())
.like(SpaceCalibrationHistoryEnt::getModifyById, input.getModifyById())
.like(SpaceCalibrationHistoryEnt::getModifyByName, input.getModifyByName())
.eq(SpaceCalibrationHistoryEnt::getModifyTime, input.getModifyTime())
.like(SpaceCalibrationHistoryEnt::getLineId, input.getLineId())
.like(SpaceCalibrationHistoryEnt::getInstitutionId, input.getInstitutionId())
.like(SpaceCalibrationHistoryEnt::getExecutionCycle, input.getExecutionCycle())
.eq(SpaceCalibrationHistoryEnt::getCalibrationDate, input.getCalibrationDate());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceCalibrationHistoryOutput.class);
}
......@@ -103,7 +103,7 @@ public class SpaceCalibrationHistoryService {
@XApiGet
public XPageResult<QuerySpaceCalibrationHistoryOutput> dynamicQuerySpaceCalibrationHistory(XContext context, CustomQueryInput input) {
SpaceCalibrationHistoryMapper mapper = context.getBean(SpaceCalibrationHistoryMapper.class);
return XMapperHelper.query(mapper, input, SpaceCalibrationHistory.class, QuerySpaceCalibrationHistoryOutput.class);
return XMapperHelper.query(mapper, input, SpaceCalibrationHistoryEnt.class, QuerySpaceCalibrationHistoryOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationPeriodService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceCalibrationPeriod;
import pps.core.space.entity.SpaceCalibrationPeriodEnt;
import pps.core.space.entity.SpaceCalibrationPeriodView;
import pps.core.space.mapper.SpaceCalibrationPeriodMapper;
import pps.core.space.mapper.SpaceCalibrationPeriodViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceCalibrationPeriodService {
@XApiPost
public XServiceResult createSpaceCalibrationPeriod(XContext context, CreateSpaceCalibrationPeriodInput input) {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
SpaceCalibrationPeriod entity = new SpaceCalibrationPeriod();
SpaceCalibrationPeriodEnt entity = new SpaceCalibrationPeriodEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceCalibrationPeriodService {
@XApiPost
public XServiceResult updateSpaceCalibrationPeriod(XContext context, UpdateSpaceCalibrationPeriodInput input) {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
QueryWrapper<SpaceCalibrationPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationPeriod::getId, input.getId());
SpaceCalibrationPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceCalibrationPeriodService {
@XApiPost
public XServiceResult deleteSpaceCalibrationPeriod(XContext context, DeleteSpaceCalibrationPeriodInput input) {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
QueryWrapper<SpaceCalibrationPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationPeriod::getId, input.getId());
SpaceCalibrationPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceCalibrationPeriodService {
@XApiGet
public XSingleResult<GetSpaceCalibrationPeriodOutput> getSpaceCalibrationPeriod(XContext context, GetSpaceCalibrationPeriodInput input) {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
QueryWrapper<SpaceCalibrationPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationPeriod::getId, input.getId());
SpaceCalibrationPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceCalibrationPeriodEnt::getId, input.getId());
SpaceCalibrationPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,17 +83,17 @@ public class SpaceCalibrationPeriodService {
@XApiGet
public XPageResult<QuerySpaceCalibrationPeriodOutput> querySpaceCalibrationPeriod(XContext context, QuerySpaceCalibrationPeriodInput input) {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
QueryWrapper<SpaceCalibrationPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceCalibrationPeriod::getId, input.getId())
.eq(SpaceCalibrationPeriod::getIsDeleted, input.getIsDeleted())
.like(SpaceCalibrationPeriod::getCreateById, input.getCreateById())
.like(SpaceCalibrationPeriod::getCreateByName, input.getCreateByName())
.eq(SpaceCalibrationPeriod::getCreateTime, input.getCreateTime())
.like(SpaceCalibrationPeriod::getModifyById, input.getModifyById())
.like(SpaceCalibrationPeriod::getModifyByName, input.getModifyByName())
.eq(SpaceCalibrationPeriod::getModifyTime, input.getModifyTime())
.like(SpaceCalibrationPeriod::getLineId, input.getLineId())
.like(SpaceCalibrationPeriod::getDayNumber, input.getDayNumber());
QueryWrapper<SpaceCalibrationPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceCalibrationPeriodEnt::getId, input.getId())
.eq(SpaceCalibrationPeriodEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceCalibrationPeriodEnt::getCreateById, input.getCreateById())
.like(SpaceCalibrationPeriodEnt::getCreateByName, input.getCreateByName())
.eq(SpaceCalibrationPeriodEnt::getCreateTime, input.getCreateTime())
.like(SpaceCalibrationPeriodEnt::getModifyById, input.getModifyById())
.like(SpaceCalibrationPeriodEnt::getModifyByName, input.getModifyByName())
.eq(SpaceCalibrationPeriodEnt::getModifyTime, input.getModifyTime())
.like(SpaceCalibrationPeriodEnt::getLineId, input.getLineId())
.like(SpaceCalibrationPeriodEnt::getDayNumber, input.getDayNumber());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceCalibrationPeriodOutput.class);
}
......@@ -101,7 +101,7 @@ public class SpaceCalibrationPeriodService {
@XApiGet
public XPageResult<QuerySpaceCalibrationPeriodOutput> dynamicQuerySpaceCalibrationPeriod(XContext context, CustomQueryInput input) {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
return XMapperHelper.query(mapper, input, SpaceCalibrationPeriod.class, QuerySpaceCalibrationPeriodOutput.class);
return XMapperHelper.query(mapper, input, SpaceCalibrationPeriodEnt.class, QuerySpaceCalibrationPeriodOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionInstitutionService.java
View file @ bfc386d0
......@@ -6,10 +6,11 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseUtils;
import pps.core.space.entity.SpaceInstitutionDuration;
import pps.core.space.entity.SpaceInstitutionInstitution;
import pps.core.space.entity.SpaceInstitutionDurationEnt;
import pps.core.space.entity.SpaceInstitutionInstitutionEnt;
import pps.core.space.entity.SpaceInstitutionInstitutionView;
import pps.core.space.entity.SpaceInstitutionWellheadView;
import pps.core.space.mapper.SpaceInstitutionDurationMapper;
import pps.core.space.mapper.SpaceInstitutionInstitutionMapper;
import pps.core.space.mapper.SpaceInstitutionInstitutionViewMapper;
import pps.core.space.mapper.SpaceInstitutionWellheadViewMapper;
......@@ -60,13 +61,13 @@ public class SpaceInstitutionInstitutionService {
return XTransactionHelper.begin(context, () -> {
//新增间开配置
SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
SpaceInstitutionInstitution entity = XCopyUtils.copyNewObject(input, SpaceInstitutionInstitution.class);
SpaceInstitutionInstitutionEnt entity = XCopyUtils.copyNewObject(input, SpaceInstitutionInstitutionEnt.class);
BaseUtils.setBaseModelDefault(entity, session);
mapper.insert(entity);
String institutionId = entity.getId();
List<CreateSpaceInstitutionWellheadInput> wellheadList = input.getWellheadList();
if (CollUtil.isNotEmpty(wellheadList)) {
List<SpaceInstitutionDuration> durationList;
List<SpaceInstitutionDurationEnt> durationList;
SpaceInstitutionWellheadViewMapper wellheadMapper = context.getBean(SpaceInstitutionWellheadViewMapper.class);
List<SpaceInstitutionWellheadView> wellheads = XCopyUtils.copyNewList(wellheadList, SpaceInstitutionWellheadView.class);
for (SpaceInstitutionWellheadView wellhead : wellheads) {
......@@ -83,7 +84,7 @@ public class SpaceInstitutionInstitutionService {
d.setInstitutionId(institutionId);
BaseUtils.setBaseModelDefault(d, session);
});
// BaseUtils.batchInsert(BasePriceStrategyDetailMapper.class, BasePriceStrategyDetailModel.class, detailList);
BaseUtils.batchInsert(SpaceInstitutionDurationMapper.class, SpaceInstitutionDurationEnt.class, durationList);
}
}
}
......@@ -95,9 +96,9 @@ public class SpaceInstitutionInstitutionService {
@XApiPost
public XServiceResult updateSpaceInstitutionInstitution(XContext context, UpdateSpaceInstitutionInstitutionInput input) {
SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
QueryWrapper<SpaceInstitutionInstitution> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceInstitutionInstitution::getId, input.getId());
SpaceInstitutionInstitution entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceInstitutionInstitutionEnt::getId, input.getId());
SpaceInstitutionInstitutionEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -110,9 +111,9 @@ public class SpaceInstitutionInstitutionService {
@XApiPost
public XServiceResult deleteSpaceInstitutionInstitution(XContext context, DeleteSpaceInstitutionInstitutionInput input) {
SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
QueryWrapper<SpaceInstitutionInstitution> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceInstitutionInstitution::getId, input.getId());
SpaceInstitutionInstitution entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceInstitutionInstitutionEnt::getId, input.getId());
SpaceInstitutionInstitutionEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -124,9 +125,9 @@ public class SpaceInstitutionInstitutionService {
@XApiGet
public XSingleResult<GetSpaceInstitutionInstitutionOutput> getSpaceInstitutionInstitution(XContext context, GetSpaceInstitutionInstitutionInput input) {
SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
QueryWrapper<SpaceInstitutionInstitution> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceInstitutionInstitution::getId, input.getId());
SpaceInstitutionInstitution entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceInstitutionInstitutionEnt::getId, input.getId());
SpaceInstitutionInstitutionEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -139,25 +140,25 @@ public class SpaceInstitutionInstitutionService {
@XApiGet
public XPageResult<QuerySpaceInstitutionInstitutionOutput> querySpaceInstitutionInstitution(XContext context, QuerySpaceInstitutionInstitutionInput input) {
SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
QueryWrapper<SpaceInstitutionInstitution> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceInstitutionInstitution::getId, input.getId())
.eq(SpaceInstitutionInstitution::getIsDeleted, input.getIsDeleted())
.like(SpaceInstitutionInstitution::getCreateById, input.getCreateById())
.like(SpaceInstitutionInstitution::getCreateByName, input.getCreateByName())
.eq(SpaceInstitutionInstitution::getCreateTime, input.getCreateTime())
.like(SpaceInstitutionInstitution::getModifyById, input.getModifyById())
.like(SpaceInstitutionInstitution::getModifyByName, input.getModifyByName())
.eq(SpaceInstitutionInstitution::getModifyTime, input.getModifyTime())
.like(SpaceInstitutionInstitution::getOuId, input.getOuId())
.like(SpaceInstitutionInstitution::getLineId, input.getLineId())
.like(SpaceInstitutionInstitution::getGridTypeKey, input.getGridTypeKey())
.like(SpaceInstitutionInstitution::getInstitutionName, input.getInstitutionName())
.eq(SpaceInstitutionInstitution::getInstitutionStartDate, input.getInstitutionStartDate())
.eq(SpaceInstitutionInstitution::getInstitutionEndDate, input.getInstitutionEndDate())
.eq(SpaceInstitutionInstitution::getOptimizeDeadline, input.getOptimizeDeadline())
.eq(SpaceInstitutionInstitution::getOptimizeState, input.getOptimizeState())
.eq(SpaceInstitutionInstitution::getIsCurrentBasic, input.getIsCurrentBasic())
.eq(SpaceInstitutionInstitution::getStartInterval, input.getStartInterval());
QueryWrapper<SpaceInstitutionInstitutionEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceInstitutionInstitutionEnt::getId, input.getId())
.eq(SpaceInstitutionInstitutionEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceInstitutionInstitutionEnt::getCreateById, input.getCreateById())
.like(SpaceInstitutionInstitutionEnt::getCreateByName, input.getCreateByName())
.eq(SpaceInstitutionInstitutionEnt::getCreateTime, input.getCreateTime())
.like(SpaceInstitutionInstitutionEnt::getModifyById, input.getModifyById())
.like(SpaceInstitutionInstitutionEnt::getModifyByName, input.getModifyByName())
.eq(SpaceInstitutionInstitutionEnt::getModifyTime, input.getModifyTime())
.like(SpaceInstitutionInstitutionEnt::getOuId, input.getOuId())
.like(SpaceInstitutionInstitutionEnt::getLineId, input.getLineId())
.like(SpaceInstitutionInstitutionEnt::getGridTypeKey, input.getGridTypeKey())
.like(SpaceInstitutionInstitutionEnt::getInstitutionName, input.getInstitutionName())
.eq(SpaceInstitutionInstitutionEnt::getInstitutionStartDate, input.getInstitutionStartDate())
.eq(SpaceInstitutionInstitutionEnt::getInstitutionEndDate, input.getInstitutionEndDate())
.eq(SpaceInstitutionInstitutionEnt::getOptimizeDeadline, input.getOptimizeDeadline())
.eq(SpaceInstitutionInstitutionEnt::getOptimizeState, input.getOptimizeState())
.eq(SpaceInstitutionInstitutionEnt::getIsCurrentBasic, input.getIsCurrentBasic())
.eq(SpaceInstitutionInstitutionEnt::getStartInterval, input.getStartInterval());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceInstitutionInstitutionOutput.class);
}
......@@ -165,7 +166,7 @@ public class SpaceInstitutionInstitutionService {
@XApiGet
public XPageResult<QuerySpaceInstitutionInstitutionOutput> dynamicQuerySpaceInstitutionInstitution(XContext context, CustomQueryInput input) {
SpaceInstitutionInstitutionMapper mapper = context.getBean(SpaceInstitutionInstitutionMapper.class);
return XMapperHelper.query(mapper, input, SpaceInstitutionInstitution.class, QuerySpaceInstitutionInstitutionOutput.class);
return XMapperHelper.query(mapper, input, SpaceInstitutionInstitutionEnt.class, QuerySpaceInstitutionInstitutionOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeLongDurationService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeLongDuration;
import pps.core.space.entity.SpaceOptimizeLongDurationEnt;
import pps.core.space.entity.SpaceOptimizeLongDurationView;
import pps.core.space.mapper.SpaceOptimizeLongDurationMapper;
import pps.core.space.mapper.SpaceOptimizeLongDurationViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeLongDurationService {
@XApiPost
public XServiceResult createSpaceOptimizeLongDuration(XContext context, CreateSpaceOptimizeLongDurationInput input) {
SpaceOptimizeLongDurationMapper mapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
SpaceOptimizeLongDuration entity = new SpaceOptimizeLongDuration();
SpaceOptimizeLongDurationEnt entity = new SpaceOptimizeLongDurationEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeLongDurationService {
@XApiPost
public XServiceResult updateSpaceOptimizeLongDuration(XContext context, UpdateSpaceOptimizeLongDurationInput input) {
SpaceOptimizeLongDurationMapper mapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
QueryWrapper<SpaceOptimizeLongDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongDuration::getId, input.getId());
SpaceOptimizeLongDuration entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeLongDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongDurationEnt::getId, input.getId());
SpaceOptimizeLongDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeLongDurationService {
@XApiPost
public XServiceResult deleteSpaceOptimizeLongDuration(XContext context, DeleteSpaceOptimizeLongDurationInput input) {
SpaceOptimizeLongDurationMapper mapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
QueryWrapper<SpaceOptimizeLongDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongDuration::getId, input.getId());
SpaceOptimizeLongDuration entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeLongDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongDurationEnt::getId, input.getId());
SpaceOptimizeLongDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeLongDurationService {
@XApiGet
public XSingleResult<GetSpaceOptimizeLongDurationOutput> getSpaceOptimizeLongDuration(XContext context, GetSpaceOptimizeLongDurationInput input) {
SpaceOptimizeLongDurationMapper mapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
QueryWrapper<SpaceOptimizeLongDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongDuration::getId, input.getId());
SpaceOptimizeLongDuration entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeLongDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongDurationEnt::getId, input.getId());
SpaceOptimizeLongDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,22 +83,22 @@ public class SpaceOptimizeLongDurationService {
@XApiGet
public XPageResult<QuerySpaceOptimizeLongDurationOutput> querySpaceOptimizeLongDuration(XContext context, QuerySpaceOptimizeLongDurationInput input) {
SpaceOptimizeLongDurationMapper mapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
QueryWrapper<SpaceOptimizeLongDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeLongDuration::getId, input.getId())
.eq(SpaceOptimizeLongDuration::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeLongDuration::getCreateById, input.getCreateById())
.like(SpaceOptimizeLongDuration::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeLongDuration::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeLongDuration::getModifyById, input.getModifyById())
.like(SpaceOptimizeLongDuration::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeLongDuration::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeLongDuration::getRecordId, input.getRecordId())
.like(SpaceOptimizeLongDuration::getLongPeriodId, input.getLongPeriodId())
.like(SpaceOptimizeLongDuration::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeLongDuration::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeLongDuration::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeLongDuration::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeLongDuration::getCloseWellTime, input.getCloseWellTime());
QueryWrapper<SpaceOptimizeLongDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeLongDurationEnt::getId, input.getId())
.eq(SpaceOptimizeLongDurationEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeLongDurationEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeLongDurationEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeLongDurationEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeLongDurationEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeLongDurationEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeLongDurationEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeLongDurationEnt::getRecordId, input.getRecordId())
.like(SpaceOptimizeLongDurationEnt::getLongPeriodId, input.getLongPeriodId())
.like(SpaceOptimizeLongDurationEnt::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeLongDurationEnt::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeLongDurationEnt::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeLongDurationEnt::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeLongDurationEnt::getCloseWellTime, input.getCloseWellTime());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeLongDurationOutput.class);
}
......@@ -106,7 +106,7 @@ public class SpaceOptimizeLongDurationService {
@XApiGet
public XPageResult<QuerySpaceOptimizeLongDurationOutput> dynamicQuerySpaceOptimizeLongDuration(XContext context, CustomQueryInput input) {
SpaceOptimizeLongDurationMapper mapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongDuration.class, QuerySpaceOptimizeLongDurationOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongDurationEnt.class, QuerySpaceOptimizeLongDurationOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeLongPeriodService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeLongPeriod;
import pps.core.space.entity.SpaceOptimizeLongPeriodEnt;
import pps.core.space.entity.SpaceOptimizeLongPeriodView;
import pps.core.space.mapper.SpaceOptimizeLongPeriodMapper;
import pps.core.space.mapper.SpaceOptimizeLongPeriodViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeLongPeriodService {
@XApiPost
public XServiceResult createSpaceOptimizeLongPeriod(XContext context, CreateSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
SpaceOptimizeLongPeriod entity = new SpaceOptimizeLongPeriod();
SpaceOptimizeLongPeriodEnt entity = new SpaceOptimizeLongPeriodEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeLongPeriodService {
@XApiPost
public XServiceResult updateSpaceOptimizeLongPeriod(XContext context, UpdateSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongPeriod::getId, input.getId());
SpaceOptimizeLongPeriod entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeLongPeriodService {
@XApiPost
public XServiceResult deleteSpaceOptimizeLongPeriod(XContext context, DeleteSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongPeriod::getId, input.getId());
SpaceOptimizeLongPeriod entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeLongPeriodService {
@XApiGet
public XSingleResult<GetSpaceOptimizeLongPeriodOutput> getSpaceOptimizeLongPeriod(XContext context, GetSpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongPeriod::getId, input.getId());
SpaceOptimizeLongPeriod entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -83,20 +83,20 @@ public class SpaceOptimizeLongPeriodService {
@XApiGet
public XPageResult<QuerySpaceOptimizeLongPeriodOutput> querySpaceOptimizeLongPeriod(XContext context, QuerySpaceOptimizeLongPeriodInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
QueryWrapper<SpaceOptimizeLongPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeLongPeriod::getId, input.getId())
.eq(SpaceOptimizeLongPeriod::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeLongPeriod::getCreateById, input.getCreateById())
.like(SpaceOptimizeLongPeriod::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeLongPeriod::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeLongPeriod::getModifyById, input.getModifyById())
.like(SpaceOptimizeLongPeriod::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeLongPeriod::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeLongPeriod::getLineId, input.getLineId())
.like(SpaceOptimizeLongPeriod::getInstitutionId, input.getInstitutionId())
.like(SpaceOptimizeLongPeriod::getExecutionCycle, input.getExecutionCycle())
.eq(SpaceOptimizeLongPeriod::getOptimizeState, input.getOptimizeState())
.eq(SpaceOptimizeLongPeriod::getOptimizeDeadline, input.getOptimizeDeadline());
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);
}
......@@ -104,7 +104,7 @@ public class SpaceOptimizeLongPeriodService {
@XApiGet
public XPageResult<QuerySpaceOptimizeLongPeriodOutput> dynamicQuerySpaceOptimizeLongPeriod(XContext context, CustomQueryInput input) {
SpaceOptimizeLongPeriodMapper mapper = context.getBean(SpaceOptimizeLongPeriodMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongPeriod.class, QuerySpaceOptimizeLongPeriodOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongPeriodEnt.class, QuerySpaceOptimizeLongPeriodOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeLongWellheadService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeLongWellhead;
import pps.core.space.entity.SpaceOptimizeLongWellheadEnt;
import pps.core.space.entity.SpaceOptimizeLongWellheadView;
import pps.core.space.mapper.SpaceOptimizeLongWellheadMapper;
import pps.core.space.mapper.SpaceOptimizeLongWellheadViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeLongWellheadService {
@XApiPost
public XServiceResult createSpaceOptimizeLongWellhead(XContext context, CreateSpaceOptimizeLongWellheadInput input) {
SpaceOptimizeLongWellheadMapper mapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
SpaceOptimizeLongWellhead entity = new SpaceOptimizeLongWellhead();
SpaceOptimizeLongWellheadEnt entity = new SpaceOptimizeLongWellheadEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeLongWellheadService {
@XApiPost
public XServiceResult updateSpaceOptimizeLongWellhead(XContext context, UpdateSpaceOptimizeLongWellheadInput input) {
SpaceOptimizeLongWellheadMapper mapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
QueryWrapper<SpaceOptimizeLongWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongWellhead::getId, input.getId());
SpaceOptimizeLongWellhead entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeLongWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongWellheadEnt::getId, input.getId());
SpaceOptimizeLongWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeLongWellheadService {
@XApiPost
public XServiceResult deleteSpaceOptimizeLongWellhead(XContext context, DeleteSpaceOptimizeLongWellheadInput input) {
SpaceOptimizeLongWellheadMapper mapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
QueryWrapper<SpaceOptimizeLongWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongWellhead::getId, input.getId());
SpaceOptimizeLongWellhead entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeLongWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongWellheadEnt::getId, input.getId());
SpaceOptimizeLongWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeLongWellheadService {
@XApiGet
public XSingleResult<GetSpaceOptimizeLongWellheadOutput> getSpaceOptimizeLongWellhead(XContext context, GetSpaceOptimizeLongWellheadInput input) {
SpaceOptimizeLongWellheadMapper mapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
QueryWrapper<SpaceOptimizeLongWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongWellhead::getId, input.getId());
SpaceOptimizeLongWellhead entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeLongWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeLongWellheadEnt::getId, input.getId());
SpaceOptimizeLongWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,18 +83,18 @@ public class SpaceOptimizeLongWellheadService {
@XApiGet
public XPageResult<QuerySpaceOptimizeLongWellheadOutput> querySpaceOptimizeLongWellhead(XContext context, QuerySpaceOptimizeLongWellheadInput input) {
SpaceOptimizeLongWellheadMapper mapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
QueryWrapper<SpaceOptimizeLongWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeLongWellhead::getId, input.getId())
.eq(SpaceOptimizeLongWellhead::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeLongWellhead::getCreateById, input.getCreateById())
.like(SpaceOptimizeLongWellhead::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeLongWellhead::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeLongWellhead::getModifyById, input.getModifyById())
.like(SpaceOptimizeLongWellhead::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeLongWellhead::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeLongWellhead::getLongPeriodId, input.getLongPeriodId())
.like(SpaceOptimizeLongWellhead::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeLongWellhead::getWellNumber, input.getWellNumber());
QueryWrapper<SpaceOptimizeLongWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeLongWellheadEnt::getId, input.getId())
.eq(SpaceOptimizeLongWellheadEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeLongWellheadEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeLongWellheadEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeLongWellheadEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeLongWellheadEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeLongWellheadEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeLongWellheadEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeLongWellheadEnt::getLongPeriodId, input.getLongPeriodId())
.like(SpaceOptimizeLongWellheadEnt::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeLongWellheadEnt::getWellNumber, input.getWellNumber());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeLongWellheadOutput.class);
}
......@@ -102,7 +102,7 @@ public class SpaceOptimizeLongWellheadService {
@XApiGet
public XPageResult<QuerySpaceOptimizeLongWellheadOutput> dynamicQuerySpaceOptimizeLongWellhead(XContext context, CustomQueryInput input) {
SpaceOptimizeLongWellheadMapper mapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongWellhead.class, QuerySpaceOptimizeLongWellheadOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeLongWellheadEnt.class, QuerySpaceOptimizeLongWellheadOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidDurationService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeMidDuration;
import pps.core.space.entity.SpaceOptimizeMidDurationEnt;
import pps.core.space.entity.SpaceOptimizeMidDurationView;
import pps.core.space.mapper.SpaceOptimizeMidDurationMapper;
import pps.core.space.mapper.SpaceOptimizeMidDurationViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeMidDurationService {
@XApiPost
public XServiceResult createSpaceOptimizeMidDuration(XContext context, CreateSpaceOptimizeMidDurationInput input) {
SpaceOptimizeMidDurationMapper mapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
SpaceOptimizeMidDuration entity = new SpaceOptimizeMidDuration();
SpaceOptimizeMidDurationEnt entity = new SpaceOptimizeMidDurationEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeMidDurationService {
@XApiPost
public XServiceResult updateSpaceOptimizeMidDuration(XContext context, UpdateSpaceOptimizeMidDurationInput input) {
SpaceOptimizeMidDurationMapper mapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
QueryWrapper<SpaceOptimizeMidDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidDuration::getId, input.getId());
SpaceOptimizeMidDuration entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidDurationEnt::getId, input.getId());
SpaceOptimizeMidDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeMidDurationService {
@XApiPost
public XServiceResult deleteSpaceOptimizeMidDuration(XContext context, DeleteSpaceOptimizeMidDurationInput input) {
SpaceOptimizeMidDurationMapper mapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
QueryWrapper<SpaceOptimizeMidDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidDuration::getId, input.getId());
SpaceOptimizeMidDuration entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidDurationEnt::getId, input.getId());
SpaceOptimizeMidDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeMidDurationService {
@XApiGet
public XSingleResult<GetSpaceOptimizeMidDurationOutput> getSpaceOptimizeMidDuration(XContext context, GetSpaceOptimizeMidDurationInput input) {
SpaceOptimizeMidDurationMapper mapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
QueryWrapper<SpaceOptimizeMidDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidDuration::getId, input.getId());
SpaceOptimizeMidDuration entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidDurationEnt::getId, input.getId());
SpaceOptimizeMidDurationEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,22 +83,22 @@ public class SpaceOptimizeMidDurationService {
@XApiGet
public XPageResult<QuerySpaceOptimizeMidDurationOutput> querySpaceOptimizeMidDuration(XContext context, QuerySpaceOptimizeMidDurationInput input) {
SpaceOptimizeMidDurationMapper mapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
QueryWrapper<SpaceOptimizeMidDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeMidDuration::getId, input.getId())
.eq(SpaceOptimizeMidDuration::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeMidDuration::getCreateById, input.getCreateById())
.like(SpaceOptimizeMidDuration::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeMidDuration::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeMidDuration::getModifyById, input.getModifyById())
.like(SpaceOptimizeMidDuration::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeMidDuration::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeMidDuration::getRecordId, input.getRecordId())
.like(SpaceOptimizeMidDuration::getMidPeriodId, input.getMidPeriodId())
.like(SpaceOptimizeMidDuration::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeMidDuration::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeMidDuration::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeMidDuration::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeMidDuration::getCloseWellTime, input.getCloseWellTime());
QueryWrapper<SpaceOptimizeMidDurationEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeMidDurationEnt::getId, input.getId())
.eq(SpaceOptimizeMidDurationEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeMidDurationEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeMidDurationEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeMidDurationEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeMidDurationEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeMidDurationEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeMidDurationEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeMidDurationEnt::getRecordId, input.getRecordId())
.like(SpaceOptimizeMidDurationEnt::getMidPeriodId, input.getMidPeriodId())
.like(SpaceOptimizeMidDurationEnt::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeMidDurationEnt::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeMidDurationEnt::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeMidDurationEnt::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeMidDurationEnt::getCloseWellTime, input.getCloseWellTime());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeMidDurationOutput.class);
}
......@@ -106,7 +106,7 @@ public class SpaceOptimizeMidDurationService {
@XApiGet
public XPageResult<QuerySpaceOptimizeMidDurationOutput> dynamicQuerySpaceOptimizeMidDuration(XContext context, CustomQueryInput input) {
SpaceOptimizeMidDurationMapper mapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeMidDuration.class, QuerySpaceOptimizeMidDurationOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeMidDurationEnt.class, QuerySpaceOptimizeMidDurationOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidPeriodService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeMidPeriod;
import pps.core.space.entity.SpaceOptimizeMidPeriodEnt;
import pps.core.space.entity.SpaceOptimizeMidPeriodView;
import pps.core.space.mapper.SpaceOptimizeMidPeriodMapper;
import pps.core.space.mapper.SpaceOptimizeMidPeriodViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeMidPeriodService {
@XApiPost
public XServiceResult createSpaceOptimizeMidPeriod(XContext context, CreateSpaceOptimizeMidPeriodInput input) {
SpaceOptimizeMidPeriodMapper mapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
SpaceOptimizeMidPeriod entity = new SpaceOptimizeMidPeriod();
SpaceOptimizeMidPeriodEnt entity = new SpaceOptimizeMidPeriodEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeMidPeriodService {
@XApiPost
public XServiceResult updateSpaceOptimizeMidPeriod(XContext context, UpdateSpaceOptimizeMidPeriodInput input) {
SpaceOptimizeMidPeriodMapper mapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
QueryWrapper<SpaceOptimizeMidPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidPeriod::getId, input.getId());
SpaceOptimizeMidPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidPeriodEnt::getId, input.getId());
SpaceOptimizeMidPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeMidPeriodService {
@XApiPost
public XServiceResult deleteSpaceOptimizeMidPeriod(XContext context, DeleteSpaceOptimizeMidPeriodInput input) {
SpaceOptimizeMidPeriodMapper mapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
QueryWrapper<SpaceOptimizeMidPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidPeriod::getId, input.getId());
SpaceOptimizeMidPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidPeriodEnt::getId, input.getId());
SpaceOptimizeMidPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeMidPeriodService {
@XApiGet
public XSingleResult<GetSpaceOptimizeMidPeriodOutput> getSpaceOptimizeMidPeriod(XContext context, GetSpaceOptimizeMidPeriodInput input) {
SpaceOptimizeMidPeriodMapper mapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
QueryWrapper<SpaceOptimizeMidPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidPeriod::getId, input.getId());
SpaceOptimizeMidPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidPeriodEnt::getId, input.getId());
SpaceOptimizeMidPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,20 +83,20 @@ public class SpaceOptimizeMidPeriodService {
@XApiGet
public XPageResult<QuerySpaceOptimizeMidPeriodOutput> querySpaceOptimizeMidPeriod(XContext context, QuerySpaceOptimizeMidPeriodInput input) {
SpaceOptimizeMidPeriodMapper mapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
QueryWrapper<SpaceOptimizeMidPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeMidPeriod::getId, input.getId())
.eq(SpaceOptimizeMidPeriod::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeMidPeriod::getCreateById, input.getCreateById())
.like(SpaceOptimizeMidPeriod::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeMidPeriod::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeMidPeriod::getModifyById, input.getModifyById())
.like(SpaceOptimizeMidPeriod::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeMidPeriod::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeMidPeriod::getLineId, input.getLineId())
.like(SpaceOptimizeMidPeriod::getInstitutionId, input.getInstitutionId())
.like(SpaceOptimizeMidPeriod::getExecutionCycle, input.getExecutionCycle())
.eq(SpaceOptimizeMidPeriod::getOptimizeState, input.getOptimizeState())
.eq(SpaceOptimizeMidPeriod::getOptimizeDeadline, input.getOptimizeDeadline());
QueryWrapper<SpaceOptimizeMidPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeMidPeriodEnt::getId, input.getId())
.eq(SpaceOptimizeMidPeriodEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeMidPeriodEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeMidPeriodEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeMidPeriodEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeMidPeriodEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeMidPeriodEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeMidPeriodEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeMidPeriodEnt::getLineId, input.getLineId())
.like(SpaceOptimizeMidPeriodEnt::getInstitutionId, input.getInstitutionId())
.like(SpaceOptimizeMidPeriodEnt::getExecutionCycle, input.getExecutionCycle())
.eq(SpaceOptimizeMidPeriodEnt::getOptimizeState, input.getOptimizeState())
.eq(SpaceOptimizeMidPeriodEnt::getOptimizeDeadline, input.getOptimizeDeadline());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeMidPeriodOutput.class);
}
......@@ -104,7 +104,7 @@ public class SpaceOptimizeMidPeriodService {
@XApiGet
public XPageResult<QuerySpaceOptimizeMidPeriodOutput> dynamicQuerySpaceOptimizeMidPeriod(XContext context, CustomQueryInput input) {
SpaceOptimizeMidPeriodMapper mapper = context.getBean(SpaceOptimizeMidPeriodMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeMidPeriod.class, QuerySpaceOptimizeMidPeriodOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeMidPeriodEnt.class, QuerySpaceOptimizeMidPeriodOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidWellheadService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeMidWellhead;
import pps.core.space.entity.SpaceOptimizeMidWellheadEnt;
import pps.core.space.entity.SpaceOptimizeMidWellheadView;
import pps.core.space.mapper.SpaceOptimizeMidWellheadMapper;
import pps.core.space.mapper.SpaceOptimizeMidWellheadViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeMidWellheadService {
@XApiPost
public XServiceResult createSpaceOptimizeMidWellhead(XContext context, CreateSpaceOptimizeMidWellheadInput input) {
SpaceOptimizeMidWellheadMapper mapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
SpaceOptimizeMidWellhead entity = new SpaceOptimizeMidWellhead();
SpaceOptimizeMidWellheadEnt entity = new SpaceOptimizeMidWellheadEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeMidWellheadService {
@XApiPost
public XServiceResult updateSpaceOptimizeMidWellhead(XContext context, UpdateSpaceOptimizeMidWellheadInput input) {
SpaceOptimizeMidWellheadMapper mapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
QueryWrapper<SpaceOptimizeMidWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidWellhead::getId, input.getId());
SpaceOptimizeMidWellhead entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidWellheadEnt::getId, input.getId());
SpaceOptimizeMidWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeMidWellheadService {
@XApiPost
public XServiceResult deleteSpaceOptimizeMidWellhead(XContext context, DeleteSpaceOptimizeMidWellheadInput input) {
SpaceOptimizeMidWellheadMapper mapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
QueryWrapper<SpaceOptimizeMidWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidWellhead::getId, input.getId());
SpaceOptimizeMidWellhead entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidWellheadEnt::getId, input.getId());
SpaceOptimizeMidWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeMidWellheadService {
@XApiGet
public XSingleResult<GetSpaceOptimizeMidWellheadOutput> getSpaceOptimizeMidWellhead(XContext context, GetSpaceOptimizeMidWellheadInput input) {
SpaceOptimizeMidWellheadMapper mapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
QueryWrapper<SpaceOptimizeMidWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidWellhead::getId, input.getId());
SpaceOptimizeMidWellhead entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeMidWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeMidWellheadEnt::getId, input.getId());
SpaceOptimizeMidWellheadEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,18 +83,18 @@ public class SpaceOptimizeMidWellheadService {
@XApiGet
public XPageResult<QuerySpaceOptimizeMidWellheadOutput> querySpaceOptimizeMidWellhead(XContext context, QuerySpaceOptimizeMidWellheadInput input) {
SpaceOptimizeMidWellheadMapper mapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
QueryWrapper<SpaceOptimizeMidWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeMidWellhead::getId, input.getId())
.eq(SpaceOptimizeMidWellhead::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeMidWellhead::getCreateById, input.getCreateById())
.like(SpaceOptimizeMidWellhead::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeMidWellhead::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeMidWellhead::getModifyById, input.getModifyById())
.like(SpaceOptimizeMidWellhead::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeMidWellhead::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeMidWellhead::getMidPeriodId, input.getMidPeriodId())
.like(SpaceOptimizeMidWellhead::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeMidWellhead::getWellNumber, input.getWellNumber());
QueryWrapper<SpaceOptimizeMidWellheadEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeMidWellheadEnt::getId, input.getId())
.eq(SpaceOptimizeMidWellheadEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeMidWellheadEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeMidWellheadEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeMidWellheadEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeMidWellheadEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeMidWellheadEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeMidWellheadEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeMidWellheadEnt::getMidPeriodId, input.getMidPeriodId())
.like(SpaceOptimizeMidWellheadEnt::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeMidWellheadEnt::getWellNumber, input.getWellNumber());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeMidWellheadOutput.class);
}
......@@ -102,7 +102,7 @@ public class SpaceOptimizeMidWellheadService {
@XApiGet
public XPageResult<QuerySpaceOptimizeMidWellheadOutput> dynamicQuerySpaceOptimizeMidWellhead(XContext context, CustomQueryInput input) {
SpaceOptimizeMidWellheadMapper mapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeMidWellhead.class, QuerySpaceOptimizeMidWellheadOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeMidWellheadEnt.class, QuerySpaceOptimizeMidWellheadOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortDurationService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeShortDuration;
import pps.core.space.entity.SpaceOptimizeShortDurationEnt;
import pps.core.space.entity.SpaceOptimizeShortDurationView;
import pps.core.space.mapper.SpaceOptimizeShortDurationMapper;
import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeShortDurationService {
@XApiPost
public XServiceResult createSpaceOptimizeShortDuration(XContext context, CreateSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
SpaceOptimizeShortDuration entity = new SpaceOptimizeShortDuration();
SpaceOptimizeShortDurationEnt entity = new SpaceOptimizeShortDurationEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeShortDurationService {
@XApiPost
public XServiceResult updateSpaceOptimizeShortDuration(XContext context, UpdateSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDuration::getId, input.getId());
SpaceOptimizeShortDuration entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeShortDurationService {
@XApiPost
public XServiceResult deleteSpaceOptimizeShortDuration(XContext context, DeleteSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDuration::getId, input.getId());
SpaceOptimizeShortDuration entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeShortDurationService {
@XApiGet
public XSingleResult<GetSpaceOptimizeShortDurationOutput> getSpaceOptimizeShortDuration(XContext context, GetSpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortDuration::getId, input.getId());
SpaceOptimizeShortDuration entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -83,22 +83,22 @@ public class SpaceOptimizeShortDurationService {
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationOutput> querySpaceOptimizeShortDuration(XContext context, QuerySpaceOptimizeShortDurationInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
QueryWrapper<SpaceOptimizeShortDuration> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortDuration::getId, input.getId())
.eq(SpaceOptimizeShortDuration::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortDuration::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortDuration::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortDuration::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortDuration::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortDuration::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortDuration::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortDuration::getRecordId, input.getRecordId())
.like(SpaceOptimizeShortDuration::getShortPeriodId, input.getShortPeriodId())
.like(SpaceOptimizeShortDuration::getWellheadId, input.getWellheadId())
.eq(SpaceOptimizeShortDuration::getIsOptimize, input.getIsOptimize())
.like(SpaceOptimizeShortDuration::getGenerationTypeKey, input.getGenerationTypeKey())
.like(SpaceOptimizeShortDuration::getOpenWellTime, input.getOpenWellTime())
.like(SpaceOptimizeShortDuration::getCloseWellTime, input.getCloseWellTime());
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);
}
......@@ -106,7 +106,7 @@ public class SpaceOptimizeShortDurationService {
@XApiGet
public XPageResult<QuerySpaceOptimizeShortDurationOutput> dynamicQuerySpaceOptimizeShortDuration(XContext context, CustomQueryInput input) {
SpaceOptimizeShortDurationMapper mapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortDuration.class, QuerySpaceOptimizeShortDurationOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortDurationEnt.class, QuerySpaceOptimizeShortDurationOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortPeriodService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeShortPeriod;
import pps.core.space.entity.SpaceOptimizeShortPeriodEnt;
import pps.core.space.entity.SpaceOptimizeShortPeriodView;
import pps.core.space.mapper.SpaceOptimizeShortPeriodMapper;
import pps.core.space.mapper.SpaceOptimizeShortPeriodViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeShortPeriodService {
@XApiPost
public XServiceResult createSpaceOptimizeShortPeriod(XContext context, CreateSpaceOptimizeShortPeriodInput input) {
SpaceOptimizeShortPeriodMapper mapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
SpaceOptimizeShortPeriod entity = new SpaceOptimizeShortPeriod();
SpaceOptimizeShortPeriodEnt entity = new SpaceOptimizeShortPeriodEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeShortPeriodService {
@XApiPost
public XServiceResult updateSpaceOptimizeShortPeriod(XContext context, UpdateSpaceOptimizeShortPeriodInput input) {
SpaceOptimizeShortPeriodMapper mapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
QueryWrapper<SpaceOptimizeShortPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortPeriod::getId, input.getId());
SpaceOptimizeShortPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeShortPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortPeriodEnt::getId, input.getId());
SpaceOptimizeShortPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeShortPeriodService {
@XApiPost
public XServiceResult deleteSpaceOptimizeShortPeriod(XContext context, DeleteSpaceOptimizeShortPeriodInput input) {
SpaceOptimizeShortPeriodMapper mapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
QueryWrapper<SpaceOptimizeShortPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortPeriod::getId, input.getId());
SpaceOptimizeShortPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeShortPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortPeriodEnt::getId, input.getId());
SpaceOptimizeShortPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeShortPeriodService {
@XApiGet
public XSingleResult<GetSpaceOptimizeShortPeriodOutput> getSpaceOptimizeShortPeriod(XContext context, GetSpaceOptimizeShortPeriodInput input) {
SpaceOptimizeShortPeriodMapper mapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
QueryWrapper<SpaceOptimizeShortPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortPeriod::getId, input.getId());
SpaceOptimizeShortPeriod entity = mapper.selectOne(queryWrapper);
QueryWrapper<SpaceOptimizeShortPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortPeriodEnt::getId, input.getId());
SpaceOptimizeShortPeriodEnt entity = mapper.selectOne(queryWrapper);
if (entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
......@@ -83,19 +83,19 @@ public class SpaceOptimizeShortPeriodService {
@XApiGet
public XPageResult<QuerySpaceOptimizeShortPeriodOutput> querySpaceOptimizeShortPeriod(XContext context, QuerySpaceOptimizeShortPeriodInput input) {
SpaceOptimizeShortPeriodMapper mapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
QueryWrapper<SpaceOptimizeShortPeriod> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortPeriod::getId, input.getId())
.eq(SpaceOptimizeShortPeriod::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortPeriod::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortPeriod::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortPeriod::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortPeriod::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortPeriod::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortPeriod::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortPeriod::getLineId, input.getLineId())
.like(SpaceOptimizeShortPeriod::getInstitutionId, input.getInstitutionId())
.eq(SpaceOptimizeShortPeriod::getOptimizeState, input.getOptimizeState())
.eq(SpaceOptimizeShortPeriod::getOptimizeDate, input.getOptimizeDate());
QueryWrapper<SpaceOptimizeShortPeriodEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortPeriodEnt::getId, input.getId())
.eq(SpaceOptimizeShortPeriodEnt::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortPeriodEnt::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortPeriodEnt::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortPeriodEnt::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortPeriodEnt::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortPeriodEnt::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortPeriodEnt::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortPeriodEnt::getLineId, input.getLineId())
.like(SpaceOptimizeShortPeriodEnt::getInstitutionId, input.getInstitutionId())
.eq(SpaceOptimizeShortPeriodEnt::getOptimizeState, input.getOptimizeState())
.eq(SpaceOptimizeShortPeriodEnt::getOptimizeDate, input.getOptimizeDate());
return XMapperHelper.query(mapper, input, queryWrapper, QuerySpaceOptimizeShortPeriodOutput.class);
}
......@@ -103,7 +103,7 @@ public class SpaceOptimizeShortPeriodService {
@XApiGet
public XPageResult<QuerySpaceOptimizeShortPeriodOutput> dynamicQuerySpaceOptimizeShortPeriod(XContext context, CustomQueryInput input) {
SpaceOptimizeShortPeriodMapper mapper = context.getBean(SpaceOptimizeShortPeriodMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortPeriod.class, QuerySpaceOptimizeShortPeriodOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortPeriodEnt.class, QuerySpaceOptimizeShortPeriodOutput.class);
}
@XApiAnonymous
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeShortWellheadService.java
View file @ bfc386d0
......@@ -3,7 +3,7 @@ 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.SpaceOptimizeShortWellhead;
import pps.core.space.entity.SpaceOptimizeShortWellheadEnt;
import pps.core.space.entity.SpaceOptimizeShortWellheadView;
import pps.core.space.mapper.SpaceOptimizeShortWellheadMapper;
import pps.core.space.mapper.SpaceOptimizeShortWellheadViewMapper;
......@@ -29,7 +29,7 @@ public class SpaceOptimizeShortWellheadService {
@XApiPost
public XServiceResult createSpaceOptimizeShortWellhead(XContext context, CreateSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
SpaceOptimizeShortWellhead entity = new SpaceOptimizeShortWellhead();
SpaceOptimizeShortWellheadEnt entity = new SpaceOptimizeShortWellheadEnt();
XCopyUtils.copyObject(input, entity);
mapper.insert(entity);
return XServiceResult.OK;
......@@ -39,9 +39,9 @@ public class SpaceOptimizeShortWellheadService {
@XApiPost
public XServiceResult updateSpaceOptimizeShortWellhead(XContext context, UpdateSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellhead::getId, input.getId());
SpaceOptimizeShortWellhead entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -54,9 +54,9 @@ public class SpaceOptimizeShortWellheadService {
@XApiPost
public XServiceResult deleteSpaceOptimizeShortWellhead(XContext context, DeleteSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellhead::getId, input.getId());
SpaceOptimizeShortWellhead entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -68,9 +68,9 @@ public class SpaceOptimizeShortWellheadService {
@XApiGet
public XSingleResult<GetSpaceOptimizeShortWellheadOutput> getSpaceOptimizeShortWellhead(XContext context, GetSpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SpaceOptimizeShortWellhead::getId, input.getId());
SpaceOptimizeShortWellhead entity = mapper.selectOne(queryWrapper);
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);
}
......@@ -83,18 +83,18 @@ public class SpaceOptimizeShortWellheadService {
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadOutput> querySpaceOptimizeShortWellhead(XContext context, QuerySpaceOptimizeShortWellheadInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
QueryWrapper<SpaceOptimizeShortWellhead> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().like(SpaceOptimizeShortWellhead::getId, input.getId())
.eq(SpaceOptimizeShortWellhead::getIsDeleted, input.getIsDeleted())
.like(SpaceOptimizeShortWellhead::getCreateById, input.getCreateById())
.like(SpaceOptimizeShortWellhead::getCreateByName, input.getCreateByName())
.eq(SpaceOptimizeShortWellhead::getCreateTime, input.getCreateTime())
.like(SpaceOptimizeShortWellhead::getModifyById, input.getModifyById())
.like(SpaceOptimizeShortWellhead::getModifyByName, input.getModifyByName())
.eq(SpaceOptimizeShortWellhead::getModifyTime, input.getModifyTime())
.like(SpaceOptimizeShortWellhead::getShortPeriodId, input.getShortPeriodId())
.like(SpaceOptimizeShortWellhead::getWellheadId, input.getWellheadId())
.like(SpaceOptimizeShortWellhead::getWellNumber, input.getWellNumber());
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);
}
......@@ -102,7 +102,7 @@ public class SpaceOptimizeShortWellheadService {
@XApiGet
public XPageResult<QuerySpaceOptimizeShortWellheadOutput> dynamicQuerySpaceOptimizeShortWellhead(XContext context, CustomQueryInput input) {
SpaceOptimizeShortWellheadMapper mapper = context.getBean(SpaceOptimizeShortWellheadMapper.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortWellhead.class, QuerySpaceOptimizeShortWellheadOutput.class);
return XMapperHelper.query(mapper, input, SpaceOptimizeShortWellheadEnt.class, QuerySpaceOptimizeShortWellheadOutput.class);
}
@XApiAnonymous
......
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