Commit ff5081bc authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 39862f25
......@@ -54,7 +54,10 @@ import xstartup.feature.mybatis.helper.XMapperHelper;
import xstartup.helper.XTransactionHelper;
import java.math.BigDecimal;
import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
......@@ -279,15 +282,14 @@ public class BasePhotovoltaicPlantService {
@XText("根据父级id查询儿子级(含电站)")
@XApiPost
public XListResult<GetSysOrganizationAndPlantViewOutput> selectOuAndPhotovoltaicPlantInfoByParentOuId(XContext context, GetSysOrganizationAndPlantInput input) {
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
BasePhotovoltaicPlantMapper plantMapper = context.getBean(BasePhotovoltaicPlantMapper.class);
SysOrganizationView record = new SysOrganizationView();
XCopyUtils.copyObject(input, record);
record.setIsDeleted(SysOrganizationCode.NORMAL);
List<SysOrganizationView> viewList = new ArrayList<>(16);
List<SysOrganizationView> viewList = null;
String ouId = "00000000-0000-0000-0000-000000000000";
String ouName = input.getOuName();
if (CharSequenceUtil.isBlank(ouName)) {
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
if (XStringUtils.isEmpty(input.getParentOuId())) {
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
......@@ -305,6 +307,8 @@ public class BasePhotovoltaicPlantService {
viewList = mapper.selectOuSonByParentOuId(record);
}
}
if (CollUtil.isEmpty(viewList)) {
BasePhotovoltaicPlantMapper plantMapper = context.getBean(BasePhotovoltaicPlantMapper.class);
List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(new LambdaQueryWrapper<BasePhotovoltaicPlantEnt>()
.eq(CharSequenceUtil.isBlank(ouName), BasePhotovoltaicPlantEnt::getOuId, ouId)
.like(CharSequenceUtil.isNotBlank(ouName), BasePhotovoltaicPlantEnt::getStationName, ouName)
......@@ -319,6 +323,7 @@ public class BasePhotovoltaicPlantService {
view.setOuLevel("PHOTOVOLTAIC");
viewList.add(view);
}
}
List<GetSysOrganizationAndPlantViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationAndPlantViewOutput.class);
return XListResult.success(outputs);
}
......
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