Commit 553d895c authored by ZWT's avatar ZWT

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

1.开发基础信息配置-输电线路配置模块修改功能,完成接口冒烟测试并生成接口文档;
2.开发基础信息配置-输电线路配置模块删除功能,完成接口冒烟测试并生成接口文档;
3.开发基础信息配置-输电线路配置模块详情功能,完成接口冒烟测试并生成接口文档;
4.开发基础信息配置-输电线路配置模块分页列表功能,完成接口冒烟测试并生成接口文档;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 84ae7a4e
......@@ -4,9 +4,11 @@ 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 org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.data.GetSysOrganizationViewInput;
import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.*;
import pps.core.base.mapper.*;
import pps.core.base.service.data.base_power_line.*;
......@@ -203,20 +205,30 @@ public class BasePowerLineService {
BasePowerLineView record = XCopyUtils.copyNewObject(input, BasePowerLineView.class);
PageHelper.startPage(input.getPage(), input.getLimit());
List<BasePowerLineView> list = mapper.selectList(record);
PageInfo<BasePowerLineView> pageInfo = new PageInfo<>(list);
List<QueryBasePowerLineViewOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBasePowerLineViewOutput.class);
String ouName = this.getSysOrgNameById(context, input.getOuId());
outputs.forEach(output -> output.setOuName(ouName));
List<QuerySysDictionaryViewOutput> gridTypeList = BaseEntUtils.getDictList(context, "grid_type");
List<QuerySysDictionaryViewOutput> lineTypeList = BaseEntUtils.getDictList(context, "line_type");
for (QueryBasePowerLineViewOutput output : outputs) {
output.setOuName(ouName);
output.setGridTypeName(gridTypeList.stream()
.filter(row -> StringUtils.equals(row.getDicKey(), output.getGridTypeKey()))
.map(QuerySysDictionaryViewOutput::getDicName)
.findAny()
.orElse(null));
output.setLineTypeName(lineTypeList.stream()
.filter(row -> StringUtils.equals(row.getDicKey(), output.getLineTypeKey()))
.map(QuerySysDictionaryViewOutput::getDicName)
.findAny()
.orElse(null));
}
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
/*-----------------------------------private-----------------------------------*/
/**
* 通过组织id获取系统组织名称
*
......
......@@ -3,11 +3,17 @@ package pps.core.base.utils;
import com.baomidou.mybatisplus.core.enums.SqlMethod;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.apache.commons.lang3.StringUtils;
import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.BaseEnt;
import pps.core.common.session.PpsUserSession;
import xstartup.base.XContext;
import xstartup.data.XListResult;
import java.util.Collection;
import java.util.Date;
import java.util.List;
/**
* 封装工具类
......@@ -51,4 +57,22 @@ public class BaseEntUtils {
sqlSession.insert(sqlStatement, ent);
});
}
/**
* 通过字典类型查询字典
*
* @param context 上下文
* @param alias 别名
* @return {@link List}<{@link QuerySysDictionaryViewOutput}>
*/
public static List<QuerySysDictionaryViewOutput> getDictList(XContext context, String alias) {
QuerySysDictionaryViewInput dictInput = new QuerySysDictionaryViewInput();
dictInput.setAlias(alias);
dictInput.setPage(1);
dictInput.setLimit(999);
SystemDictionaryService dictionaryService = context.getBean(SystemDictionaryService.class);
XListResult<QuerySysDictionaryViewOutput> dictPageResult = dictionaryService.queryChildSysDictionarysByParentAlias(context, dictInput);
dictPageResult.throwIfFail();
return dictPageResult.getResult();
}
}
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