Skip to content

G
gf_back
Commit 0399e6a3 authored by ZWT's avatar ZWT
Browse files
Options

feat(吉林演示): 松原 

1.修改系统首页大屏总览接口,增加区分组织机构逻辑,完成接口冒烟测试;
2.修改系统首页获取井场列表接口,增加区分组织机构逻辑,完成接口冒烟测试;
3.修改系统首页井场功能下钻后提示报错问题,修改用电功率数据获取逻辑,修复报错问题;
4.修改输电线路分页列表查询接口,增加查询条件,在查询父线路列表时只查询10千伏线路,修改线上接口文档同时完成接口冒烟测试;
5.修改系统首页井场实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
6.修改系统首页用能分析接口,增加区分组织机构逻辑,完成接口冒烟测试;
7.修改系统首页井场用能分析(双坐标轴)接口,增加区分组织机构逻辑,完成接口冒烟测试;
8.修改系统首页累积用电接口,增加区分组织机构逻辑,完成接口冒烟测试;
9.修改系统首页光伏实时监控接口,增加区分组织机构逻辑,完成接口冒烟测试;
10.修改系统首页井场效果评价接口,增加区分组织机构逻辑,完成接口冒烟测试;
11.修改系统首页先导实验井间开制度接口,增加区分组织机构逻辑,完成接口冒烟测试;
12.修改极短期间开优化模块井口生产情况油井状态接口,增加区分组织机构逻辑,完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6da3ecc0
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 132 deletions
C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysDictionaryViewMapper.xml
View file @ 0399e6a3
......@@ -65,7 +65,7 @@
select
<include refid="Base_Column_List"/>
from sys_dictionary
where 1=1 and end_time &gt; #{endTime}
where end_time &gt; #{endTime}
<if test="pid != null and pid !=''">
and pid in (${pid})
</if>
......@@ -76,10 +76,11 @@
select
<include refid="Base_Column_List"/>
from sys_dictionary
where 1=1
<where>
<if test="alias != null and alias !=''">
and alias in (${alias})
</if>
</where>
order by create_time desc
</select>
<select id="selectListsByAlias" parameterType="pps.core.system.entity.SysDictionaryView" resultMap="BaseResultMap">
......@@ -87,10 +88,13 @@
<include refid="Base_Column_List"/>
from sys_dictionary
where pid in
(select id from sys_dictionary where 1=1
(select id from sys_dictionary
<where>
<if test="alias != null and alias !=''">
and alias = #{alias}
</if>)
</if>
</where>
)
order by create_time desc
</select>
<select id="selectListsByByDicKeys" parameterType="pps.core.system.entity.SysDictionaryView"
......@@ -98,13 +102,14 @@
select
<include refid="Base_Column_List"/>
from sys_dictionary
where 1=1
<where>
<if test="alias != null and alias !=''">
and (pid in(${pid}) or id in (${pid}))
</if>
<if test="dicName != null and dicName !=''">
and dic_name like '%${dicName}%'
</if>
</where>
order by create_time desc
</select>
<select id="selectSysDictionaryTree" resultType="pps.core.system.entity.SysDictionaryView">
......@@ -268,19 +273,20 @@
select
sd.id,sd.pid,sd.dic_name,sd.short_name,sd.remark,sd.sort,sd.levels,sd.be_default,sd.be_has_children,sd.dic_type,sd.effect_time,sd.end_time,sd.create_name,sd.create_time,sd.modify_name,sd.modify_time,sd.alias,sd.dic_path,sd.dic_key
from sys_dictionary sd
where 1=1
<where>
<if test="dicKey != null and dicKey != ''">
and sd.dic_key like concat('%',#{dicKey},'%')
</if>
<if test="dicName != null and dicName != ''">
and sd.dic_name like concat('%',#{dicName},'%')
</if>
</where>
union
select
sd.id,sd.pid,sd.dic_name,sd.short_name,sd.remark,sd.sort,sd.levels,sd.be_default,sd.be_has_children,sd.dic_type,sd.effect_time,sd.end_time,sd.create_name,sd.create_time,sd.modify_name,sd.modify_time,sd.alias,sd.dic_path,sd.dic_key
from temps inner join sys_dictionary sd on temps.pid = sd.id
)
select temps.* from temps;
select temps.* from temps
</select>
<select id="selectListByParam" resultMap="BaseResultMap" parameterType="pps.core.system.entity.SysDictionaryView">
......
C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysMenuViewMapper.xml
View file @ 0399e6a3
......@@ -146,8 +146,7 @@
join sys_user_group sug on sug.id = sugrr.user_group_id
where suwugr.user_id = #{userId}
and sug.ou_id = #{ouId}))) a
where 1 = 1
and media_type like concat('%', #{mediaType}, '%')
where media_type like concat('%', #{mediaType}, '%')
or media_type = 'ALL'
union
select a.id,
......@@ -266,18 +265,13 @@
where srma.role_id in (select role_id
from sys_user_role_rel surr
where surr.user_id = #{userId})))
where 1 = 1
and media_type like concat('%', #{mediaType}, '%')
where media_type like concat('%', #{mediaType}, '%')
or media_type = 'ALL')
where 1 = 1
and url like concat('%', '/fillProgress?fillConfId', '%')
where url like concat('%', '/fillProgress?fillConfId', '%')
</select>
<select id="selectSysMenuListByUserId" parameterType="pps.core.system.entity.SysMenuView" resultMap="BaseResultMap">
with RECURSIVE temps as
(select *
from (select id,
WITH RECURSIVE temps AS (SELECT id,
menu_name,
menu_pattern,
parent_menu_id,
......@@ -287,16 +281,14 @@
url,
menu_describe,
menu_icon
from sys_menu sm
where sm.id in (select menu_id
from sys_role_menu_auth srma
where srma.role_id in (select role_id
from sys_user_role_rel surr
where surr.user_id = #{userId})))
where 1 = 1
union
select a.id,
FROM sys_menu sm
WHERE sm.id IN (SELECT menu_id
FROM sys_role_menu_auth srma
WHERE srma.role_id IN (SELECT role_id
FROM sys_user_role_rel surr
WHERE surr.user_id = #{userId}))
UNION
SELECT a.id,
a.menu_name,
a.menu_pattern,
a.parent_menu_id,
......@@ -306,11 +298,10 @@
a.url,
a.menu_describe,
a.menu_icon
from temps
inner join sys_menu a on temps.parent_menu_id = a.id)
select distinct temps.*
from temps
FROM temps
INNER JOIN sys_menu a ON temps.parent_menu_id = a.id)
SELECT DISTINCT temps.*
FROM temps
</select>
<select id="selectCountByParentMenuIds" parameterType="pps.core.system.entity.SysMenuView"
......
C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysRoleViewMapper.xml
View file @ 0399e6a3
......@@ -205,13 +205,14 @@
sr.id as roleId,
sr.role_name as roleName
from sys_role sr
where 1=1
<where>
<if test="roleIdList !=null and roleIdList.size()>0">
and sr.id not in
<foreach collection="roleIdList" separator="," open="(" close=")" item="item">
#{item}
</foreach>
</if>
</where>
</select>
<select id="getRoleListInRoleIds" resultType="pps.core.system.entity.SysRoleExtendView"
......@@ -220,13 +221,14 @@
sr.id as roleId,
sr.role_name as roleName
from sys_role sr
where 1=1
<where>
<if test="roleIdList !=null and roleIdList.size()>0">
and sr.id in
<foreach collection="roleIdList" separator="," open="(" close=")" item="item">
#{item}
</foreach>
</if>
</where>
</select>
<!-- 根据用户id查询该用户的所有角色id和名称-->
<select id="getRoleListUserId" parameterType="String" resultType="pps.core.system.entity.SysRoleExtendView">
......
C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysUserGroupRoleRelViewMapper.xml
View file @ 0399e6a3
......@@ -45,10 +45,11 @@
sugrr.modify_time,sr.role_name
from sys_user_group_role_rel sugrr
left join sys_role sr on sr.id=sugrr.role_id
where 1=1
<where>
<if test="userGroupId != null and userGroupId !=''">
and sugrr.user_group_id=#{userGroupId}
</if>
</where>
</select>
<insert id="batchInsert" parameterType="java.util.List">
INSERT INTO sys_user_group_role_rel
......
C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysUserGroupViewMapper.xml
View file @ 0399e6a3
......@@ -51,12 +51,13 @@
sug.sort,so.ou_name
from sys_user_group sug
left join sys_organization so on so.id=sug.ou_id
where 1=1
<where>
<if test="ouId != null and ouId !=''">
and ou_id= #{ouId}
</if>
<if test="userGroupName != null and userGroupName !=''">
and user_group_name like '%${userGroupName}%'
</if>
</where>
</select>
</mapper>
C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysUserWithUserGroupRelViewMapper.xml
View file @ 0399e6a3
......@@ -57,10 +57,11 @@
sug.modify_time,su.user_name
from sys_user_with_user_group_rel sug
left join sys_user su on su.id=sug.user_id
where 1=1
<where>
<if test="userGroupId != null and userGroupId !=''">
and sug.user_group_id=#{userGroupId}
</if>
</where>
</select>
<select id="selectListWithGroup" parameterType="pps.core.system.entity.SysUserWithUserGroupRelView"
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseLineViewMapper.xml
View file @ 0399e6a3
......@@ -126,8 +126,7 @@
base_line e on c.parent_id = e.id
left join
sys_organization d on b.parent_ou_id = d.id
WHERE
1=1
<where>
<if test="lineName!=null and lineName !=''">
and c.line_name like '%${lineName}%'
</if>
......@@ -140,6 +139,7 @@
#{item}
</foreach>
</if>
</where>
</select>
<select id="selectDataList" parameterType="pps.core.base.entity.BaseLineView" resultMap="DataResultMap">
......@@ -164,8 +164,7 @@
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
<where>
<if test="id!=null and id !=''">
and c.id = #{id}
</if>
......@@ -175,6 +174,7 @@
<if test="oilOuId!=null and oilOuId !=''">
and d.id =#{oilOuId}
</if>
</where>
</select>
<select id="selectListNew" parameterType="pps.core.base.entity.BaseLineView" resultMap="AllResultMap">
......@@ -188,8 +188,7 @@
line_type_key as line_type
FROM
base_power_line
WHERE
1=1
<where>
<if test="lineName!=null and lineName !=''">
and line_name like CONCAT( '%', #{lineName}, '%' )
</if>
......@@ -199,5 +198,6 @@
#{item}
</foreach>
</if>
</where>
</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