Commit aace0f5d authored by ZWT's avatar ZWT

feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 8acfc92b
...@@ -77,12 +77,14 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService ...@@ -77,12 +77,14 @@ public class BasePowerLineCloudServiceImpl implements IBasePowerLineCloudService
String gridTypeKey = input.getGridTypeKey(); String gridTypeKey = input.getGridTypeKey();
String lineTypeKey = input.getLineTypeKey(); String lineTypeKey = input.getLineTypeKey();
String strategyId = input.getStrategyId(); String strategyId = input.getStrategyId();
Collection<String> ouIdList = input.getOuIdList();
BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class); BasePowerLineMapper mapper = context.getBean(BasePowerLineMapper.class);
List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>() List<BasePowerLineEnt> selectList = mapper.selectList(new LambdaQueryWrapper<BasePowerLineEnt>()
.select(BaseModel::getId, BasePowerLineEnt::getLineName, BasePowerLineEnt::getStrategyId, BasePowerLineEnt::getGridTypeKey) .select(BaseModel::getId, BasePowerLineEnt::getLineName, BasePowerLineEnt::getStrategyId, BasePowerLineEnt::getGridTypeKey)
.eq(BaseModel::getIsDeleted, BusinessConstant.ONE) .eq(BaseModel::getIsDeleted, BusinessConstant.ONE)
.in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds) .in(CollUtil.isNotEmpty(lineIds), BaseModel::getId, lineIds)
.in(CollUtil.isNotEmpty(lineNames), BasePowerLineEnt::getLineName, lineNames) .in(CollUtil.isNotEmpty(lineNames), BasePowerLineEnt::getLineName, lineNames)
.in(CollUtil.isNotEmpty(ouIdList), BasePowerLineEnt::getOuId, ouIdList)
.eq(CharSequenceUtil.isNotBlank(lineId), BaseModel::getId, lineId) .eq(CharSequenceUtil.isNotBlank(lineId), BaseModel::getId, lineId)
.eq(CharSequenceUtil.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId) .eq(CharSequenceUtil.isNotBlank(ouId), BasePowerLineEnt::getOuId, ouId)
.eq(CharSequenceUtil.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId) .eq(CharSequenceUtil.isNotBlank(upperLineId), BasePowerLineEnt::getUpperLineId, upperLineId)
......
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