Commit 65e6ebe2 authored by ZWT's avatar ZWT

得到的

parent 103fb192
......@@ -2,19 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysAreaViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysAreaView">
<result column="id" property="id" jdbcType="INTEGER"/>
<result column="name" property="name" jdbcType="VARCHAR"/>
<result column="parent_id" property="parentId" jdbcType="INTEGER"/>
<result column="lev" property="lev" jdbcType="INTEGER"/>
<result column="city_code" property="cityCode" jdbcType="VARCHAR"/>
<result column="ID" property="id"/>
<result column="NAME" property="name"/>
<result column="PARENT_ID" property="parentId"/>
<result column="LEV" property="lev"/>
<result column="CITY_CODE" property="cityCode"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
name,
parent_id,
lev,
city_code
NAME,
PARENT_ID,
LEV,
CITY_CODE
</sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
select
......@@ -38,63 +38,63 @@
WHERE
id &lt;&gt; 120
ORDER BY
parent_id,
PARENT_ID,
id
</select>
<select id="selectListAllNew" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
WITH RECURSIVE area_tree (n, id, parent_id) AS (SELECT 0 AS n,
id,
parent_id
WITH RECURSIVE AREA_TREE (N, ID, PARENT_ID) AS (SELECT 0 AS N,
ID,
PARENT_ID
FROM SYS_AREA
WHERE parent_id = 20
WHERE PARENT_ID = 20
UNION ALL
SELECT n + 1,
a.id,
a.parent_id
FROM area_tree AS t
JOIN SYS_AREA AS a ON a.parent_id = t.id)
SELECT t.id,
t.parent_id,
t.n AS lev,
a.NAME,
a.city_code,
a.province_code
FROM area_tree t,
SYS_AREA a
WHERE t.id = a.id
ORDER BY t.parent_id,
t.id
SELECT N + 1,
A.ID,
A.PARENT_ID
FROM AREA_TREE AS T
JOIN SYS_AREA AS A ON A.PARENT_ID = T.ID)
SELECT T.ID,
T.PARENT_ID,
T.N AS LEV,
A.NAME,
A.CITY_CODE,
A.PROVINCE_CODE
FROM AREA_TREE T,
SYS_AREA A
WHERE T.ID = A.ID
ORDER BY T.PARENT_ID,
T.ID
</select>
<select id="selectSysAreaPath" parameterType="pps.core.system.entity.SysAreaView" resultMap="BaseResultMap">
SELECT CONCAT(b.`name`, '/', c.`name`) AS `name`
FROM SYS_AREA b
JOIN SYS_AREA c ON b.id = c.parent_id
WHERE b.lev = 1
AND c.lev = 2
AND (b.id = #{id} OR c.id = #{id}) LIMIT 1
SELECT CONCAT(B.`NAME`, '/', C.`NAME`) AS `NAME`
FROM SYS_AREA B
JOIN SYS_AREA C ON B.ID = C.PARENT_ID
WHERE B.LEV = 1
AND C.LEV = 2
AND (B.ID = #{id} OR C.ID = #{id}) LIMIT 1
</select>
<resultMap id="ExtResultMap" type="pps.core.system.entity.SysAreaView" extends="BaseResultMap">
<result column="province" property="province" jdbcType="VARCHAR"/>
<result column="city" property="city" jdbcType="VARCHAR"/>
<result column="PROVINCE" property="province" />
<result column="CITY" property="city" />
</resultMap>
<select id="selectProvinceAndCity" parameterType="list" resultMap="ExtResultMap">
SELECT p.`name` AS province,
a.`name` AS city,
a.city_code,
a.id
FROM SYS_AREA p
LEFT JOIN SYS_AREA a ON p.id = a.parent_id
WHERE p.`name` IN
SELECT P.`NAME` AS PROVINCE,
A.`NAME` AS CITY,
A.CITY_CODE,
A.ID
FROM SYS_AREA P
LEFT JOIN SYS_AREA A ON P.ID = A.PARENT_ID
WHERE P.`NAME` IN
<foreach collection="list" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
AND a.`name` != '无'
AND A.`NAME` != '无'
ORDER BY
p.id,
a.id
P.ID,
A.ID
</select>
</mapper>
......@@ -2,131 +2,131 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysAuthOuScopeViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysAuthOuScopeView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
<result column="user_id" property="userId" jdbcType="VARCHAR"/>
<result column="user_group_id" property="userGroupId" jdbcType="VARCHAR"/>
<result column="menu_id" property="menuId" jdbcType="VARCHAR"/>
<result column="menu_name" property="menuName" 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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<id column="ID" property="id"/>
<result column="OU_ID" property="ouId"/>
<result column="OU_NAME" property="ouName"/>
<result column="USER_ID" property="userId"/>
<result column="USER_GROUP_ID" property="userGroupId"/>
<result column="MENU_ID" property="menuId"/>
<result column="MENU_NAME" property="menuName"/>
<result column="CREATE_BY_ID" property="createById"/>
<result column="CREATE_BY_NAME" property="createByName"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="MODIFY_BY_ID" property="modifyById"/>
<result column="MODIFY_BY_NAME" property="modifyByName"/>
<result column="MODIFY_TIME" property="modifyTime"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
ou_id,
user_id,
user_group_id,
menu_id,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
OU_ID,
USER_ID,
USER_GROUP_ID,
MENU_ID,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysAuthOuScopeView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_AUTH_OU_SCOPE
where
FROM SYS_AUTH_OU_SCOPE
WHERE
id=#{id}
</select>
<select id="selectList" parameterType="pps.core.system.entity.SysAuthOuScopeView" resultMap="BaseResultMap">
select c.id,c.ou_id,c.menu_id,a.ou_name,b.menu_name,c.create_by_name,c.create_time
from SYS_ORGANIZATION a ,SYS_MENU b,SYS_AUTH_OU_SCOPE c
where a.id =c.ou_id and b.id = c.menu_id
and c.user_id = #{userId}
SELECT C.ID,C.OU_ID,C.MENU_ID,A.OU_NAME,B.MENU_NAME,C.CREATE_BY_NAME,C.CREATE_TIME
FROM SYS_ORGANIZATION A ,SYS_MENU B,SYS_AUTH_OU_SCOPE C
WHERE A.ID =C.OU_ID AND B.ID = C.MENU_ID
AND C.USER_ID = #{userId}
<if test="menuName!=null and menuName!='' ">
and b.menu_name like concat('%',#{menuName,jdbcType=VARCHAR},'%')
AND B.MENU_NAME LIKE CONCAT('%',#{menuName,jdbcType=VARCHAR},'%')
</if>
order by a.ou_name asc ,c.create_time desc
ORDER BY A.OU_NAME ASC ,C.CREATE_TIME DESC
</select>
<select id="selectListByUserGroupId" parameterType="pps.core.system.entity.SysAuthOuScopeView"
resultMap="BaseResultMap">
select
sau.id,
sau.ou_id,
sau.user_id,
sau.user_group_id,
sau.menu_id,
sau.create_by_id,
sau.create_by_name,
sau.create_time,
sau.modify_by_id,
sau.modify_by_name,
sau.modify_time,sm.menu_name
from SYS_AUTH_OU_SCOPE sau
left join SYS_MENU sm on sm.id=sau.menu_id
where
SELECT
SAU.ID,
SAU.OU_ID,
SAU.USER_ID,
SAU.USER_GROUP_ID,
SAU.MENU_ID,
SAU.CREATE_BY_ID,
SAU.CREATE_BY_NAME,
SAU.CREATE_TIME,
SAU.MODIFY_BY_ID,
SAU.MODIFY_BY_NAME,
SAU.MODIFY_TIME,SM.MENU_NAME
FROM SYS_AUTH_OU_SCOPE SAU
LEFT JOIN SYS_MENU SM ON SM.ID=SAU.MENU_ID
WHERE
<if test="userGroupId!=null and userGroupId!='' ">
and sau.user_group_id =#{userGroupId}
AND SAU.USER_GROUP_ID =#{userGroupId}
</if>
</select>
<select id="selectOuIdsByUserId" parameterType="pps.core.system.entity.SysAuthOuScopeView"
resultMap="BaseResultMap">
select ou_id, ou_name
from (
(select distinct ou_id
from SYS_AUTH_OU_SCOPE
where user_id = #{userId}) saos
left join SYS_ORGANIZATION so on saos.ou_id = so.id and so.is_deleted = 1
SELECT OU_ID, OU_NAME
FROM (
(SELECT DISTINCT OU_ID
FROM SYS_AUTH_OU_SCOPE
WHERE USER_ID = #{userId}) SAOS
LEFT JOIN SYS_ORGANIZATION SO ON SAOS.OU_ID = SO.ID AND SO.IS_DELETED = 1
)
</select>
<select id="selectOuInfoByCondition" parameterType="pps.core.system.entity.SysAuthOuScopeView"
resultMap="BaseResultMap">
select
saos.ou_id,so.ou_name
from (
SELECT
SAOS.OU_ID,SO.OU_NAME
FROM (
(
select distinct ou_id
from SYS_AUTH_OU_SCOPE
SELECT DISTINCT OU_ID
FROM SYS_AUTH_OU_SCOPE
<where>
<if test="userId != null and userId != ''">
and user_id = #{userId}
AND USER_ID = #{userId}
</if>
<if test="menuId != null and menuId != ''">
and menu_id = #{menuId}
AND MENU_ID = #{menuId}
</if>
</where>
) saos
left join SYS_ORGANIZATION so on saos.ou_id=so.id and so.is_deleted =1
) SAOS
LEFT JOIN SYS_ORGANIZATION SO ON SAOS.OU_ID=SO.ID AND SO.IS_DELETED =1
)
</select>
<select id="selectOuMediaTypeByUserId" parameterType="pps.core.system.entity.SysAuthOuScopeView"
resultType="pps.core.system.entity.SysAuthOuScopeView">
select 'GAS' as media_type
SELECT 'GAS' AS MEDIA_TYPE
</select>
<select id="selectScopeUserInfo" resultType="pps.core.system.entity.SysAuthOuScopeUserInfo">
select distinct su.id,
su.user_name,
su.login_name,
su.iam_login_name,
so.id,
so.ou_name
from SYS_AUTH_OU_SCOPE saos,
SYS_USER su,
SYS_ORGANIZATION so,
SYS_MENU sm,
SYS_USER_ORGANIZATION_REL suor
where saos.user_id = su.id
and suor.ou_id = so.id
and saos.menu_id = sm.id
and saos.user_id = suor.user_id
and saos.menu_id = #{menuId}
and saos.ou_id = #{ouId}
SELECT DISTINCT SU.ID,
SU.USER_NAME,
SU.LOGIN_NAME,
SU.IAM_LOGIN_NAME,
SO.ID,
SO.OU_NAME
FROM SYS_AUTH_OU_SCOPE SAOS,
SYS_USER SU,
SYS_ORGANIZATION SO,
SYS_MENU SM,
SYS_USER_ORGANIZATION_REL SUOR
WHERE SAOS.USER_ID = SU.ID
AND SUOR.OU_ID = SO.ID
AND SAOS.MENU_ID = SM.ID
AND SAOS.USER_ID = SUOR.USER_ID
AND SAOS.MENU_ID = #{menuId}
AND SAOS.OU_ID = #{ouId}
</select>
<insert id="batchInsert" parameterType="java.util.List">
INSERT INTO SYS_AUTH_OU_SCOPE
(id, ou_id, user_id, user_group_id, menu_id, create_by_id, create_by_name, create_time)
(ID, OU_ID, USER_ID, USER_GROUP_ID, MENU_ID, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.id}, #{item.ouId}, #{item.userId}, #{item.userGroupId}, #{item.menuId}, #{item.createById},
......
......@@ -2,69 +2,69 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysOrganizationDictionaryViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysOrganizationDictionaryView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="parent_dic_code" property="parentDicCode" jdbcType="VARCHAR"/>
<result column="dic_code" property="dicCode" jdbcType="VARCHAR"/>
<result column="effect_time" property="effectTime" jdbcType="TIMESTAMP"/>
<result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
<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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<id column="ID" property="id" />
<result column="OU_ID" property="ouId" />
<result column="PARENT_DIC_CODE" property="parentDicCode" />
<result column="DIC_CODE" property="dicCode" />
<result column="EFFECT_TIME" property="effectTime" />
<result column="END_TIME" property="endTime" />
<result column="CREATE_BY_ID" property="createById" />
<result column="CREATE_BY_NAME" property="createByName" />
<result column="CREATE_TIME" property="createTime" />
<result column="MODIFY_BY_ID" property="modifyById" />
<result column="MODIFY_BY_NAME" property="modifyByName" />
<result column="MODIFY_TIME" property="modifyTime" />
</resultMap>
<sql id="Base_Column_List">
id
ID
,
ou_id,
parent_dic_code,
dic_code,
effect_time,
end_time,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
OU_ID,
PARENT_DIC_CODE,
DIC_CODE,
EFFECT_TIME,
END_TIME,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysOrganizationDictionaryView"
resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_DICTIONARY
where
id=#{id}
FROM SYS_ORGANIZATION_DICTIONARY
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.system.entity.SysOrganizationDictionaryView"
resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_DICTIONARY
where
id=#{id}
FROM SYS_ORGANIZATION_DICTIONARY
WHERE
ID=#{id}
</select>
<select id="selectListByOuId" parameterType="pps.core.system.entity.SysOrganizationDictionaryView"
resultMap="BaseResultMap">
select
dic_code,parent_dic_code
from SYS_ORGANIZATION_DICTIONARY
where end_time &gt; #{endTime}
SELECT
DIC_CODE,PARENT_DIC_CODE
FROM SYS_ORGANIZATION_DICTIONARY
WHERE END_TIME &gt; #{endTime}
<if test="ouId != null and ouId !=''">
and ou_id=#{ouId}
AND OU_ID=#{ouId}
</if>
</select>
<select id="selectListByDictionaryOuId" parameterType="pps.core.system.entity.SysOrganizationDictionaryView"
resultMap="BaseResultMap">
select a.dic_code,
a.parent_dic_code,
b.dic_key,
b.dic_name
from SYS_ORGANIZATION_DICTIONARY a
left join SYS_DICTIONARY b on b.id = a.dic_code
where a.end_time &gt; #{endTime}
and a.ou_id = #{ouId}
SELECT A.DIC_CODE,
A.PARENT_DIC_CODE,
B.DIC_KEY,
B.DIC_NAME
FROM SYS_ORGANIZATION_DICTIONARY A
LEFT JOIN SYS_DICTIONARY B ON B.ID = A.DIC_CODE
WHERE A.END_TIME &gt; #{endTime}
AND A.OU_ID = #{ouId}
</select>
</mapper>
......@@ -2,47 +2,47 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysOrganizationPropertyViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysOrganizationPropertyView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="property_code" property="propertyCode" jdbcType="VARCHAR"/>
<result column="property_value" property="propertyValue" jdbcType="VARCHAR"/>
<result column="effect_time" property="effectTime" jdbcType="TIMESTAMP"/>
<result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
<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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<id column="ID" property="id" />
<result column="OU_ID" property="ouId" />
<result column="PROPERTY_CODE" property="propertyCode" />
<result column="PROPERTY_VALUE" property="propertyValue" />
<result column="EFFECT_TIME" property="effectTime" />
<result column="END_TIME" property="endTime" />
<result column="CREATE_BY_ID" property="createById" />
<result column="CREATE_BY_NAME" property="createByName" />
<result column="CREATE_TIME" property="createTime" />
<result column="MODIFY_BY_ID" property="modifyById" />
<result column="MODIFY_BY_NAME" property="modifyByName" />
<result column="MODIFY_TIME" property="modifyTime" />
</resultMap>
<sql id="Base_Column_List">
id
ID
,
ou_id,
property_code,
property_value,
effect_time,
end_time,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
OU_ID,
PROPERTY_CODE,
PROPERTY_VALUE,
EFFECT_TIME,
END_TIME,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysOrganizationPropertyView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_PROPERTY
where
id=#{id}
FROM SYS_ORGANIZATION_PROPERTY
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.system.entity.SysOrganizationPropertyView"
resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_PROPERTY
where
ou_id=#{ouId} and end_time &gt;= #{endTime}
FROM SYS_ORGANIZATION_PROPERTY
WHERE
OU_ID=#{ouId} AND END_TIME &gt;= #{endTime}
</select>
</mapper>
......@@ -2,75 +2,75 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysOrganizationRelViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysOrganizationRelView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="parent_ou_id" property="parentOuId" jdbcType="VARCHAR"/>
<result column="levels" property="levels" jdbcType="INTEGER"/>
<result column="ou_id_path" property="ouIdPath" jdbcType="VARCHAR"/>
<result column="is_has_children" property="isHasChildren" jdbcType="INTEGER"/>
<result column="effect_time" property="effectTime" jdbcType="TIMESTAMP"/>
<result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
<result column="sort" property="sort" jdbcType="INTEGER"/>
<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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<id column="ID" property="id" />
<result column="OU_ID" property="ouId" />
<result column="PARENT_OU_ID" property="parentOuId" />
<result column="LEVELS" property="levels" />
<result column="OU_ID_PATH" property="ouIdPath" />
<result column="IS_HAS_CHILDREN" property="isHasChildren" />
<result column="EFFECT_TIME" property="effectTime" />
<result column="END_TIME" property="endTime" />
<result column="SORT" property="sort" />
<result column="CREATE_BY_ID" property="createById" />
<result column="CREATE_BY_NAME" property="createByName" />
<result column="CREATE_TIME" property="createTime" />
<result column="MODIFY_BY_ID" property="modifyById" />
<result column="MODIFY_BY_NAME" property="modifyByName" />
<result column="MODIFY_TIME" property="modifyTime" />
</resultMap>
<sql id="Base_Column_List">
id
ID
,
ou_id,
parent_ou_id,
levels,
ou_id_path,
is_has_children,
effect_time,
end_time,
sort,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
OU_ID,
PARENT_OU_ID,
LEVELS,
OU_ID_PATH,
IS_HAS_CHILDREN,
EFFECT_TIME,
END_TIME,
SORT,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysOrganizationRelView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_REL
where
id=#{id}
FROM SYS_ORGANIZATION_REL
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.system.entity.SysOrganizationRelView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_REL
where
id=#{id}
FROM SYS_ORGANIZATION_REL
WHERE
ID=#{id}
</select>
<select id="selectEffective" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ORGANIZATION_REL
where effect_time &lt;= now() and end_time &gt;= now()
FROM SYS_ORGANIZATION_REL
WHERE EFFECT_TIME &lt;= now() AND END_TIME &gt;= now()
</select>
<select id="selectMaxSort" parameterType="String" resultType="pps.core.system.entity.SysOrganizationRelView">
select max(sor.sort) as sort,
sor.parent_ou_id
from SYS_ORGANIZATION_REL sor
where sor.parent_ou_id = #{parentOuId}
and sor.effect_time &lt;= now()
and sor.end_time &gt;= now()
group by sor.parent_ou_id limit 1
SELECT MAX(SOR.SORT) AS SORT,
SOR.PARENT_OU_ID
FROM SYS_ORGANIZATION_REL SOR
WHERE SOR.PARENT_OU_ID = #{parentOuId}
AND SOR.EFFECT_TIME &lt;= NOW()
AND SOR.END_TIME &gt;= NOW()
GROUP BY SOR.PARENT_OU_ID LIMIT 1
</select>
<select id="selectListByOuId" parameterType="String" resultMap="BaseResultMap">
select sor.*
from SYS_ORGANIZATION_REL sor
left join SYS_ORGANIZATION_REL sor2 on sor.parent_ou_id = sor2.ou_id
where sor2.parent_ou_id = #{ouId}
SELECT SOR.*
FROM SYS_ORGANIZATION_REL SOR
LEFT JOIN SYS_ORGANIZATION_REL SOR2 ON SOR.PARENT_OU_ID = SOR2.OU_ID
WHERE SOR2.PARENT_OU_ID = #{ouId}
</select>
</mapper>
......@@ -2,32 +2,32 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysRoleMenuAuthViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysRoleMenuAuthView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="role_id" property="roleId" jdbcType="VARCHAR"/>
<result column="menu_id" property="menuId" 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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<id column="ID" property="id"/>
<result column="ROLE_ID" property="roleId"/>
<result column="MENU_ID" property="menuId"/>
<result column="CREATE_BY_ID" property="createById"/>
<result column="CREATE_BY_NAME" property="createByName"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="MODIFY_BY_ID" property="modifyById"/>
<result column="MODIFY_BY_NAME" property="modifyByName"/>
<result column="MODIFY_TIME" property="modifyTime"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
role_id,
menu_id,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
ROLE_ID,
MENU_ID,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<insert id="batchInsert" parameterType="java.util.List">
insert into SYS_ROLE_MENU_AUTH (id,role_id,menu_id,create_by_id,create_by_name,create_time)
values
INSERT INTO SYS_ROLE_MENU_AUTH (ID,ROLE_ID,MENU_ID,CREATE_BY_ID,CREATE_BY_NAME,CREATE_TIME)
VALUES
<foreach collection="list" item="roleMenuAuth" separator=",">
(
#{roleMenuAuth.id},
......@@ -41,35 +41,35 @@
</insert>
<select id="selectOne" parameterType="pps.core.system.entity.SysRoleMenuAuthView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ROLE_MENU_AUTH
where
id=#{id}
FROM SYS_ROLE_MENU_AUTH
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.system.entity.SysRoleMenuAuthView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_ROLE_MENU_AUTH
where
id=#{id}
FROM SYS_ROLE_MENU_AUTH
WHERE
ID=#{id}
</select>
<select id="selectListByRoleId" parameterType="pps.core.system.entity.SysRoleMenuAuthView"
resultMap="BaseResultMap">
select srma.id,
srma.role_id,
srma.menu_id,
srma.create_by_id,
srma.create_by_name,
srma.create_time,
srma.modify_by_id,
srma.modify_by_name,
srma.modify_time
from SYS_ROLE_MENU_AUTH srma
right join SYS_MENU sm on srma.menu_id = sm.id
where sm.url !='#' and
srma.role_id=#{roleId}
SELECT SRMA.ID,
SRMA.ROLE_ID,
SRMA.MENU_ID,
SRMA.CREATE_BY_ID,
SRMA.CREATE_BY_NAME,
SRMA.CREATE_TIME,
SRMA.MODIFY_BY_ID,
SRMA.MODIFY_BY_NAME,
SRMA.MODIFY_TIME
FROM SYS_ROLE_MENU_AUTH SRMA
RIGHT JOIN SYS_MENU SM ON SRMA.MENU_ID = SM.ID
WHERE SM.URL !='#'
AND SRMA.ROLE_ID=#{roleId}
</select>
</mapper>
......@@ -2,89 +2,89 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.system.mapper.SysUserOrganizationRelViewMapper">
<resultMap id="BaseResultMap" type="pps.core.system.entity.SysUserOrganizationRelView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="user_id" property="userId" 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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<result column="effect_time" property="effectTime" jdbcType="TIMESTAMP"/>
<result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
<result column="station_id" property="stationId" jdbcType="VARCHAR"/>
<result column="station_name" property="stationName" jdbcType="VARCHAR"/>
<id column="ID" property="id" />
<result column="OU_ID" property="ouId" />
<result column="USER_ID" property="userId" />
<result column="CREATE_BY_ID" property="createById" />
<result column="CREATE_BY_NAME" property="createByName" />
<result column="CREATE_TIME" property="createTime" />
<result column="MODIFY_BY_ID" property="modifyById" />
<result column="MODIFY_BY_NAME" property="modifyByName" />
<result column="MODIFY_TIME" property="modifyTime" />
<result column="EFFECT_TIME" property="effectTime" />
<result column="END_TIME" property="endTime" />
<result column="OU_NAME" property="ouName" />
<result column="STATION_ID" property="stationId" />
<result column="STATION_NAME" property="stationName" />
</resultMap>
<sql id="Base_Column_List">
id
ID
,
ou_id,
user_id,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time,
effect_time,
end_time
OU_ID,
USER_ID,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME,
EFFECT_TIME,
END_TIME
</sql>
<select id="selectOne" parameterType="pps.core.system.entity.SysUserOrganizationRelView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_USER_ORGANIZATION_REL
where
id=#{id}
FROM SYS_USER_ORGANIZATION_REL
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.system.entity.SysUserOrganizationRelView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from SYS_USER_ORGANIZATION_REL
where
id=#{id}
FROM SYS_USER_ORGANIZATION_REL
WHERE
ID=#{id}
</select>
<select id="selectOrgList" parameterType="pps.core.system.entity.SysUserOrganizationRelView"
resultType="pps.core.system.entity.SysOrganizationView">
select *
from SYS_ORGANIZATION
where is_deleted = 1
SELECT *
FROM SYS_ORGANIZATION
WHERE IS_DELETED = 1
</select>
<select id="getSysOrganizationByUserId" parameterType="pps.core.system.entity.SysUserOrganizationRelView"
resultMap="BaseResultMap">
select distinct suor.id,
suor.ou_id,
so.ou_name,
suor.user_id,
os.id as station_id,
os.station_name,
os.station_code,
os.medium_type
from SYS_USER_ORGANIZATION_REL suor
left join SYS_ORGANIZATION so on suor.ou_id = so.id
left join base_station_ou_rel osor on suor.ou_id = osor.ou_id and osor.effect_time &lt;= #{endTime} and
osor.end_time &gt;= #{endTime}
left join base_station os on osor.station_id = os.id
where so.is_deleted = 1
and suor.user_id = #{userId}
and suor.effect_time &lt;= #{endTime}
and suor.end_time &gt;= #{endTime}
order by station_id desc
SELECT DISTINCT SUOR.ID,
SUOR.OU_ID,
SO.OU_NAME,
SUOR.USER_ID,
OS.ID AS STATION_ID,
OS.STATION_NAME,
OS.STATION_CODE,
OS.MEDIUM_TYPE
FROM SYS_USER_ORGANIZATION_REL SUOR
LEFT JOIN SYS_ORGANIZATION SO ON SUOR.OU_ID = SO.ID
LEFT JOIN BASE_STATION_OU_REL OSOR ON SUOR.OU_ID = OSOR.OU_ID AND OSOR.EFFECT_TIME &lt;= #{endTime} AND
OSOR.END_TIME &gt;= #{endTime}
LEFT JOIN BASE_STATION OS ON OSOR.STATION_ID = OS.ID
WHERE SO.IS_DELETED = 1
AND SUOR.USER_ID = #{userId}
AND SUOR.EFFECT_TIME &lt;= #{endTime}
AND SUOR.END_TIME &gt;= #{endTime}
ORDER BY STATION_ID DESC
</select>
<!--获取用户组织-->
<select id="getOrgListByUserId" parameterType="pps.core.system.entity.SysUserOrganizationRelView"
resultMap="BaseResultMap">
select suor.ou_id,
so.ou_name
from SYS_USER_ORGANIZATION_REL suor
left join SYS_ORGANIZATION so on suor.ou_id = so.id
where so.is_deleted = 1
and suor.user_id = #{userId}
and suor.effect_time &lt;= now()
and suor.end_time &gt;= now()
order by so.create_time desc
SELECT SUOR.OU_ID,
SO.OU_NAME
FROM SYS_USER_ORGANIZATION_REL SUOR
LEFT JOIN SYS_ORGANIZATION SO ON SUOR.OU_ID = SO.ID
WHERE SO.IS_DELETED = 1
AND SUOR.USER_ID = #{userId}
AND SUOR.EFFECT_TIME &lt;= NOW()
AND SUOR.END_TIME &gt;= NOW()
ORDER BY SO.CREATE_TIME DESC
</select>
</mapper>
......@@ -167,8 +167,8 @@ public class BaseDieselGeneratorService {
boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
queryWrapper.lambda()
.notExists(!equals, "SELECT 1 FROM base_power_line_diesel w WHERE base_diesel_generator.id = w.diesel_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM base_power_line_diesel w WHERE base_diesel_generator.id = w.diesel_id AND w.is_deleted = 1")
.notExists(!equals, "SELECT 1 FROM BASE_POWER_LINE_DIESEL W WHERE BASE_DIESEL_GENERATOR.ID = W.DIESEL_ID AND W.IS_DELETED = 1 AND W.LINE_ID <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM BASE_POWER_LINE_DIESEL W WHERE BASE_DIESEL_GENERATOR.ID = W.DIESEL_ID AND W.IS_DELETED = 1")
.eq(BaseDieselGeneratorEnt::getOuId, input.getOuId());
} else {
List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
......
......@@ -167,8 +167,8 @@ public class BaseEnergyStorageDeviceService {
boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
queryWrapper.lambda()
.notExists(!equals, "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM base_power_line_storage w WHERE base_energy_storage_device.id = w.storage_id AND w.is_deleted = 1")
.notExists(!equals, "SELECT 1 FROM BASE_POWER_LINE_STORAGE W WHERE BASE_ENERGY_STORAGE_DEVICE.ID = W.STORAGE_ID AND W.IS_DELETED = 1 AND W.LINE_ID <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM BASE_POWER_LINE_STORAGE W WHERE BASE_ENERGY_STORAGE_DEVICE.ID = W.STORAGE_ID AND W.IS_DELETED = 1")
.eq(BaseEnergyStorageDeviceEnt::getOuId, input.getOuId());
} else {
List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
......
......@@ -237,8 +237,8 @@ public class BasePhotovoltaicPlantService {
boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
queryWrapper.lambda()
.notExists(!equals, "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM base_power_line_plant w WHERE base_photovoltaic_plant.id = w.plant_id AND w.is_deleted = 1")
.notExists(!equals, "SELECT 1 FROM BASE_POWER_LINE_PLANT W WHERE BASE_PHOTOVOLTAIC_PLANT.ID = W.PLANT_ID AND W.IS_DELETED = 1 AND W.LINE_ID <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM BASE_POWER_LINE_PLANT W WHERE BASE_PHOTOVOLTAIC_PLANT.ID = W.PLANT_ID AND W.IS_DELETED = 1")
.eq(BasePhotovoltaicPlantEnt::getOuId, input.getOuId());
} else {
List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
......
......@@ -171,8 +171,8 @@ public class BaseWellheadService {
boolean equals = CharSequenceUtil.equals(BusinessConstant.LINE_FLAG_ID, input.getLineId());
if (CharSequenceUtil.isNotEmpty(input.getLineId())) {
queryWrapper.lambda()
.notExists(!equals, "SELECT 1 FROM base_power_line_wellhead w WHERE base_wellhead.id = w.wellhead_id AND w.is_deleted = 1 AND w.line_id <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM base_power_line_wellhead w WHERE base_wellhead.id = w.wellhead_id AND w.is_deleted = 1")
.notExists(!equals, "SELECT 1 FROM BASE_POWER_LINE_WELLHEAD W WHERE BASE_WELLHEAD.ID = W.WELLHEAD_ID AND W.IS_DELETED = 1 AND W.LINE_ID <> {0}", input.getLineId())
.notExists(equals, "SELECT 1 FROM BASE_POWER_LINE_WELLHEAD W WHERE BASE_WELLHEAD.ID = W.WELLHEAD_ID AND W.IS_DELETED = 1")
.eq(BaseWellheadEnt::getOuId, input.getOuId());
} else {
List<String> allListByOuId = ServiceUtil.getOrgIdsByPath(context, input.getOuId());
......
......@@ -2,67 +2,69 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseDataViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BaseDataView">
<id column="id" property="id" jdbcType="INTEGER"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="line_id" property="lineId" jdbcType="INTEGER"/>
<result column="data_date" property="dataDate" jdbcType="DATE"/>
<result column="wind_speed" property="windSpeed" jdbcType="DECIMAL"/>
<result column="wind_direction" property="windDirection" jdbcType="DECIMAL"/>
<result column="temperature" property="temperature" jdbcType="DECIMAL"/>
<result column="pressure" property="pressure" jdbcType="DECIMAL"/>
<result column="humidity" property="humidity" jdbcType="DECIMAL"/>
<result column="plane_Irradiance" property="planeIrradiance" jdbcType="DECIMAL"/>
<result column="horizontal_Irradiance" property="horizontalIrradiance" jdbcType="DECIMAL"/>
<result column="power" property="power" jdbcType="DECIMAL"/>
<result column="predicted_power" property="predictedPower" jdbcType="DECIMAL"/>
<id column="ID" property="id"/>
<result column="OU_ID" property="ouId"/>
<result column="LINE_ID" property="lineId"/>
<result column="DATA_DATE" property="dataDate"/>
<result column="WIND_SPEED" property="windSpeed"/>
<result column="WIND_DIRECTION" property="windDirection"/>
<result column="TEMPERATURE" property="temperature"/>
<result column="PRESSURE" property="pressure"/>
<result column="HUMIDITY" property="humidity"/>
<result column="PLANE_IRRADIANCE" property="planeIrradiance"/>
<result column="HORIZONTAL_IRRADIANCE" property="horizontalIrradiance"/>
<result column="POWER" property="power"/>
<result column="PREDICTED_POWER" property="predictedPower"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
ou_id,
line_id,
data_date,
wind_speed,
wind_direction,
temperature,
pressure,
humidity,
plane_Irradiance,
horizontal_Irradiance,
power,
predicted_power
OU_ID,
LINE_ID,
DATA_DATE,
WIND_SPEED,
WIND_DIRECTION,
TEMPERATURE,
PRESSURE,
HUMIDITY,
PLANE_IRRADIANCE,
HORIZONTAL_IRRADIANCE,
POWER,
PREDICTED_POWER
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseDataView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_DATA
where
id=#{id}
FROM BASE_DATA
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BaseDataView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_DATA
where
id=#{id}
FROM BASE_DATA
WHERE
ID=#{id}
</select>
<insert id="batchInsert">
insert into BASE_DATA(
ou_id,
line_id,
data_date,
wind_speed,
wind_direction,
temperature,
pressure,
humidity,
plane_Irradiance,
horizontal_Irradiance,
power,
predicted_power,
weather
INSERT INTO BASE_DATA(
OU_ID,
LINE_ID,
DATA_DATE,
WIND_SPEED,
WIND_DIRECTION,
TEMPERATURE,
PRESSURE,
HUMIDITY,
PLANE_IRRADIANCE,
HORIZONTAL_IRRADIANCE,
POWER,
PREDICTED_POWER,
WEATHER
) VALUES
<foreach collection="list" item="item" separator=",">
(
......
......@@ -2,61 +2,64 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseDieselGeneratorViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BaseDieselGeneratorView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<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"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
<result column="device_name" property="deviceName" jdbcType="VARCHAR"/>
<result column="maker_number" property="makerNumber" jdbcType="VARCHAR"/>
<result column="unit_type_key" property="unitTypeKey" jdbcType="VARCHAR"/>
<result column="unit_type_name" property="unitTypeName" jdbcType="VARCHAR"/>
<result column="normal_power" property="normalPower" jdbcType="DECIMAL"/>
<result column="standby_power" property="standbyPower" jdbcType="DECIMAL"/>
<id column="ID" property="id"/>
<result column="IS_DELETED" property="isDeleted"/>
<result column="CREATE_BY_ID" property="createById"/>
<result column="CREATE_BY_NAME" property="createByName"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="MODIFY_BY_ID" property="modifyById"/>
<result column="MODIFY_BY_NAME" property="modifyByName"/>
<result column="MODIFY_TIME" property="modifyTime"/>
<result column="OU_ID" property="ouId"/>
<result column="OU_NAME" property="ouName"/>
<result column="DEVICE_NAME" property="deviceName"/>
<result column="MAKER_NUMBER" property="makerNumber"/>
<result column="UNIT_TYPE_KEY" property="unitTypeKey"/>
<result column="UNIT_TYPE_NAME" property="unitTypeName"/>
<result column="NORMAL_POWER" property="normalPower"/>
<result column="STANDBY_POWER" property="standbyPower"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
is_deleted,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time,
ou_id,
ou_name,
device_name,
maker_number,
unit_type_key,
unit_type_name,
normal_power,
standby_power
IS_DELETED,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME,
OU_ID,
OU_NAME,
DEVICE_NAME,
MAKER_NUMBER,
UNIT_TYPE_KEY,
UNIT_TYPE_NAME,
NORMAL_POWER,
STANDBY_POWER
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseDieselGeneratorView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_DIESEL_GENERATOR
where
id=#{id}
FROM BASE_DIESEL_GENERATOR
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BaseDieselGeneratorView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_DIESEL_GENERATOR
where
id=#{id}
FROM BASE_DIESEL_GENERATOR
WHERE
ID=#{id}
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO BASE_DIESEL_GENERATOR (id, is_deleted, create_by_id, create_by_name, create_time, modify_by_id,
modify_by_name, modify_time, ou_id, ou_name, device_name, maker_number, unit_type_name,
normal_power, standby_power) VALUES
INSERT INTO BASE_DIESEL_GENERATOR (ID, IS_DELETED, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME, MODIFY_BY_ID,
MODIFY_BY_NAME, MODIFY_TIME, OU_ID, OU_NAME, DEVICE_NAME, MAKER_NUMBER, UNIT_TYPE_NAME,
NORMAL_POWER, STANDBY_POWER) VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.id},
......
......@@ -2,68 +2,70 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseEnergyStorageDeviceViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BaseEnergyStorageDeviceView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<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"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<result column="ou_name" property="ouName" jdbcType="VARCHAR"/>
<result column="device_name" property="deviceName" jdbcType="VARCHAR"/>
<result column="maker_number" property="makerNumber" jdbcType="VARCHAR"/>
<result column="storage_model_key" property="storageModelKey" jdbcType="VARCHAR"/>
<result column="storage_model_name" property="storageModelName" jdbcType="VARCHAR"/>
<result column="apparatus_capacity" property="apparatusCapacity" jdbcType="DECIMAL"/>
<result column="rated_discharge_power" property="ratedDischargePower" jdbcType="DECIMAL"/>
<result column="rated_charging_power" property="ratedChargingPower" jdbcType="DECIMAL"/>
<result column="rated_discharge_depth" property="ratedDischargeDepth" jdbcType="DECIMAL"/>
<result column="rated_discharge_efficiency" property="ratedDischargeEfficiency" jdbcType="DECIMAL"/>
<id column="ID" property="id" />
<result column="IS_DELETED" property="isDeleted" />
<result column="CREATE_BY_ID" property="createById" />
<result column="CREATE_BY_NAME" property="createByName" />
<result column="CREATE_TIME" property="createTime" />
<result column="MODIFY_BY_ID" property="modifyById" />
<result column="MODIFY_BY_NAME" property="modifyByName" />
<result column="MODIFY_TIME" property="modifyTime" />
<result column="OU_ID" property="ouId" />
<result column="OU_NAME" property="ouName" />
<result column="DEVICE_NAME" property="deviceName" />
<result column="MAKER_NUMBER" property="makerNumber" />
<result column="STORAGE_MODEL_KEY" property="storageModelKey" />
<result column="STORAGE_MODEL_NAME" property="storageModelName" />
<result column="APPARATUS_CAPACITY" property="apparatusCapacity" />
<result column="RATED_DISCHARGE_POWER" property="ratedDischargePower" />
<result column="RATED_CHARGING_POWER" property="ratedChargingPower" />
<result column="RATED_DISCHARGE_DEPTH" property="ratedDischargeDepth" />
<result column="RATED_DISCHARGE_EFFICIENCY" property="ratedDischargeEfficiency" />
</resultMap>
<sql id="Base_Column_List">
id
ID
,
is_deleted,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time,
ou_id,
ou_name,
device_name,
maker_number,
storage_model_key,
storage_model_name,
apparatus_capacity,
rated_discharge_power,
rated_charging_power,
rated_discharge_depth,
rated_discharge_efficiency
IS_DELETED,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME,
OU_ID,
OU_NAME,
DEVICE_NAME,
MAKER_NUMBER,
STORAGE_MODEL_KEY,
STORAGE_MODEL_NAME,
APPARATUS_CAPACITY,
RATED_DISCHARGE_POWER,
RATED_CHARGING_POWER,
RATED_DISCHARGE_DEPTH,
RATED_DISCHARGE_EFFICIENCY
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseEnergyStorageDeviceView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_ENERGY_STORAGE_DEVICE
where
id=#{id}
FROM BASE_ENERGY_STORAGE_DEVICE
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BaseEnergyStorageDeviceView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_ENERGY_STORAGE_DEVICE
where
id=#{id}
FROM BASE_ENERGY_STORAGE_DEVICE
WHERE
ID=#{id}
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO BASE_ENERGY_STORAGE_DEVICE (id, is_deleted, create_by_id, create_by_name, create_time, modify_by_id,
modify_by_name, modify_time, ou_id, ou_name, device_name, maker_number, storage_model_name,
apparatus_capacity, rated_discharge_power, rated_charging_power, rated_discharge_depth,
rated_discharge_efficiency) VALUES
INSERT INTO BASE_ENERGY_STORAGE_DEVICE (ID, IS_DELETED, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME, MODIFY_BY_ID,
MODIFY_BY_NAME, MODIFY_TIME, OU_ID, OU_NAME, DEVICE_NAME, MAKER_NUMBER, STORAGE_MODEL_NAME,
APPARATUS_CAPACITY, RATED_DISCHARGE_POWER, RATED_CHARGING_POWER, RATED_DISCHARGE_DEPTH,
RATED_DISCHARGE_EFFICIENCY) VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.id},
......
......@@ -2,51 +2,44 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseLineAttenuationRateViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BaseLineAttenuationRateView">
<id column="id" property="id" jdbcType="INTEGER"/>
<result column="line_id" property="lineId" jdbcType="INTEGER"/>
<result column="particular_year" property="particularYear" jdbcType="VARCHAR"/>
<result column="attenuation_rate" property="attenuationRate" jdbcType="DECIMAL"/>
<result column="sort" property="sort" jdbcType="INTEGER"/>
<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"/>
<result column="LINE_ID" property="lineId"/>
<result column="PARTICULAR_YEAR" property="particularYear"/>
<result column="ATTENUATION_RATE" property="attenuationRate"/>
<result column="SORT" property="sort"/>
<result column="CREATE_BY_ID" property="createById"/>
<result column="CREATE_BY_NAME" property="createByName"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="MODIFY_BY_ID" property="modifyById"/>
<result column="MODIFY_BY_NAME" property="modifyByName"/>
<result column="MODIFY_TIME" property="modifyTime"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
line_id,
particular_year,
attenuation_rate,
sort,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
LINE_ID,
PARTICULAR_YEAR,
ATTENUATION_RATE,
SORT,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BaseLineAttenuationRateView" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from BASE_LINE_ATTENUATION_RATE
where
id=#{id}
</select>
<insert id="batchInsert">
insert into BASE_LINE_ATTENUATION_RATE(
line_id,
particular_year,
attenuation_rate,
sort,
type,
create_by_id,
create_by_name,
create_time
INSERT INTO BASE_LINE_ATTENUATION_RATE(
LINE_ID,
PARTICULAR_YEAR,
ATTENUATION_RATE,
SORT,
TYPE,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME
) VALUES
<foreach collection="list" item="item" separator=",">
(
......
......@@ -2,55 +2,58 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePhotovoltaicPlantMapeAdjViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePhotovoltaicPlantMapeAdjView">
<id column="id" property="id" jdbcType="INTEGER"/>
<result column="plant_id" property="plantId" jdbcType="VARCHAR"/>
<result column="mape_type" property="mapeType" jdbcType="INTEGER"/>
<result column="mape_plus_val" property="mapePlusVal" jdbcType="DECIMAL"/>
<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="TIMESTAMP"/>
<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="TIMESTAMP"/>
<id column="ID" property="id"/>
<result column="PLANT_ID" property="plantId"/>
<result column="MAPE_TYPE" property="mapeType"/>
<result column="MAPE_PLUS_VAL" property="mapePlusVal"/>
<result column="CREATE_BY_ID" property="createById"/>
<result column="CREATE_BY_NAME" property="createByName"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="MODIFY_BY_ID" property="modifyById"/>
<result column="MODIFY_BY_NAME" property="modifyByName"/>
<result column="MODIFY_TIME" property="modifyTime"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
plant_id,
mape_type,
mape_plus_val,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time
PLANT_ID,
MAPE_TYPE,
MAPE_PLUS_VAL,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePhotovoltaicPlantMapeAdjView"
resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_PHOTOVOLTAIC_PLANT_MAPE_ADJ
FROM BASE_PHOTOVOLTAIC_PLANT_MAPE_ADJ
<where>
<if test="plantId != null and plantId != ''">
and plant_id = #{plantId}
AND PLANT_ID = #{plantId}
</if>
<if test="mapeType != null">
and mape_type = #{mapeType}
AND MAPE_TYPE = #{mapeType}
</if>
<if test="id != null">
and id = #{id}
AND ID = #{id}
</if>
</where>
order by create_time desc
limit 1
ORDER BY CREATE_TIME DESC
LIMIT 1
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePhotovoltaicPlantMapeAdjView"
resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_PHOTOVOLTAIC_PLANT_MAPE_ADJ
where
id=#{id}
FROM BASE_PHOTOVOLTAIC_PLANT_MAPE_ADJ
WHERE
ID=#{id}
</select>
</mapper>
\ No newline at end of file
......@@ -2,60 +2,61 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePowerLineDieselViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePowerLineDieselView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<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"/>
<result column="line_id" property="lineId" jdbcType="VARCHAR"/>
<result column="diesel_id" property="dieselId" jdbcType="VARCHAR"/>
<result column="ou_id" property="ouId" jdbcType="VARCHAR"/>
<id column="ID" property="id"/>
<result column="IS_DELETED" property="isDeleted"/>
<result column="CREATE_BY_ID" property="createById"/>
<result column="CREATE_BY_NAME" property="createByName"/>
<result column="CREATE_TIME" property="createTime"/>
<result column="MODIFY_BY_ID" property="modifyById"/>
<result column="MODIFY_BY_NAME" property="modifyByName"/>
<result column="MODIFY_TIME" property="modifyTime"/>
<result column="LINE_ID" property="lineId"/>
<result column="DIESEL_ID" property="dieselId"/>
<result column="OU_ID" property="ouId"/>
</resultMap>
<sql id="Base_Column_List">
id
ID
,
is_deleted,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time,
line_id,
diesel_id,
ou_id
IS_DELETED,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME,
LINE_ID,
DIESEL_ID,
OU_ID
</sql>
<resultMap id="ExtendsResultMap" type="pps.core.base.entity.BasePowerLineDieselView" extends="BaseResultMap">
<result column="device_name" property="deviceName" jdbcType="VARCHAR"/>
<result column="standby_power" property="standbyPower" jdbcType="DECIMAL"/>
<result column="DEVICE_NAME" property="deviceName"/>
<result column="STANDBY_POWER" property="standbyPower"/>
</resultMap>
<select id="selectOne" parameterType="pps.core.base.entity.BasePowerLineDieselView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_POWER_LINE_DIESEL
where
id=#{id}
FROM BASE_POWER_LINE_DIESEL
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePowerLineDieselView" resultMap="ExtendsResultMap">
SELECT l.id,
l.diesel_id,
g.device_name,
g.standby_power
FROM BASE_POWER_LINE_DIESEL l
LEFT JOIN BASE_DIESEL_GENERATOR g ON l.diesel_id = g.id
AND g.is_deleted = 1
WHERE l.line_id = #{lineId}
SELECT L.ID,
L.DIESEL_ID,
G.DEVICE_NAME,
G.STANDBY_POWER
FROM BASE_POWER_LINE_DIESEL L
LEFT JOIN BASE_DIESEL_GENERATOR G ON L.DIESEL_ID = G.ID
AND G.IS_DELETED = 1
WHERE L.LINE_ID = #{lineId}
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO BASE_POWER_LINE_DIESEL ( id, create_by_id, create_by_name, create_time, modify_by_id,
modify_by_name, modify_time, line_id, diesel_id, ou_id )
INSERT INTO BASE_POWER_LINE_DIESEL ( ID, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME, MODIFY_BY_ID,
MODIFY_BY_NAME, MODIFY_TIME, LINE_ID, DIESEL_ID, OU_ID )
VALUES
<foreach collection="list" item="item" separator=",">
(
......
......@@ -2,48 +2,51 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BasePriceStrategyMonthViewMapper">
<resultMap id="BaseResultMap" type="pps.core.base.entity.BasePriceStrategyMonthView">
<id column="id" property="id" jdbcType="VARCHAR"/>
<result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
<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"/>
<result column="strategy_id" property="strategyId" jdbcType="VARCHAR"/>
<result column="strategy_month" property="strategyMonth" jdbcType="VARCHAR"/>
<id column="ID" property="id" />
<result column="IS_DELETED" property="isDeleted" />
<result column="CREATE_BY_ID" property="createById" />
<result column="CREATE_BY_NAME" property="createByName" />
<result column="CREATE_TIME" property="createTime" />
<result column="MODIFY_BY_ID" property="modifyById" />
<result column="MODIFY_BY_NAME" property="modifyByName" />
<result column="MODIFY_TIME" property="modifyTime" />
<result column="STRATEGY_ID" property="strategyId" />
<result column="STRATEGY_MONTH" property="strategyMonth" />
</resultMap>
<sql id="Base_Column_List">
id
ID
,
is_deleted,
create_by_id,
create_by_name,
create_time,
modify_by_id,
modify_by_name,
modify_time,
strategy_id,
strategy_month
IS_DELETED,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME,
MODIFY_BY_ID,
MODIFY_BY_NAME,
MODIFY_TIME,
STRATEGY_ID,
STRATEGY_MONTH
</sql>
<select id="selectOne" parameterType="pps.core.base.entity.BasePriceStrategyMonthView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_PRICE_STRATEGY_MONTH
where
id=#{id}
FROM BASE_PRICE_STRATEGY_MONTH
WHERE
ID=#{id}
</select>
<select id="selectList" parameterType="pps.core.base.entity.BasePriceStrategyMonthView" resultMap="BaseResultMap">
select
SELECT
<include refid="Base_Column_List"/>
from BASE_PRICE_STRATEGY_MONTH
where
id=#{id}
FROM BASE_PRICE_STRATEGY_MONTH
WHERE
ID=#{id}
</select>
<insert id="batchInsertList" parameterType="list">
INSERT INTO BASE_PRICE_STRATEGY_MONTH ( id, create_by_id, create_by_name, create_time, modify_by_id,
modify_by_name, modify_time, strategy_id, strategy_month )
INSERT INTO BASE_PRICE_STRATEGY_MONTH ( ID, CREATE_BY_ID, CREATE_BY_NAME, CREATE_TIME, MODIFY_BY_ID,
MODIFY_BY_NAME, MODIFY_TIME, STRATEGY_ID, STRATEGY_MONTH )
VALUES
<foreach collection="list" item="item" separator=",">
(
......
......@@ -2,13 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseProjectInfoPredictedDataViewMapper">
<insert id="batchInsert">
insert into BASE_PROJECT_INFO_PREDICTED_DATA(
project_id,
particular_year,
predicted_power,
create_by_id,
create_by_name,
create_time
INSERT INTO BASE_PROJECT_INFO_PREDICTED_DATA(
PROJECT_ID,
PARTICULAR_YEAR,
PREDICTED_POWER,
CREATE_BY_ID,
CREATE_BY_NAME,
CREATE_TIME
) VALUES
<foreach collection="list" item="item" separator=",">
(
......
......@@ -3,7 +3,7 @@
<mapper namespace="pps.core.prediction.mapper.PlantPowerDataViewMapper">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO PLANT_POWER_DATA
(plant_id,
(PLANT_ID,
data_date,
temperature,
humidity,
......
......@@ -3,7 +3,7 @@
<mapper namespace="pps.core.prediction.mapper.PlantPredictedPowerLongTermDataViewMapper">
<insert id="insertBatch" parameterType="java.util.List">
INSERT INTO PLANT_PREDICTED_POWER_LONG_TERM_DATA
(plant_id,
(PLANT_ID,
data_date,
year_time,
month_time,
......
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