Skip to content

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

feat(吉林演示): 松原 

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e1459c0f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 311 deletions
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationCloudServiceImpl.java
View file @ ec2603a5
......@@ -3,6 +3,7 @@ package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.space.service.ISpaceCalibrationCloudService;
import pps.core.common.constant.BusinessConstant;
......@@ -22,7 +23,10 @@ import xstartup.base.XContext;
import xstartup.data.XServiceResult;
import xstartup.helper.XTransactionHelper;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
......@@ -96,7 +100,7 @@ public class SpaceCalibrationCloudServiceImpl implements ISpaceCalibrationCloudS
.orderByDesc(SpaceCalibrationHistoryEnt::getCalibrationDate)
.last(BusinessConstant.LAST_LIMIT)
);
if (Objects.isNull(lastHistory)) {
if (ObjectUtil.isNull(lastHistory)) {
//创建周期
this.createCalibrationHistory(historyViewList, lineId, institutionId, date, dayNumber);
} else {
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationService.java
View file @ ec2603a5
......@@ -3,6 +3,7 @@ package pps.core.space.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod;
......@@ -64,7 +65,7 @@ public class SpaceCalibrationService {
PpsUserSession session = context.getSession(PpsUserSession.class);
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
SpaceCalibrationPeriodEnt periodEnt = this.getPeriodEntByParam(mapper, input.getLineId(), input.getOuId());
if (Objects.nonNull(periodEnt)) {
if (ObjectUtil.isNotNull(periodEnt)) {
return XServiceResult.error(context, BusinessError.LineExists);
}
SpaceCalibrationPeriodEnt entity = XCopyUtils.copyNewObject(input, SpaceCalibrationPeriodEnt.class);
......@@ -116,7 +117,7 @@ public class SpaceCalibrationService {
new LambdaQueryWrapper<SpaceCalibrationPeriodEnt>()
.eq(BaseModel::getId, input.getId())
);
if (Objects.isNull(entity)) {
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
......@@ -141,7 +142,7 @@ public class SpaceCalibrationService {
SpaceCalibrationPeriodMapper mapper = context.getBean(SpaceCalibrationPeriodMapper.class);
SpaceCalibrationPeriodEnt entity = this.getPeriodEntByParam(mapper, lineId, ouId);
GetSpaceCalibrationPeriodViewOutput output = new GetSpaceCalibrationPeriodViewOutput();
if (Objects.nonNull(entity)) {
if (ObjectUtil.isNotNull(entity)) {
XCopyUtils.copyObject(entity, output);
}
output.setLineName(
......@@ -230,7 +231,7 @@ public class SpaceCalibrationService {
//查历史记录
SpaceCalibrationHistoryMapper historyMapper = context.getBean(SpaceCalibrationHistoryMapper.class);
SpaceCalibrationHistoryEnt historyEnt = historyMapper.selectById(input.getCalibrationId());
if (Objects.isNull(historyEnt)) {
if (ObjectUtil.isNull(historyEnt)) {
//缺少历史记录
return XSingleResult.error(context, BusinessError.LackOfHistoryRecord);
}
......@@ -245,7 +246,7 @@ public class SpaceCalibrationService {
.last(BusinessConstant.LAST_LIMIT)
);
//通过井口ID查区间
if (Objects.nonNull(shortPeriodEnt)) {
if (ObjectUtil.isNotNull(shortPeriodEnt)) {
SpaceOptimizeShortDurationMapper shortDurationMapper = context.getBean(SpaceOptimizeShortDurationMapper.class);
durationEntList = shortDurationMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeShortDurationEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
......@@ -264,7 +265,7 @@ public class SpaceCalibrationService {
.orderByDesc(BaseModel::getCreateTime)
.last(BusinessConstant.LAST_LIMIT)
);
if (Objects.nonNull(midPeriodEnt)) {
if (ObjectUtil.isNotNull(midPeriodEnt)) {
SpaceOptimizeMidDurationMapper midDurationMapper = context.getBean(SpaceOptimizeMidDurationMapper.class);
durationEntList = midDurationMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeMidDurationEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
......@@ -284,7 +285,7 @@ public class SpaceCalibrationService {
.orderByDesc(BaseModel::getCreateTime)
.last(BusinessConstant.LAST_LIMIT)
);
if (Objects.nonNull(longPeriodEnt)) {
if (ObjectUtil.isNotNull(longPeriodEnt)) {
SpaceOptimizeLongDurationMapper longDurationMapper = context.getBean(SpaceOptimizeLongDurationMapper.class);
durationEntList = longDurationMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongDurationEnt>()
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceInstitutionDetailService.java
View file @ ec2603a5
......@@ -109,7 +109,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
input.setOuId(lineById.getOuId());
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt entity = this.getInstitutionDetail(mapper, institutionId);
if (Objects.isNull(entity)) {
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
Integer isCurrentBasic = entity.getIsCurrentBasic();
......@@ -137,7 +137,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
return XTransactionHelper.begin(context, () -> {
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt entity = this.getInstitutionDetail(mapper, institutionId);
if (Objects.isNull(entity)) {
if (ObjectUtil.isNull(entity)) {
return XServiceResult.error(context, XError.NotFound);
}
Integer isCurrentBasic = entity.getIsCurrentBasic();
......@@ -185,7 +185,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
String institutionId = input.getId();
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt entity = this.getInstitutionDetail(mapper, institutionId);
if (Objects.isNull(entity)) {
if (ObjectUtil.isNull(entity)) {
return XSingleResult.error(context, XError.NotFound);
}
GetSpaceInstitutionDetailViewOutput output = XCopyUtils.copyNewObject(entity, GetSpaceInstitutionDetailViewOutput.class);
......@@ -333,7 +333,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
String institutionId = input.getId();
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
SpaceInstitutionDetailEnt detail = this.getInstitutionDetail(mapper, institutionId);
if (Objects.isNull(detail)) {
if (ObjectUtil.isNull(detail)) {
return XServiceResult.error(context, XError.NotFound);
}
Integer isCurrentBasic = detail.getIsCurrentBasic();
......@@ -386,7 +386,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
// String institutionId = input.getId();
// SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
// SpaceInstitutionDetailEnt detail = this.getInstitutionDetail(mapper, institutionId);
// if (Objects.isNull(detail)) {
// if (ObjectUtil.isNull(detail)) {
// return XServiceResult.error(context, XError.NotFound);
// }
// //查校准历史详情
......@@ -629,7 +629,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
);
DateTime now = DateUtil.beginOfDay(DateUtil.date());
boolean isCreate = false;
if (Objects.nonNull(historyEnt)) {
if (ObjectUtil.isNotNull(historyEnt)) {
//判断当前时间是否大于等于校准日期
Date calibrationDate = historyEnt.getCalibrationDate();
if (DateUtil.compare(now, calibrationDate) >= 0) {
......@@ -649,7 +649,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
.orderByDesc(BaseModel::getModifyTime)
.last(BusinessConstant.LAST_LIMIT)
);
if (Objects.nonNull(periodEnt)) {
if (ObjectUtil.isNotNull(periodEnt)) {
mapper.insert(this.createCalibrationHistory(session, detail, now, Integer.valueOf(periodEnt.getDayNumber())));
}
}
......@@ -703,30 +703,11 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
List<SpaceInstitutionWellheadView> wellheadViewList = new ArrayList<>(32);
List<SpaceInstitutionDurationView> durationList;
List<SpaceInstitutionWellheadView> list = (List<SpaceInstitutionWellheadView>) XCopyUtils.copyNewList(wellheadList, SpaceInstitutionWellheadView.class);
// //执行防冻土策略
// boolean isTundraStrategy = Objects.nonNull(tundraStrategy) && tundraStrategy.equals(0);
// String wellId = null;
// if (isTundraStrategy) {
// wellId = ServiceUtil.getMinPowerWellByIds(context, list.stream()
// .map(SpaceInstitutionWellheadView::getWellheadId)
// .collect(Collectors.toList()));
// }
//封装数据
for (SpaceInstitutionWellheadView wellhead : list) {
wellhead.setInstitutionId(institutionId);
BaseUtils.setBaseModelDefault(wellhead, session);
wellhead.setId(BaseUtils.getUUID());
// //防冻土
// if (isTundraStrategy && CharSequenceUtil.equals(wellhead.getWellheadId(), wellId)) {
// wellhead.setRunTypeKey(BusinessConstant.CONTINUOUS_PUMPING_WELL);
// wellhead.setStartSeq(0);
// wellhead.setIntervalDescribe("24h常开");
// wellhead.setIntervalTypeKey(null);
// wellhead.setOpenWellDay(null);
// wellhead.setCloseWellDay(null);
// wellhead.setRunDuration(null);
// wellhead.setDurationList(null);
// }
wellheadViewList.add(wellhead);
durationList = wellhead.getDurationList();
if (CollUtil.isNotEmpty(durationList)) {
......
C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeApiService.java
View file @ ec2603a5
......@@ -244,7 +244,7 @@ public class SpaceOptimizeApiService extends SpaceOptimizeBaseService {
public XListResult<QuerySpaceOptimizeShortWellheadOutput> getDailyOptimization(XContext context, QuerySpaceOptimizeShortWellheadInput input) {
DateTime now = DateUtil.beginOfDay(DateUtil.date());
Date queryDate = input.getQueryDate();
if (Objects.isNull(queryDate)) {
if (ObjectUtil.isNull(queryDate)) {
queryDate = now;
} else {
queryDate = DateUtil.beginOfDay(queryDate);
......
C11-space/pps-core-space/src/main/java/pps/core/space/utils/ServiceUtil.java
View file @ ec2603a5
......@@ -8,7 +8,6 @@ import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil;
import pps.cloud.base.service.IBasePowerLineCloudService;
import pps.cloud.base.service.IBasePriceStrategyCloudService;
import pps.cloud.base.service.IBaseWellheadCloudService;
import pps.cloud.base.service.IConfigOilFieldCloudService;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineInput;
import pps.cloud.base.service.data.base_power_line.DynamicQueryBasePowerLineOutput;
......@@ -16,8 +15,6 @@ import pps.cloud.base.service.data.base_power_line.GetBasePowerLineInput;
import pps.cloud.base.service.data.base_power_line.GetBasePowerLineViewOutput;
import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailInput;
import pps.cloud.base.service.data.base_price_strategy_detail.GetBasePriceStrategyDetailOutput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadInput;
import pps.cloud.base.service.data.base_wellhead.DynamicQueryBaseWellheadOutput;
import pps.cloud.base.service.data.config_oil_field.GetConfigOilFieldOutput;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemDictionaryService;
......@@ -121,22 +118,6 @@ public class ServiceUtil {
.orElse(null);
}
/**
* 查功率最小的井口
*
* @param context 上下文
* @param wellIds 井ID
* @return {@link String}
*/
public static String getMinPowerWellByIds(XContext context, List<String> wellIds) {
IBaseWellheadCloudService service = context.getBean(IBaseWellheadCloudService.class);
XSingleResult<DynamicQueryBaseWellheadOutput> result = service.getMinPowerWellByIds(context, DynamicQueryBaseWellheadInput.builder()
.wellheadIds(wellIds)
.build());
result.throwIfFail();
return result.getResult().getId();
}
/**
* 获取电源线列表
*
......
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