Skip to content

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

feat(吉林演示): 松原 

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ce98147b
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 32 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineCloudServiceImpl.java
View file @ bcdcc11d
......@@ -82,16 +82,16 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
.select(BaseModel::getId, BasePowerLineEnt::getLineName, BasePowerLineEnt::getStrategyId, BasePowerLineEnt::getGridTypeKey)
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds)
.in(CollUtil.isNotEmpty(lineNames), BasePowerLineEnt::getLineName, lineNames)
.in(CollUtil.isNotEmpty(ouIdList), BasePowerLineEnt::getOuId, ouIdList)
.eq(CharSequenceUtil.isNotBlank(lineId), BaseModel::getId, lineId)
.eq(CharSequenceUtil.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
.eq(CharSequenceUtil.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
.eq(CharSequenceUtil.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
.like(CharSequenceUtil.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
.eq(CharSequenceUtil.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
.eq(CharSequenceUtil.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
.eq(CharSequenceUtil.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
.in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds)
.in(CollUtil.isNotEmpty(ouIdList), BasePowerLineEnt::getOuId, ouIdList)
.in(CollUtil.isNotEmpty(lineNames), BasePowerLineEnt::getLineName, lineNames)
.like(CharSequenceUtil.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
.orderByDesc(BaseModel::getModifyTime)
);
return XListResult.success(XCopyUtils.copyNewList(selectList, DynamicQueryBasePowerLineOutput.class));
......@@ -132,10 +132,10 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
List<BasePowerLineWellheadView> wellheadViews = wellheadViewMapper.selectWellheadListByParam(
BasePowerLineWellheadView.builder()
.ouIds(input.getOuIds())
.lineName(input.getLineName())
.runTypeKey(input.getRunTypeKey())
.lineId(input.getLineId())
.lineIds(input.getLineIds())
.lineName(input.getLineName())
.runTypeKey(input.getRunTypeKey())
.wellheadIds(input.getWellheadIds())
.build()
);
......@@ -154,10 +154,10 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
BasePowerLinePlantViewMapper mapper = context.getBean(BasePowerLinePlantViewMapper.class);
List<BasePowerLinePlantView> plantList = mapper.selectPlantListByParam(
BasePowerLinePlantView.builder()
.lineName(input.getLineName())
.ouIds(input.getOuIds())
.lineId(input.getLineId())
.lineIds(input.getLineIds())
.lineName(input.getLineName())
.build()
);
return XListResult.success(XCopyUtils.copyNewList(
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePowerLineService.java
View file @ bcdcc11d
......@@ -308,10 +308,10 @@ public class BasePowerLineService {
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(CharSequenceUtil.isNotBlank(lineId), BaseModel::getId, lineId)
.eq(CharSequenceUtil.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
.eq(CharSequenceUtil.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
.eq(CharSequenceUtil.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
.eq(CharSequenceUtil.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
.eq(CharSequenceUtil.isNotBlank(gridTypeKey), BasePowerLineEnt::getGridTypeKey, gridTypeKey)
.eq(CharSequenceUtil.isNotBlank(lineTypeKey), BasePowerLineEnt::getLineTypeKey, lineTypeKey)
.eq(CharSequenceUtil.isNotBlank(strategyId), BasePowerLineEnt::getStrategyId, strategyId)
.like(CharSequenceUtil.isNotBlank(lineName), BasePowerLineEnt::getLineName, lineName)
.orderByAsc(BasePowerLineEnt::getLineTypeKey, BasePowerLineEnt::getLineName)
);
......@@ -433,8 +433,8 @@ public class BasePowerLineService {
BasePowerLineWellheadViewMapper wellheadMapper = context.getBean(BasePowerLineWellheadViewMapper.class);
List<BasePowerLineWellheadView> wellheads = new ArrayList<>(32);
for (BasePowerLineWellheadView wellhead : (List<BasePowerLineWellheadView>) XCopyUtils.copyNewList(wellheadInputs, BasePowerLineWellheadView.class)) {
wellhead.setLineId(lineId);
wellhead.setOuId(ouId);
wellhead.setLineId(lineId);
BaseUtils.setBaseModelDefault(wellhead, session);
wellhead.setId(BaseUtils.getUUID());
wellheads.add(wellhead);
......@@ -446,8 +446,8 @@ public class BasePowerLineService {
BasePowerLinePlantViewMapper plantMapper = context.getBean(BasePowerLinePlantViewMapper.class);
List<BasePowerLinePlantView> plants = new ArrayList<>(32);
for (BasePowerLinePlantView plant : (List<BasePowerLinePlantView>) XCopyUtils.copyNewList(plantInputs, BasePowerLinePlantView.class)) {
plant.setLineId(lineId);
plant.setOuId(ouId);
plant.setLineId(lineId);
BaseUtils.setBaseModelDefault(plant, session);
plant.setId(UUID.randomUUID().toString());
plants.add(plant);
......@@ -459,8 +459,8 @@ public class BasePowerLineService {
BasePowerLineStorageViewMapper storageMapper = context.getBean(BasePowerLineStorageViewMapper.class);
List<BasePowerLineStorageView> storages = new ArrayList<>(32);
for (BasePowerLineStorageView storage : (List<BasePowerLineStorageView>) XCopyUtils.copyNewList(storageInputs, BasePowerLineStorageView.class)) {
storage.setLineId(lineId);
storage.setOuId(ouId);
storage.setLineId(lineId);
BaseUtils.setBaseModelDefault(storage, session);
storage.setId(UUID.randomUUID().toString());
storages.add(storage);
......@@ -472,8 +472,8 @@ public class BasePowerLineService {
BasePowerLineDieselViewMapper dieselMapper = context.getBean(BasePowerLineDieselViewMapper.class);
List<BasePowerLineDieselView> diesels = new ArrayList<>(32);
for (BasePowerLineDieselView diesel : (List<BasePowerLineDieselView>) XCopyUtils.copyNewList(dieselInputs, BasePowerLineDieselView.class)) {
diesel.setLineId(lineId);
diesel.setOuId(ouId);
diesel.setLineId(lineId);
BaseUtils.setBaseModelDefault(diesel, session);
diesel.setId(UUID.randomUUID().toString());
diesels.add(diesel);
......@@ -481,4 +481,4 @@ public class BasePowerLineService {
dieselMapper.batchInsertList(diesels);
}
}
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePriceStrategyCloudServiceImpl.java
View file @ bcdcc11d
......@@ -47,9 +47,9 @@ public class BasePriceStrategyCloudServiceImpl implements IBasePriceStrategyClou
"STR_TO_DATE( CONCAT( end_time, ':00' ), '%H:%i:%s' ) AS closeTime"
)
.lambda()
.eq(CharSequenceUtil.isNotBlank(periodTypeKey), BasePriceStrategyDetailEnt::getPeriodTypeKey, periodTypeKey)
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.eq(BasePriceStrategyDetailEnt::getStrategyMonth, input.getStrategyMonth())
.eq(CharSequenceUtil.isNotBlank(periodTypeKey), BasePriceStrategyDetailEnt::getPeriodTypeKey, periodTypeKey)
.apply(CharSequenceUtil.isNotBlank(lineId), "strategy_id = ( SELECT strategy_id FROM base_power_line WHERE id = {0} ) ", lineId)
.orderByAsc(BasePriceStrategyDetailEnt::getStartTime)
);
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseProjectInfoService.java
View file @ bcdcc11d
......@@ -55,11 +55,11 @@ public class BaseProjectInfoService {
BaseLineAttenuationRateViewMapper rateMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
for (CreateBaseLineAttenuationRateInput rateInput : input.getList()) {
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput, BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
ent.setCreateTime(now);
ent.setType(1);
ent.setCreateTime(now);
ent.setLineId(entity.getId());
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
list.add(ent);
}
rateMapper.batchInsert(list);
......@@ -80,25 +80,26 @@ public class BaseProjectInfoService {
XCopyUtils.copyObject(input, entity);
Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setIsDeleted(0);
entity.setModifyTime(now);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
entity.setIsDeleted(0);
mapper.updateById(entity);
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
rateMapper.delete(new LambdaQueryWrapper<BaseLineAttenuationRateEnt>()
.eq(BaseLineAttenuationRateEnt::getType, 1)
.eq(BaseLineAttenuationRateEnt::getLineId, entity.getId())
.eq(BaseLineAttenuationRateEnt::getType, 1));
);
List<BaseLineAttenuationRateView> list = new ArrayList<>();
if (CollUtil.isNotEmpty(input.getList())) {
BaseLineAttenuationRateViewMapper rateViewMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
for (CreateBaseLineAttenuationRateInput rateInput : input.getList()) {
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput, BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
ent.setType(1);
ent.setCreateTime(now);
ent.setLineId(entity.getId());
ent.setType(1);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
list.add(ent);
}
rateViewMapper.batchInsert(list);
......@@ -244,4 +245,4 @@ public class BaseProjectInfoService {
}
return parentNameStr;
}
}
}
\ No newline at end of file
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherCloudServiceImpl.java
View file @ bcdcc11d
......@@ -202,13 +202,12 @@ public class BaseWatherCloudServiceImpl implements BaseWatherCloudService {
dao.setDayTime(LocalDate.parse(dayTime).getDayOfMonth() < 10 ? "0" + LocalDate.parse(dayTime).getDayOfMonth() : LocalDate.parse(dayTime).getDayOfMonth() + "");
dao.setHourTime(Hour);
// 5.执行SQL
QueryWrapper<PlantPredictedPowerDataEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PlantPredictedPowerDataEnt::getPlantId, plantId)
mapper.delete(new LambdaQueryWrapper<PlantPredictedPowerDataEnt>()
.eq(PlantPredictedPowerDataEnt::getPlantId, plantId)
.eq(PlantPredictedPowerDataEnt::getYearTime, dao.getYearTime())
.eq(PlantPredictedPowerDataEnt::getMonthTime, dao.getMonthTime())
.eq(PlantPredictedPowerDataEnt::getDayTime, dao.getDayTime())
.eq(PlantPredictedPowerDataEnt::getHourTime, dao.getHourTime());
mapper.delete(queryWrapper);
.eq(PlantPredictedPowerDataEnt::getHourTime, dao.getHourTime()));
dao.setMinTime("00:00");
dao.setDataDate(dao.getYearTime() + "-" + dao.getMonthTime() + "-" + dao.getDayTime() + " " + dao.getHourTime() + ":" + dao.getMinTime());
PlantPredictedPowerDataEnt insertDao = XCopyUtils.copyNewObject(dao, PlantPredictedPowerDataEnt.class);
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseWatherService.java
View file @ bcdcc11d
......@@ -209,8 +209,7 @@ public class BaseWatherService {
String provinceUrl = "http://weather.cma.cn/api/dict/province";
String cityUrl = "http://weather.cma.cn/api/dict/province/";
//请求省份接口。获取省份列表
String provinceStr = HttpUtils.send2(provinceUrl,
"");
String provinceStr = HttpUtils.send2(provinceUrl, "");
//解析省份列表字符串，把字符串解析成json对象
JSONObject jsonObject = JSONObject.parseObject(provinceStr);
//处理json对象，变为数组
......
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