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
Expand all 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;
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/resources/mybatis/mapper/pps/core/base/BaseLineViewMapper.xml
View file @ 5e1a4860
......@@ -2,62 +2,63 @@
<!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" />
<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" />
<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" />
<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,
id
,
parent_id,
line_name,
line_type,
......@@ -74,8 +75,7 @@
modify_time
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseLineView" resultMap="BaseResultMap">
select
d.id oil_ou_id,
select d.id oil_ou_id,
d.ou_name oil_ou_name,
a.id well_ou_id,
a.ou_name well_ou_name,
......@@ -99,8 +99,7 @@
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}
where c.id = #{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BaseLineView" resultMap="AllResultMap">
SELECT
......@@ -177,4 +176,28 @@
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