Commit b7f7247e authored by ZWT's avatar ZWT

feat(能源管理系统): 基础信息配置

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;
3.修改基础信息配置模块业务工具类,增加匹配查询地区名称方法;
4.修改基础信息配置模块业务工具类,增加匹配查询组织名称方法;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 1c39bab2
......@@ -3,8 +3,8 @@ package pps.core.base.service;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.*;
......@@ -199,9 +199,9 @@ public class BasePowerLineService {
@XText("输电线路配置--分页列表")
public XPageResult<QueryBasePowerLineViewOutput> queryBasePowerLineView(XContext context, QueryBasePowerLineViewInput input) {
BasePowerLineViewMapper mapper = context.getBean(BasePowerLineViewMapper.class);
BasePowerLineView record = XCopyUtils.copyNewObject(input, BasePowerLineView.class);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePowerLineView> list = mapper.selectList(record);
BasePowerLineView lineView = XCopyUtils.copyNewObject(input, BasePowerLineView.class);
PageMethod.startPage(input.getPage(), input.getLimit());
List<BasePowerLineView> list = mapper.selectList(lineView);
PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
if (CollUtil.isNotEmpty(outputs)) {
......
......@@ -3,8 +3,8 @@ package pps.core.base.service;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.data.GetSysAreaOutput;
import pps.core.base.entity.*;
......@@ -231,9 +231,9 @@ public class BasePriceStrategyService {
@XText("市电峰谷策略--分页列表")
public XPageResult<QueryBasePriceStrategyViewOutput> queryBasePriceStrategyView(XContext context, QueryBasePriceStrategyViewInput input) {
BasePriceStrategyViewMapper mapper = context.getBean(BasePriceStrategyViewMapper.class);
BasePriceStrategyView record = XCopyUtils.copyNewObject(input, BasePriceStrategyView.class);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePriceStrategyView> list = mapper.selectList(record);
BasePriceStrategyView strategyView = XCopyUtils.copyNewObject(input, BasePriceStrategyView.class);
PageMethod.startPage(input.getPage(), input.getLimit());
List<BasePriceStrategyView> list = mapper.selectList(strategyView);
PageInfo<BasePriceStrategyView> pageInfo = new PageInfo<>(list);
List<QueryBasePriceStrategyViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePriceStrategyViewOutput.class);
if (CollUtil.isNotEmpty(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