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