Skip to content

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

feat(能源管理系统): 修改架构 

1.修改架构添加cse;
2.修改各微服务服务名,启动验证,完成cse注册;
3.修改各模块pom及配置文件,解决服务间无法调用问题;
4.修改各服务配置,解决gateway模块跨域问题;
5.暂时删除部分编译错误代码,完成本地登录流程等基础功能测试,验证改造后链路是否正常;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 3363f631
Show whitespace changes
Inline Side-by-side
Showing with 227 additions and 199 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BaseLineViewMapper.java
View file @ 5e1a4860
...@@ -6,9 +6,13 @@ import pps.core.base.entity.BaseLineView; ...@@ -6,9 +6,13 @@ import pps.core.base.entity.BaseLineView;
import java.util.List; import java.util.List;
@Repository(value="pps.core.base.mapper.BaseLineViewMapper") @Repository(value = "pps.core.base.mapper.BaseLineViewMapper")
public interface BaseLineViewMapper { public interface BaseLineViewMapper {
BaseLineView selectOne(BaseLineView record); BaseLineView selectOne(BaseLineView record);
List<BaseLineView> selectList(BaseLineView record); List<BaseLineView> selectList(BaseLineView record);
List<BaseLineAllView> selectDataList(BaseLineView record); List<BaseLineAllView> selectDataList(BaseLineView record);
List<BaseLineView> selectListNew(BaseLineView record);
} }
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseLineService.java
View file @ 5e1a4860
...@@ -46,11 +46,11 @@ import java.util.stream.Collectors; ...@@ -46,11 +46,11 @@ import java.util.stream.Collectors;
public class BaseLineService { public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult createBaseLine(XContext context, CreateBaseLineInput input){ public XServiceResult createBaseLine(XContext context, CreateBaseLineInput input) {
BaseLineMapper mapper = context.getBean(BaseLineMapper.class); BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
BaseLineEnt entity = new BaseLineEnt(); BaseLineEnt entity = new BaseLineEnt();
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
if(entity.getParentId() == null) if (entity.getParentId() == null)
entity.setParentId(0); entity.setParentId(0);
Date now = new Date(); Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class); PpsUserSession session = context.getSession(PpsUserSession.class);
...@@ -59,11 +59,11 @@ public class BaseLineService { ...@@ -59,11 +59,11 @@ public class BaseLineService {
entity.setCreateTime(now); entity.setCreateTime(now);
mapper.insert(entity); mapper.insert(entity);
if(!CollectionUtils.isEmpty(input.getList())){ if (!CollectionUtils.isEmpty(input.getList())) {
BaseLineAttenuationRateViewMapper rateMapper = context.getBean(BaseLineAttenuationRateViewMapper.class); BaseLineAttenuationRateViewMapper rateMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
List<BaseLineAttenuationRateView> list = new ArrayList<>(); List<BaseLineAttenuationRateView> list = new ArrayList<>();
for(CreateBaseLineAttenuationRateInput rateInput : input.getList()){ for (CreateBaseLineAttenuationRateInput rateInput : input.getList()) {
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput , BaseLineAttenuationRateView.class); BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput, BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId()); ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName()); ent.setCreateByName(session.getUserName());
ent.setCreateTime(now); ent.setCreateTime(now);
...@@ -78,16 +78,16 @@ public class BaseLineService { ...@@ -78,16 +78,16 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult updateBaseLine(XContext context, UpdateBaseLineInput input){ public XServiceResult updateBaseLine(XContext context, UpdateBaseLineInput input) {
BaseLineMapper mapper = context.getBean(BaseLineMapper.class); BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId()); queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
BaseLineEnt entity = mapper.selectOne(queryWrapper); BaseLineEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
if(entity.getParentId() == null) if (entity.getParentId() == null)
entity.setParentId(0); entity.setParentId(0);
Date now = new Date(); Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class); PpsUserSession session = context.getSession(PpsUserSession.class);
...@@ -97,14 +97,14 @@ public class BaseLineService { ...@@ -97,14 +97,14 @@ public class BaseLineService {
mapper.updateById(entity); mapper.updateById(entity);
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class); BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>(); QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>();
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId , entity.getId()); queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId, entity.getId());
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType , 0); queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType, 0);
rateMapper.delete(queryRateWrapper); rateMapper.delete(queryRateWrapper);
if(!CollectionUtils.isEmpty(input.getList())){ if (!CollectionUtils.isEmpty(input.getList())) {
BaseLineAttenuationRateViewMapper rateViewMapper = context.getBean(BaseLineAttenuationRateViewMapper.class); BaseLineAttenuationRateViewMapper rateViewMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
List<BaseLineAttenuationRateView> list = new ArrayList<>(); List<BaseLineAttenuationRateView> list = new ArrayList<>();
for(CreateBaseLineAttenuationRateInput rateInput : input.getList()){ for (CreateBaseLineAttenuationRateInput rateInput : input.getList()) {
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput , BaseLineAttenuationRateView.class); BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput, BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId()); ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName()); ent.setCreateByName(session.getUserName());
ent.setCreateTime(now); ent.setCreateTime(now);
...@@ -119,12 +119,12 @@ public class BaseLineService { ...@@ -119,12 +119,12 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XServiceResult deleteBaseLine(XContext context, DeleteBaseLineInput input){ public XServiceResult deleteBaseLine(XContext context, DeleteBaseLineInput input) {
BaseLineMapper mapper = context.getBean(BaseLineMapper.class); BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId()); queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
BaseLineEnt entity = mapper.selectOne(queryWrapper); BaseLineEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) { if (entity == null) {
return XServiceResult.error(context, XError.NotFound); return XServiceResult.error(context, XError.NotFound);
} }
mapper.deleteById(entity); mapper.deleteById(entity);
...@@ -133,60 +133,60 @@ public class BaseLineService { ...@@ -133,60 +133,60 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XSingleResult<GetBaseLineOutput> getBaseLine(XContext context, GetBaseLineInput input){ public XSingleResult<GetBaseLineOutput> getBaseLine(XContext context, GetBaseLineInput input) {
BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class); BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
BaseLineView lineView = new BaseLineView(); BaseLineView lineView = new BaseLineView();
lineView.setId(input.getId()); lineView.setId(input.getId());
BaseLineView entity = mapper.selectOne(lineView); BaseLineView entity = mapper.selectOne(lineView);
if(entity == null) { if (entity == null) {
return XSingleResult.error(context, XError.NotFound); return XSingleResult.error(context, XError.NotFound);
} }
GetBaseLineOutput output = new GetBaseLineOutput(); GetBaseLineOutput output = new GetBaseLineOutput();
XCopyUtils.copyObject(entity, output); XCopyUtils.copyObject(entity, output);
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class); BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>(); QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>();
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId , entity.getId()); queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId, entity.getId());
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType , 0); queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType, 0);
List<BaseLineAttenuationRateEnt> list = rateMapper.selectList(queryRateWrapper); List<BaseLineAttenuationRateEnt> list = rateMapper.selectList(queryRateWrapper);
if(!CollectionUtils.isEmpty(list)){ if (!CollectionUtils.isEmpty(list)) {
List<CreateBaseLineAttenuationRateInput> rateInputs = XCopyUtils.copyNewList(list , CreateBaseLineAttenuationRateInput.class); List<CreateBaseLineAttenuationRateInput> rateInputs = XCopyUtils.copyNewList(list, CreateBaseLineAttenuationRateInput.class);
output.setList(rateInputs); output.setList(rateInputs);
} }
if(output.getParentId() == 0) if (output.getParentId() == 0)
output.setParentId(null); output.setParentId(null);
return XSingleResult.success(output); return XSingleResult.success(output);
} }
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XPageResult<QueryBaseLineOutput> queryBaseLineList(XContext context, QueryBaseLineListInput input){ public XPageResult<QueryBaseLineOutput> queryBaseLineList(XContext context, QueryBaseLineListInput input) {
PageHelper.startPage(input.getPage(), input.getLimit()); PageHelper.startPage(input.getPage(), input.getLimit());
//获取组织机构下的子集 //获取组织机构下的子集
SysOrganizationCloudService cloudService = context.getBean(SysOrganizationCloudService.class); SysOrganizationCloudService cloudService = context.getBean(SysOrganizationCloudService.class);
GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput(); GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput();
if(XStringUtils.isNotEmpty(input.getOuId())) if (XStringUtils.isNotEmpty(input.getOuId()))
ouIdInput.setOuId(input.getOuId()); ouIdInput.setOuId(input.getOuId());
else else
ouIdInput.setOuId("00000000-0000-0000-0000-000000000000"); ouIdInput.setOuId("00000000-0000-0000-0000-000000000000");
XListResult<GetOuListTreeOutput> outputXListResult = cloudService.getAllOuListByOuId(context , ouIdInput); XListResult<GetOuListTreeOutput> outputXListResult = cloudService.getAllOuListByOuId(context, ouIdInput);
outputXListResult.throwIfFail(); outputXListResult.throwIfFail();
List<GetOuListTreeOutput> ouList = outputXListResult.getResult(); List<GetOuListTreeOutput> ouList = outputXListResult.getResult();
List<String> ouIdList = new ArrayList<>(); List<String> ouIdList = new ArrayList<>();
if(CollectionUtils.isEmpty(ouList)){ if (CollectionUtils.isEmpty(ouList)) {
ouIdList.add(input.getOuId()); ouIdList.add(input.getOuId());
}else { } else {
ouIdList = ouList.stream().map(GetOuListTreeOutput::getOuId).collect(Collectors.toList()); ouIdList = ouList.stream().map(GetOuListTreeOutput::getOuId).collect(Collectors.toList());
} }
BaseLineViewMapper viewMapper = context.getBean(BaseLineViewMapper.class); BaseLineViewMapper viewMapper = context.getBean(BaseLineViewMapper.class);
BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class); BaseLineView view = XCopyUtils.copyNewObject(input, BaseLineView.class);
view.setOuIdList(ouIdList); view.setOuIdList(ouIdList);
List<BaseLineView> list = viewMapper.selectList(view); List<BaseLineView> list = viewMapper.selectListNew(view);
PageInfo<BaseLineView> pageInfo = new PageInfo(list); PageInfo<BaseLineView> pageInfo = new PageInfo(list);
List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class); List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class);
//获取线路、电网字典 //获取线路、电网字典
List<QuerySysDictionaryViewOutput> gridTypeList = getDictList(context , "grid_type"); List<QuerySysDictionaryViewOutput> gridTypeList = getDictList(context, "grid_type");
List<QuerySysDictionaryViewOutput> lineTypeList = getDictList(context , "line_type"); List<QuerySysDictionaryViewOutput> lineTypeList = getDictList(context, "line_type");
for(QueryBaseLineOutput item : outputs){ for (QueryBaseLineOutput item : outputs) {
item.setGridTypeName(getDictName(item.getGridType(), gridTypeList)); item.setGridTypeName(getDictName(item.getGridType(), gridTypeList));
item.setLineTypeName(getDictName(item.getLineType(), lineTypeList)); item.setLineTypeName(getDictName(item.getLineType(), lineTypeList));
} }
...@@ -195,9 +195,9 @@ public class BaseLineService { ...@@ -195,9 +195,9 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XPageResult<QueryBaseLineOutput> queryBaseLine(XContext context, QueryBaseLineInput input){ public XPageResult<QueryBaseLineOutput> queryBaseLine(XContext context, QueryBaseLineInput input) {
BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class); BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class); BaseLineView view = XCopyUtils.copyNewObject(input, BaseLineView.class);
List<BaseLineView> list = mapper.selectList(view); List<BaseLineView> list = mapper.selectList(view);
PageInfo<BaseLineView> pageInfo = new PageInfo(list); PageInfo<BaseLineView> pageInfo = new PageInfo(list);
List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class); List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class);
...@@ -206,9 +206,9 @@ public class BaseLineService { ...@@ -206,9 +206,9 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XPageResult<QueryBaseLineAllOutput> queryAllBaseLine(XContext context, QueryBaseLineInput input){ public XPageResult<QueryBaseLineAllOutput> queryAllBaseLine(XContext context, QueryBaseLineInput input) {
BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class); BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class); BaseLineView view = XCopyUtils.copyNewObject(input, BaseLineView.class);
List<BaseLineAllView> list = mapper.selectDataList(view); List<BaseLineAllView> list = mapper.selectDataList(view);
PageInfo<BaseLineAllView> pageInfo = new PageInfo(list); PageInfo<BaseLineAllView> pageInfo = new PageInfo(list);
List<QueryBaseLineAllOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineAllOutput.class); List<QueryBaseLineAllOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineAllOutput.class);
...@@ -218,12 +218,12 @@ public class BaseLineService { ...@@ -218,12 +218,12 @@ public class BaseLineService {
// List<GetSysAreaOutput> areaOutputs = areaOutputXListResult.getResult(); // List<GetSysAreaOutput> areaOutputs = areaOutputXListResult.getResult();
SysAreaMapper areaMapper = context.getBean(SysAreaMapper.class); SysAreaMapper areaMapper = context.getBean(SysAreaMapper.class);
List<SysAreaEnt> areaEntList = areaMapper.selectList(new QueryWrapper<>()); List<SysAreaEnt> areaEntList = areaMapper.selectList(new QueryWrapper<>());
outputs.stream().forEach(item->{ outputs.stream().forEach(item -> {
if(XStringUtils.isNotEmpty(item.getProvince())){ if (XStringUtils.isNotEmpty(item.getProvince())) {
System.out.println(item.getProvince()); System.out.println(item.getProvince());
SysAreaEnt areaEnt = areaEntList.stream().filter(area->item.getProvince().equals(area.getId()+"")).findFirst().orElse(null); SysAreaEnt areaEnt = areaEntList.stream().filter(area -> item.getProvince().equals(area.getId() + "")).findFirst().orElse(null);
if(areaEnt != null) if (areaEnt != null)
item.setProvince(getParentNameStr(areaEntList ,areaEnt )); item.setProvince(getParentNameStr(areaEntList, areaEnt));
} }
}); });
return XPageResult.success(outputs, input, pageInfo.getTotal()); return XPageResult.success(outputs, input, pageInfo.getTotal());
...@@ -231,12 +231,12 @@ public class BaseLineService { ...@@ -231,12 +231,12 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XPageResult<QueryBaseLineOutput> dynamicQueryBaseLine(XContext context, CustomQueryInput input){ public XPageResult<QueryBaseLineOutput> dynamicQueryBaseLine(XContext context, CustomQueryInput input) {
BaseLineMapper mapper = context.getBean(BaseLineMapper.class); BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
return XMapperHelper.query(mapper, input, BaseLineEnt.class, QueryBaseLineOutput.class); return XMapperHelper.query(mapper, input, BaseLineEnt.class, QueryBaseLineOutput.class);
} }
public List<QuerySysDictionaryViewOutput> getDictList(XContext context , String alias ){ public List<QuerySysDictionaryViewOutput> getDictList(XContext context, String alias) {
SystemDictionaryService dictionaryService = context.getBean(SystemDictionaryService.class); SystemDictionaryService dictionaryService = context.getBean(SystemDictionaryService.class);
QuerySysDictionaryViewInput dictInput = new QuerySysDictionaryViewInput(); QuerySysDictionaryViewInput dictInput = new QuerySysDictionaryViewInput();
dictInput.setAlias(alias); dictInput.setAlias(alias);
...@@ -247,12 +247,12 @@ public class BaseLineService { ...@@ -247,12 +247,12 @@ public class BaseLineService {
return dictPageResult.getResult(); return dictPageResult.getResult();
} }
public String getDictName(String dictKey,List<QuerySysDictionaryViewOutput> dictList){ public String getDictName(String dictKey, List<QuerySysDictionaryViewOutput> dictList) {
if(StringUtils.isBlank(dictKey) || CollectionUtils.isEmpty(dictList)){ if (StringUtils.isBlank(dictKey) || CollectionUtils.isEmpty(dictList)) {
return " "; return " ";
} }
for (QuerySysDictionaryViewOutput dict : dictList) { for (QuerySysDictionaryViewOutput dict : dictList) {
if(dict.getDicKey().equals(dictKey)){ if (dict.getDicKey().equals(dictKey)) {
return dict.getDicName(); return dict.getDicName();
} }
} }
...@@ -261,20 +261,20 @@ public class BaseLineService { ...@@ -261,20 +261,20 @@ public class BaseLineService {
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XListResult<GetBaseLineTreeOutput> getBaseLineTree(XContext context, GetBaseLineInput input){ public XListResult<GetBaseLineTreeOutput> getBaseLineTree(XContext context, GetBaseLineInput input) {
BaseLineMapper mapper = context.getBean(BaseLineMapper.class); BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
//queryWrapper.lambda().in(BaseLineEnt::getWellOuId , ouIdList); //queryWrapper.lambda().in(BaseLineEnt::getWellOuId , ouIdList);
List<BaseLineEnt> list = mapper.selectList(queryWrapper); List<BaseLineEnt> list = mapper.selectList(queryWrapper);
List<GetBaseLineTreeOutput> outputs = new ArrayList<>(); List<GetBaseLineTreeOutput> outputs = new ArrayList<>();
for(BaseLineEnt ent : list){ for (BaseLineEnt ent : list) {
GetBaseLineTreeOutput output = new GetBaseLineTreeOutput(); GetBaseLineTreeOutput output = new GetBaseLineTreeOutput();
output.setParentId(ent.getParentId()); output.setParentId(ent.getParentId());
output.setValue(ent.getId()); output.setValue(ent.getId());
output.setLabel(ent.getLineName()); output.setLabel(ent.getLineName());
outputs.add(output); outputs.add(output);
} }
if(!CollectionUtils.isEmpty(outputs)) if (!CollectionUtils.isEmpty(outputs))
selectBaseLineTree(outputs); selectBaseLineTree(outputs);
return XListResult.success(outputs); return XListResult.success(outputs);
} }
...@@ -283,38 +283,39 @@ public class BaseLineService { ...@@ -283,38 +283,39 @@ public class BaseLineService {
public List<GetBaseLineTreeOutput> selectBaseLineTree(List<GetBaseLineTreeOutput> list) { public List<GetBaseLineTreeOutput> selectBaseLineTree(List<GetBaseLineTreeOutput> list) {
//操作所有组织机构数据 //操作所有组织机构数据
Map<Integer, List<GetBaseLineTreeOutput>> groupMap = list.stream().collect(Collectors.groupingBy(GetBaseLineTreeOutput::getParentId)); Map<Integer, List<GetBaseLineTreeOutput>> groupMap = list.stream().collect(Collectors.groupingBy(GetBaseLineTreeOutput::getParentId));
list.forEach(organization-> { list.forEach(organization -> {
organization.setChildren(groupMap.get(organization.getValue())); organization.setChildren(groupMap.get(organization.getValue()));
}); });
List<GetBaseLineTreeOutput> collect = list.stream().filter(organization-> organization.getParentId() == 0).collect(Collectors.toList()); List<GetBaseLineTreeOutput> collect = list.stream().filter(organization -> organization.getParentId() == 0).collect(Collectors.toList());
return collect; return collect;
} }
@XApiAnonymous @XApiAnonymous
@XApiPost @XApiPost
public XListResult<GetBaseLineOutput> getBaseLineList(XContext context, GetBaseLineInput input){ public XListResult<GetBaseLineOutput> getBaseLineList(XContext context, GetBaseLineInput input) {
//获取组织机构下的子集 //获取组织机构下的子集
BaseLineMapper mapper = context.getBean(BaseLineMapper.class); BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>(); QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
// queryWrapper.lambda().in(BaseLineEnt::getWellOuId , ouIdList); // queryWrapper.lambda().in(BaseLineEnt::getWellOuId , ouIdList);
List<BaseLineEnt> list = mapper.selectList(queryWrapper); List<BaseLineEnt> list = mapper.selectList(queryWrapper);
List<GetBaseLineOutput> outputs = XCopyUtils.copyNewList(list , GetBaseLineOutput.class); List<GetBaseLineOutput> outputs = XCopyUtils.copyNewList(list, GetBaseLineOutput.class);
return XListResult.success(outputs); return XListResult.success(outputs);
} }
/** /**
* 根据子节点获取最上层节点 * 根据子节点获取最上层节点
*
* @return * @return
*/ */
public static String getParentNameStr(List<SysAreaEnt> areaList, SysAreaEnt child){ public static String getParentNameStr(List<SysAreaEnt> areaList, SysAreaEnt child) {
String parentNameStr = child.getName(); String parentNameStr = child.getName();
Integer parentId = child.getParentId(); Integer parentId = child.getParentId();
if(parentId == 120){ if (parentId == 120) {
}else { } else {
SysAreaEnt parent = areaList.stream().filter(item -> item.getId().equals(parentId)).findFirst().orElse(null); SysAreaEnt parent = areaList.stream().filter(item -> item.getId().equals(parentId)).findFirst().orElse(null);
String nameStr = getParentNameStr(areaList, parent); String nameStr = getParentNameStr(areaList, parent);
parentNameStr = nameStr +"/" + parentNameStr; parentNameStr = nameStr + "/" + parentNameStr;
} }
return parentNameStr; return parentNameStr;
} }
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseLineViewMapper.xml
View file @ 5e1a4860
...@@ -2,62 +2,63 @@ ...@@ -2,62 +2,63 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseLineViewMapper"> <mapper namespace="pps.core.base.mapper.BaseLineViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BaseLineView"> <resultMap id="BaseResultMap" type="pps.core.base.entity.BaseLineView">
<id column="id" property="id" jdbcType="INTEGER" /> <id column="id" property="id" jdbcType="INTEGER"/>
<result column="parent_id" property="parentId" jdbcType="INTEGER" /> <result column="parent_id" property="parentId" jdbcType="INTEGER"/>
<result column="line_name" property="lineName" jdbcType="VARCHAR" /> <result column="line_name" property="lineName" jdbcType="VARCHAR"/>
<result column="line_type" property="lineType" jdbcType="INTEGER" /> <result column="line_type" property="lineType" jdbcType="INTEGER"/>
<result column="grid_type" property="gridType" jdbcType="INTEGER" /> <result column="grid_type" property="gridType" jdbcType="INTEGER"/>
<result column="install_capacity" property="installCapacity" jdbcType="DECIMAL" /> <result column="install_capacity" property="installCapacity" jdbcType="DECIMAL"/>
<result column="array_incidence" property="arrayIncidence" jdbcType="DECIMAL" /> <result column="array_incidence" property="arrayIncidence" jdbcType="DECIMAL"/>
<result column="array_toward" property="arrayToward" jdbcType="DECIMAL" /> <result column="array_toward" property="arrayToward" jdbcType="DECIMAL"/>
<result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR" /> <result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR"/>
<result column="production_year" property="productionYear" jdbcType="VARCHAR" /> <result column="production_year" property="productionYear" jdbcType="VARCHAR"/>
<result column="service_length" property="serviceLength" jdbcType="VARCHAR" /> <result column="service_length" property="serviceLength" jdbcType="VARCHAR"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR" /> <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR" /> <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE" /> <result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" /> <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
</resultMap> </resultMap>
<resultMap id="AllResultMap" type="pps.core.base.entity.BaseLineView"> <resultMap id="AllResultMap" type="pps.core.base.entity.BaseLineView">
<id column="id" property="id" jdbcType="INTEGER" /> <id column="id" property="id" jdbcType="INTEGER"/>
<result column="parent_id" property="parentId" jdbcType="INTEGER" /> <result column="parent_id" property="parentId" jdbcType="INTEGER"/>
<result column="line_name" property="lineName" jdbcType="VARCHAR" /> <result column="line_name" property="lineName" jdbcType="VARCHAR"/>
<result column="oil_ou_id" property="oilOuId" jdbcType="VARCHAR" /> <result column="oil_ou_id" property="oilOuId" jdbcType="VARCHAR"/>
<result column="oil_ou_name" property="oilOuName" jdbcType="VARCHAR" /> <result column="oil_ou_name" property="oilOuName" jdbcType="VARCHAR"/>
<result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR" /> <result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR"/>
<result column="well_ou_name" property="wellOuName" jdbcType="VARCHAR" /> <result column="well_ou_name" property="wellOuName" jdbcType="VARCHAR"/>
<result column="p_line_name" property="pLineName" jdbcType="VARCHAR" /> <result column="p_line_name" property="pLineName" jdbcType="VARCHAR"/>
<result column="line_type" property="lineType" jdbcType="INTEGER" /> <result column="line_type" property="lineType" jdbcType="INTEGER"/>
<result column="grid_type" property="gridType" jdbcType="INTEGER" /> <result column="grid_type" property="gridType" jdbcType="INTEGER"/>
<result column="install_capacity" property="installCapacity" jdbcType="DECIMAL" /> <result column="install_capacity" property="installCapacity" jdbcType="DECIMAL"/>
<result column="array_incidence" property="arrayIncidence" jdbcType="DECIMAL" /> <result column="array_incidence" property="arrayIncidence" jdbcType="DECIMAL"/>
<result column="array_toward" property="arrayToward" jdbcType="DECIMAL" /> <result column="array_toward" property="arrayToward" jdbcType="DECIMAL"/>
<result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR" /> <result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR"/>
<result column="create_by_id" property="createById" jdbcType="VARCHAR" /> <result column="create_by_id" property="createById" jdbcType="VARCHAR"/>
<result column="create_by_name" property="createByName" jdbcType="VARCHAR" /> <result column="create_by_name" property="createByName" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE" /> <result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="modify_by_id" property="modifyById" jdbcType="VARCHAR" /> <result column="modify_by_id" property="modifyById" jdbcType="VARCHAR"/>
<result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR" /> <result column="modify_by_name" property="modifyByName" jdbcType="VARCHAR"/>
<result column="modify_time" property="modifyTime" jdbcType="DATE" /> <result column="modify_time" property="modifyTime" jdbcType="DATE"/>
</resultMap> </resultMap>
<resultMap id="DataResultMap" type="pps.core.base.entity.BaseLineAllView"> <resultMap id="DataResultMap" type="pps.core.base.entity.BaseLineAllView">
<id column="id" property="id" jdbcType="INTEGER" /> <id column="id" property="id" jdbcType="INTEGER"/>
<result column="line_name" property="lineName" jdbcType="VARCHAR" /> <result column="line_name" property="lineName" jdbcType="VARCHAR"/>
<result column="oil_ou_id" property="oilOuId" jdbcType="VARCHAR" /> <result column="oil_ou_id" property="oilOuId" jdbcType="VARCHAR"/>
<result column="oil_ou_name" property="oilOuName" jdbcType="VARCHAR" /> <result column="oil_ou_name" property="oilOuName" jdbcType="VARCHAR"/>
<result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR" /> <result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR"/>
<result column="well_ou_name" property="wellOuName" jdbcType="VARCHAR" /> <result column="well_ou_name" property="wellOuName" jdbcType="VARCHAR"/>
<result column="longitude" property="longitude" jdbcType="DECIMAL" /> <result column="longitude" property="longitude" jdbcType="DECIMAL"/>
<result column="latitude" property="latitude" jdbcType="DECIMAL" /> <result column="latitude" property="latitude" jdbcType="DECIMAL"/>
<result column="elevation" property="elevation" jdbcType="DECIMAL" /> <result column="elevation" property="elevation" jdbcType="DECIMAL"/>
<result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR" /> <result column="well_ou_id" property="wellOuId" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, id
,
parent_id, parent_id,
line_name, line_name,
line_type, line_type,
...@@ -74,8 +75,7 @@ ...@@ -74,8 +75,7 @@
modify_time modify_time
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseLineView" resultMap="BaseResultMap"> <select id="selectOne" parameterType="pps.core.base.entity.BaseLineView" resultMap="BaseResultMap">
select select d.id oil_ou_id,
d.id oil_ou_id,
d.ou_name oil_ou_name, d.ou_name oil_ou_name,
a.id well_ou_id, a.id well_ou_id,
a.ou_name well_ou_name, a.ou_name well_ou_name,
...@@ -99,8 +99,7 @@ ...@@ -99,8 +99,7 @@
base_line e on c.parent_id = e.id base_line e on c.parent_id = e.id
left join left join
sys_organization d on b.parent_ou_id = d.id sys_organization d on b.parent_ou_id = d.id
where where c.id = #{id}
c.id=#{id}
</select> </select>
<select id="selectList" parameterType="pps.core.base.entity.BaseLineView" resultMap="AllResultMap"> <select id="selectList" parameterType="pps.core.base.entity.BaseLineView" resultMap="AllResultMap">
SELECT SELECT
...@@ -177,4 +176,28 @@ ...@@ -177,4 +176,28 @@
and d.id =#{oilOuId} and d.id =#{oilOuId}
</if> </if>
</select> </select>
<select id="selectListNew" parameterType="pps.core.base.entity.BaseLineView" resultMap="AllResultMap">
SELECT
ou_id as oil_ou_id,
id,
line_name,
upper_line_id as parent_id,
line_name p_line_name,
grid_type_key as grid_type,
line_type_key as line_type
FROM
base_power_line
WHERE
1=1
<if test="lineName!=null and lineName !=''">
and line_name like CONCAT( '%', #{lineName}, '%' )
</if>
<if test="ouIdList != null and ouIdList.size()>0">
and ou_id in
<foreach collection="ouIdList" open="(" close=")" item="item" separator=",">
#{item}
</foreach>
</if>
</select>
</mapper> </mapper>
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