Skip to content

S
sv-springboot
Commit a7026e88 by whl
Options

Merge remote-tracking branch 'origin/future-page-ywd' into dev 

# Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/model/DicDim.java
#	bsoft-api/src/main/java/com/bsoft/api/model/DicInd.java
#	bsoft-api/src/main/java/com/bsoft/api/model/DicOrg.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerBlock.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPage.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPageBlockRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SerPageDimRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysMenu.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysOrg.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysProject.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysRole.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysRoleMenuRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserMenuRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserOrgRs.java
#	bsoft-api/src/main/java/com/bsoft/api/model/SysUserRoleRs.java
#	bsoft-api/src/main/resources/mapper/DicDimMapper.xml
#	bsoft-api/src/main/resources/mapper/DicIndMapper.xml
#	bsoft-api/src/main/resources/mapper/DicOrgMapper.xml
#	bsoft-api/src/main/resources/mapper/SerBlockMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageBlockRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageDimRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SerPageMapper.xml
#	bsoft-api/src/main/resources/mapper/SysMenuMapper.xml
#	bsoft-api/src/main/resources/mapper/SysOrgMapper.xml
#	bsoft-api/src/main/resources/mapper/SysProjectMapper.xml
#	bsoft-api/src/main/resources/mapper/SysRoleMapper.xml
#	bsoft-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserMenuRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserOrgRsMapper.xml
#	bsoft-api/src/main/resources/mapper/SysUserRoleRsMapper.xml
parents 33ab5cea 381f7cd4
Showing with 109 additions and 711 deletions
bsoft-api/src/main/resources/mapper/DicDimMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_NAME, DIM_FIELD select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_NAME, DIM_FIELD
from LL.DIC_DIM from LL.DIC_DIM
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.DicDim">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="DIM_NAME" jdbcType="NVARCHAR2" property="dimName" />
<result column="DIM_FIELD" jdbcType="NVARCHAR2" property="dimField" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.DIC_DIM
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.DicDim">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_DIC_DIM_ID.nextval from dual
</selectKey>
insert into LL.DIC_DIM (CREATE_DATE, CREATE_USERID, STATE,
DIM_NAME, DIM_FIELD)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{dimName,jdbcType=NVARCHAR2}, #{dimField,jdbcType=NVARCHAR2})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicDim">
update LL.DIC_DIM
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
DIM_NAME = #{dimName,jdbcType=NVARCHAR2},
DIM_FIELD = #{dimField,jdbcType=NVARCHAR2}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_NAME, DIM_FIELD
from LL.DIC_DIM
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_NAME, DIM_FIELD
from LL.DIC_DIM
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/DicIndMapper.xml
...@@ -40,56 +40,7 @@ ...@@ -40,56 +40,7 @@
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</update> </update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL, select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
DESCRIBE
from LL.DIC_IND
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
DESCRIBE
from LL.DIC_IND
</select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.DicInd">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="IND_CODE" jdbcType="NVARCHAR2" property="indCode" />
<result column="IND_NAME" jdbcType="NVARCHAR2" property="indName" />
<result column="COMPUTE_MODE" jdbcType="DECIMAL" property="computeMode" />
<result column="EXEC_SQL" jdbcType="NVARCHAR2" property="execSql" />
<result column="DESCRIBE" jdbcType="NVARCHAR2" property="describe" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.DIC_IND
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.DicInd">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_DIC_IND_ID.nextval from dual
</selectKey>
insert into LL.DIC_IND (CREATE_DATE, CREATE_USERID, STATE,
IND_CODE, IND_NAME, COMPUTE_MODE,
EXEC_SQL, DESCRIBE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{indCode,jdbcType=NVARCHAR2}, #{indName,jdbcType=NVARCHAR2}, #{computeMode,jdbcType=DECIMAL},
#{execSql,jdbcType=NVARCHAR2}, #{describe,jdbcType=NVARCHAR2})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicInd">
update LL.DIC_IND
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
IND_CODE = #{indCode,jdbcType=NVARCHAR2},
IND_NAME = #{indName,jdbcType=NVARCHAR2},
COMPUTE_MODE = #{computeMode,jdbcType=DECIMAL},
EXEC_SQL = #{execSql,jdbcType=NVARCHAR2},
DESCRIBE = #{describe,jdbcType=NVARCHAR2}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
DESCRIBE DESCRIBE
from LL.DIC_IND from LL.DIC_IND
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
......
bsoft-api/src/main/resources/mapper/DicOrgMapper.xml
...@@ -58,61 +58,4 @@ ...@@ -58,61 +58,4 @@
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from LL.DIC_ORG from LL.DIC_ORG
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.DicOrg">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="ORG_CODE" jdbcType="NVARCHAR2" property="orgCode" />
<result column="ORG_NAME" jdbcType="NVARCHAR2" property="orgName" />
<result column="ORG_NO" jdbcType="NVARCHAR2" property="orgNo" />
<result column="ORG_SHORT_NAME" jdbcType="NVARCHAR2" property="orgShortName" />
<result column="ORG_GROUP" jdbcType="NVARCHAR2" property="orgGroup" />
<result column="ORG_TYPE" jdbcType="NVARCHAR2" property="orgType" />
<result column="ORG_ADDRESS" jdbcType="NVARCHAR2" property="orgAddress" />
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.DIC_ORG
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.DicOrg">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_DIC_ORG_ID.nextval from dual
</selectKey>
insert into LL.DIC_ORG (CREATE_DATE, CREATE_USERID, STATE,
ORG_CODE, ORG_NAME, ORG_NO,
ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE,
ORG_ADDRESS, PARENT_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{orgCode,jdbcType=NVARCHAR2}, #{orgName,jdbcType=NVARCHAR2}, #{orgNo,jdbcType=NVARCHAR2},
#{orgShortName,jdbcType=NVARCHAR2}, #{orgGroup,jdbcType=NVARCHAR2}, #{orgType,jdbcType=NVARCHAR2},
#{orgAddress,jdbcType=NVARCHAR2}, #{parentId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicOrg">
update LL.DIC_ORG
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
ORG_CODE = #{orgCode,jdbcType=NVARCHAR2},
ORG_NAME = #{orgName,jdbcType=NVARCHAR2},
ORG_NO = #{orgNo,jdbcType=NVARCHAR2},
ORG_SHORT_NAME = #{orgShortName,jdbcType=NVARCHAR2},
ORG_GROUP = #{orgGroup,jdbcType=NVARCHAR2},
ORG_TYPE = #{orgType,jdbcType=NVARCHAR2},
ORG_ADDRESS = #{orgAddress,jdbcType=NVARCHAR2},
PARENT_ID = #{parentId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from LL.DIC_ORG
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from LL.DIC_ORG
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerBlockMapper.xml
...@@ -36,49 +36,7 @@ ...@@ -36,49 +36,7 @@
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</update> </update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE <<<<<<< HEAD
from LL.SER_BLOCK
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
from LL.SER_BLOCK
</select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerBlock">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="BLOCK_CODE" jdbcType="NVARCHAR2" property="blockCode" />
<result column="BLOCK_NAME" jdbcType="NVARCHAR2" property="blockName" />
<result column="RETURN_TYPE" jdbcType="DECIMAL" property="returnType" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SER_BLOCK
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SerBlock">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SER_BLOCK_ID.nextval from dual
</selectKey>
insert into LL.SER_BLOCK (CREATE_DATE, CREATE_USERID, STATE,
BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{blockCode,jdbcType=NVARCHAR2}, #{blockName,jdbcType=NVARCHAR2}, #{returnType,jdbcType=DECIMAL}
)
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerBlock">
update LL.SER_BLOCK
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
BLOCK_CODE = #{blockCode,jdbcType=NVARCHAR2},
BLOCK_NAME = #{blockName,jdbcType=NVARCHAR2},
RETURN_TYPE = #{returnType,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
from LL.SER_BLOCK from LL.SER_BLOCK
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
......
bsoft-api/src/main/resources/mapper/SerPageBlockRsMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_ID, PAGE_ID select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_ID, PAGE_ID
from LL.SER_PAGE_BLOCK_RS from LL.SER_PAGE_BLOCK_RS
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageBlockRs">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="BLOCK_ID" jdbcType="DECIMAL" property="blockId" />
<result column="PAGE_ID" jdbcType="DECIMAL" property="pageId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SER_PAGE_BLOCK_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SerPageBlockRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SER_PAGE_BLOCK_RS_ID.nextval from dual
</selectKey>
insert into LL.SER_PAGE_BLOCK_RS (CREATE_DATE, CREATE_USERID, STATE,
BLOCK_ID, PAGE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{blockId,jdbcType=DECIMAL}, #{pageId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPageBlockRs">
update LL.SER_PAGE_BLOCK_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
BLOCK_ID = #{blockId,jdbcType=DECIMAL},
PAGE_ID = #{pageId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_ID, PAGE_ID
from LL.SER_PAGE_BLOCK_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_ID, PAGE_ID
from LL.SER_PAGE_BLOCK_RS
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerPageDimRsMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_ID, PAGE_ID select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_ID, PAGE_ID
from LL.SER_PAGE_DIM_RS from LL.SER_PAGE_DIM_RS
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPageDimRs">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="DIM_ID" jdbcType="DECIMAL" property="dimId" />
<result column="PAGE_ID" jdbcType="DECIMAL" property="pageId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SER_PAGE_DIM_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SerPageDimRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SER_PAGE_DIM_RS_ID.nextval from dual
</selectKey>
insert into LL.SER_PAGE_DIM_RS (CREATE_DATE, CREATE_USERID, STATE,
DIM_ID, PAGE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{dimId,jdbcType=DECIMAL}, #{pageId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPageDimRs">
update LL.SER_PAGE_DIM_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
DIM_ID = #{dimId,jdbcType=DECIMAL},
PAGE_ID = #{pageId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_ID, PAGE_ID
from LL.SER_PAGE_DIM_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_ID, PAGE_ID
from LL.SER_PAGE_DIM_RS
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerPageMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, PAGE_CODE, PAGE_NAME select ID, CREATE_DATE, CREATE_USERID, STATE, PAGE_CODE, PAGE_NAME
from LL.SER_PAGE from LL.SER_PAGE
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerPage">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="PAGE_CODE" jdbcType="NVARCHAR2" property="pageCode" />
<result column="PAGE_NAME" jdbcType="NVARCHAR2" property="pageName" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SER_PAGE
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SerPage">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SER_PAGE_ID.nextval from dual
</selectKey>
insert into LL.SER_PAGE (CREATE_DATE, CREATE_USERID, STATE,
PAGE_CODE, PAGE_NAME)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{pageCode,jdbcType=NVARCHAR2}, #{pageName,jdbcType=NVARCHAR2})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPage">
update LL.SER_PAGE
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
PAGE_CODE = #{pageCode,jdbcType=NVARCHAR2},
PAGE_NAME = #{pageName,jdbcType=NVARCHAR2}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, PAGE_CODE, PAGE_NAME
from LL.SER_PAGE
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, PAGE_CODE, PAGE_NAME
from LL.SER_PAGE
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysMenuMapper.xml
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
<result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" /> <result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" /> <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" /> <result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="PROJECT_ID" jdbcType="DECIMAL" property="projectId" />
<result column="MENU_NAME" jdbcType="NVARCHAR2" property="menuName" /> <result column="MENU_NAME" jdbcType="NVARCHAR2" property="menuName" />
<result column="MENU_URL" jdbcType="NVARCHAR2" property="menuUrl" /> <result column="MENU_URL" jdbcType="NVARCHAR2" property="menuUrl" />
<result column="MENU_IMAGE" jdbcType="NVARCHAR2" property="menuImage" /> <result column="MENU_IMAGE" jdbcType="NVARCHAR2" property="menuImage" />
...@@ -21,18 +20,17 @@ ...@@ -21,18 +20,17 @@
select SEQ_SYS_MENU_ID.nextval from dual select SEQ_SYS_MENU_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SYS_MENU (CREATE_DATA, CREATE_USERID, STATE, insert into LL.SYS_MENU (CREATE_DATA, CREATE_USERID, STATE,
PROJECT_ID, MENU_NAME, MENU_URL, MENU_NAME, MENU_URL, MENU_IMAGE,
MENU_IMAGE, PARENT_ID) PARENT_ID)
values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{projectId,jdbcType=DECIMAL}, #{menuName,jdbcType=NVARCHAR2}, #{menuUrl,jdbcType=NVARCHAR2}, #{menuName,jdbcType=NVARCHAR2}, #{menuUrl,jdbcType=NVARCHAR2}, #{menuImage,jdbcType=NVARCHAR2},
#{menuImage,jdbcType=NVARCHAR2}, #{parentId,jdbcType=DECIMAL}) #{parentId,jdbcType=DECIMAL})
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu">
update LL.SYS_MENU update LL.SYS_MENU
set CREATE_DATA = #{createData,jdbcType=TIMESTAMP}, set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL}, CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL}, STATE = #{state,jdbcType=DECIMAL},
PROJECT_ID = #{projectId,jdbcType=DECIMAL},
MENU_NAME = #{menuName,jdbcType=NVARCHAR2}, MENU_NAME = #{menuName,jdbcType=NVARCHAR2},
MENU_URL = #{menuUrl,jdbcType=NVARCHAR2}, MENU_URL = #{menuUrl,jdbcType=NVARCHAR2},
MENU_IMAGE = #{menuImage,jdbcType=NVARCHAR2}, MENU_IMAGE = #{menuImage,jdbcType=NVARCHAR2},
...@@ -40,63 +38,32 @@ ...@@ -40,63 +38,32 @@
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</update> </update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, PROJECT_ID, MENU_NAME, MENU_URL, MENU_IMAGE, select ID, CREATE_DATA, CREATE_USERID, STATE, MENU_NAME, MENU_URL, MENU_IMAGE, PARENT_ID
PARENT_ID
from LL.SYS_MENU from LL.SYS_MENU
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</select> </select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, PROJECT_ID, MENU_NAME, MENU_URL, MENU_IMAGE, select ID, CREATE_DATA, CREATE_USERID, STATE, MENU_NAME, MENU_URL, MENU_IMAGE, PARENT_ID
PARENT_ID
from LL.SYS_MENU from LL.SYS_MENU
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysMenu"> <select id="selectMenuByUser" resultMap="BaseResultMap">
<id column="ID" jdbcType="DECIMAL" property="id" /> select DISTINCT m.ID,m.CREATE_DATA,m.CREATE_USERID,m.STATE,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID
<result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" /> from
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" /> SYS_ROLE_MENU_RS rmr
<result column="STATE" jdbcType="DECIMAL" property="state" /> LEFT JOIN
<result column="PROJECT_ID" jdbcType="DECIMAL" property="projectId" /> SYS_MENU m on rmr.MENU_ID = m.ID
<result column="MENU_NAME" jdbcType="NVARCHAR2" property="menuName" /> LEFT JOIN
<result column="MENU_URL" jdbcType="NVARCHAR2" property="menuUrl" /> SYS_USER_ROLE_RS urr on rmr.ROLE_ID = urr.Role_ID
<result column="MENU_IMAGE" jdbcType="NVARCHAR2" property="menuImage" /> where rmr.STATE=1 and m.STATE=1 and urr.STATE=1 and urr.USER_ID = 2
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
</resultMap> union
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_MENU select DISTINCT m.ID,m.CREATE_DATA,m.CREATE_USERID,m.STATE,m.MENU_NAME,m.MENU_URL,m.MENU_IMAGE,m.PARENT_ID
where ID = #{id,jdbcType=DECIMAL} from
</delete> SYS_USER_MENU_RS umr
<insert id="insert" parameterType="com.bsoft.api.model.SysMenu"> LEFT JOIN
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> SYS_MENU m on umr.MENU_ID = m.ID
select SEQ_SYS_MENU_ID.nextval from dual where umr.STATE=1 and m.STATE=1 and umr.USER_ID = #{userId,jdbcType=DECIMAL}
</selectKey>
insert into LL.SYS_MENU (CREATE_DATA, CREATE_USERID, STATE,
PROJECT_ID, MENU_NAME, MENU_URL,
MENU_IMAGE, PARENT_ID)
values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{projectId,jdbcType=DECIMAL}, #{menuName,jdbcType=NVARCHAR2}, #{menuUrl,jdbcType=NVARCHAR2},
#{menuImage,jdbcType=NVARCHAR2}, #{parentId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu">
update LL.SYS_MENU
set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
PROJECT_ID = #{projectId,jdbcType=DECIMAL},
MENU_NAME = #{menuName,jdbcType=NVARCHAR2},
MENU_URL = #{menuUrl,jdbcType=NVARCHAR2},
MENU_IMAGE = #{menuImage,jdbcType=NVARCHAR2},
PARENT_ID = #{parentId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, PROJECT_ID, MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID
from LL.SYS_MENU
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, PROJECT_ID, MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID
from LL.SYS_MENU
</select> </select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysOrgMapper.xml
...@@ -58,61 +58,5 @@ ...@@ -58,61 +58,5 @@
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from LL.SYS_ORG from LL.SYS_ORG
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysOrg">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" />
<result column="CREATE_USERID" jdbcType="NVARCHAR2" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="ORG_CODE" jdbcType="NVARCHAR2" property="orgCode" />
<result column="ORG_NAME" jdbcType="NVARCHAR2" property="orgName" />
<result column="ORG_NO" jdbcType="NVARCHAR2" property="orgNo" />
<result column="ORG_SHORT_NAME" jdbcType="NVARCHAR2" property="orgShortName" />
<result column="ORG_GROUP" jdbcType="NVARCHAR2" property="orgGroup" />
<result column="ORG_TYPE" jdbcType="NVARCHAR2" property="orgType" />
<result column="ORG_ADDRESS" jdbcType="NVARCHAR2" property="orgAddress" />
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_ORG
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysOrg">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_ORG_ID.nextval from dual
</selectKey>
insert into LL.SYS_ORG (CREATE_DATA, CREATE_USERID, STATE,
ORG_CODE, ORG_NAME, ORG_NO,
ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE,
ORG_ADDRESS, PARENT_ID)
values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=NVARCHAR2}, #{state,jdbcType=DECIMAL},
#{orgCode,jdbcType=NVARCHAR2}, #{orgName,jdbcType=NVARCHAR2}, #{orgNo,jdbcType=NVARCHAR2},
#{orgShortName,jdbcType=NVARCHAR2}, #{orgGroup,jdbcType=NVARCHAR2}, #{orgType,jdbcType=NVARCHAR2},
#{orgAddress,jdbcType=NVARCHAR2}, #{parentId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysOrg">
update LL.SYS_ORG
set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=NVARCHAR2},
STATE = #{state,jdbcType=DECIMAL},
ORG_CODE = #{orgCode,jdbcType=NVARCHAR2},
ORG_NAME = #{orgName,jdbcType=NVARCHAR2},
ORG_NO = #{orgNo,jdbcType=NVARCHAR2},
ORG_SHORT_NAME = #{orgShortName,jdbcType=NVARCHAR2},
ORG_GROUP = #{orgGroup,jdbcType=NVARCHAR2},
ORG_TYPE = #{orgType,jdbcType=NVARCHAR2},
ORG_ADDRESS = #{orgAddress,jdbcType=NVARCHAR2},
PARENT_ID = #{parentId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from LL.SYS_ORG
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, STATE, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from LL.SYS_ORG
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysProjectMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, PROJECT_CODE, PROJECT_NAME select ID, CREATE_DATE, CREATE_USERID, STATE, PROJECT_CODE, PROJECT_NAME
from LL.SYS_PROJECT from LL.SYS_PROJECT
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysProject">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="PROJECT_CODE" jdbcType="NVARCHAR2" property="projectCode" />
<result column="PROJECT_NAME" jdbcType="NVARCHAR2" property="projectName" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_PROJECT
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysProject">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_PROJECT_ID.nextval from dual
</selectKey>
insert into LL.SYS_PROJECT (CREATE_DATE, CREATE_USERID, STATE,
PROJECT_CODE, PROJECT_NAME)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{projectCode,jdbcType=NVARCHAR2}, #{projectName,jdbcType=NVARCHAR2})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysProject">
update LL.SYS_PROJECT
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
PROJECT_CODE = #{projectCode,jdbcType=NVARCHAR2},
PROJECT_NAME = #{projectName,jdbcType=NVARCHAR2}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, PROJECT_CODE, PROJECT_NAME
from LL.SYS_PROJECT
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, PROJECT_CODE, PROJECT_NAME
from LL.SYS_PROJECT
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysRoleMapper.xml
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" /> <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" /> <result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="ROLE_NAME" jdbcType="NVARCHAR2" property="roleName" /> <result column="ROLE_NAME" jdbcType="NVARCHAR2" property="roleName" />
<result column="PROJECT_ID" jdbcType="DECIMAL" property="projectId" />
<result column="ROLE_CODE" jdbcType="DECIMAL" property="roleCode" /> <result column="ROLE_CODE" jdbcType="DECIMAL" property="roleCode" />
</resultMap> </resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
...@@ -19,11 +18,9 @@ ...@@ -19,11 +18,9 @@
select SEQ_SYS_ROLE_ID.nextval from dual select SEQ_SYS_ROLE_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SYS_ROLE (CREATE_DATE, CREATE_USERID, STATE, insert into LL.SYS_ROLE (CREATE_DATE, CREATE_USERID, STATE,
ROLE_NAME, PROJECT_ID, ROLE_CODE ROLE_NAME, ROLE_CODE)
) values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, #{roleName,jdbcType=NVARCHAR2}, #{roleCode,jdbcType=DECIMAL})
#{roleName,jdbcType=NVARCHAR2}, #{projectId,jdbcType=DECIMAL}, #{roleCode,jdbcType=DECIMAL}
)
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole">
update LL.SYS_ROLE update LL.SYS_ROLE
...@@ -31,60 +28,16 @@ ...@@ -31,60 +28,16 @@
CREATE_USERID = #{createUserid,jdbcType=DECIMAL}, CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL}, STATE = #{state,jdbcType=DECIMAL},
ROLE_NAME = #{roleName,jdbcType=NVARCHAR2}, ROLE_NAME = #{roleName,jdbcType=NVARCHAR2},
PROJECT_ID = #{projectId,jdbcType=DECIMAL},
ROLE_CODE = #{roleCode,jdbcType=DECIMAL} ROLE_CODE = #{roleCode,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</update> </update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, PROJECT_ID, ROLE_CODE select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, ROLE_CODE
from LL.SYS_ROLE from LL.SYS_ROLE
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</select> </select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, PROJECT_ID, ROLE_CODE select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, ROLE_CODE
from LL.SYS_ROLE
</select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysRole">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="ROLE_NAME" jdbcType="NVARCHAR2" property="roleName" />
<result column="PROJECT_ID" jdbcType="DECIMAL" property="projectId" />
<result column="ROLE_CODE" jdbcType="DECIMAL" property="roleCode" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_ROLE
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysRole">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_ROLE_ID.nextval from dual
</selectKey>
insert into LL.SYS_ROLE (CREATE_DATE, CREATE_USERID, STATE,
ROLE_NAME, PROJECT_ID, ROLE_CODE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{roleName,jdbcType=NVARCHAR2}, #{projectId,jdbcType=DECIMAL}, #{roleCode,jdbcType=DECIMAL}
)
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole">
update LL.SYS_ROLE
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
ROLE_NAME = #{roleName,jdbcType=NVARCHAR2},
PROJECT_ID = #{projectId,jdbcType=DECIMAL},
ROLE_CODE = #{roleCode,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, PROJECT_ID, ROLE_CODE
from LL.SYS_ROLE
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, PROJECT_ID, ROLE_CODE
from LL.SYS_ROLE from LL.SYS_ROLE
</select> </select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, MENU_ID, ROLE_ID select ID, CREATE_DATE, CREATE_USERID, STATE, MENU_ID, ROLE_ID
from LL.SYS_ROLE_MENU_RS from LL.SYS_ROLE_MENU_RS
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysRoleMenuRs">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="MENU_ID" jdbcType="DECIMAL" property="menuId" />
<result column="ROLE_ID" jdbcType="DECIMAL" property="roleId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_ROLE_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysRoleMenuRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_ROLE_MENU_RS_ID.nextval from dual
</selectKey>
insert into LL.SYS_ROLE_MENU_RS (CREATE_DATE, CREATE_USERID, STATE,
MENU_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{menuId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRoleMenuRs">
update LL.SYS_ROLE_MENU_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
MENU_ID = #{menuId,jdbcType=DECIMAL},
ROLE_ID = #{roleId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, MENU_ID, ROLE_ID
from LL.SYS_ROLE_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, MENU_ID, ROLE_ID
from LL.SYS_ROLE_MENU_RS
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysUserMapper.xml
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bsoft.api.mapper.SysUserMapper"> <mapper namespace="com.bsoft.api.mapper.SysUserMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUser"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUser">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Oct 22 14:44:12 CST 2019.
-->
<id column="ID" jdbcType="DECIMAL" property="id"/> <id column="ID" jdbcType="DECIMAL" property="id"/>
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/> <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/> <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
...@@ -12,53 +17,80 @@ ...@@ -12,53 +17,80 @@
<result column="IDCARD" jdbcType="NVARCHAR2" property="idcard"/> <result column="IDCARD" jdbcType="NVARCHAR2" property="idcard"/>
<result column="SEX" jdbcType="NVARCHAR2" property="sex"/> <result column="SEX" jdbcType="NVARCHAR2" property="sex"/>
<result column="MOBILE" jdbcType="NVARCHAR2" property="mobile"/> <result column="MOBILE" jdbcType="NVARCHAR2" property="mobile"/>
<result column="PAGE_COUNT" jdbcType="DECIMAL" property="pageCount"/>
<result column="ERROR_COUNT" jdbcType="DECIMAL" property="errorCount"/>
<result column="ERROR_TIME" jdbcType="TIMESTAMP" property="errorTime"/>
<result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime"/>
<result column="LAST_IP" jdbcType="NVARCHAR2" property="lastIp"/>
</resultMap> </resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_USER <!--
where ID = #{id,jdbcType=DECIMAL} WARNING - @mbggenerated
</delete> This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Oct 22 14:44:12 CST 2019.
-->
delete from LL.SYS_USER
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysUser"> <insert id="insert" parameterType="com.bsoft.api.model.SysUser">
<!--
WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify.
This element was generated on Tue Oct 22 14:44:12 CST 2019.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ID.nextval from dual select SEQ_SYS_USER_ID.nextval from dual
</selectKey> </selectKey>
insert into LL.SYS_USER (CREATE_DATE, CREATE_USERID, STATE, insert into LL.SYS_USER (CREATE_DATE, CREATE_USERID, STATE,
USER_CODE, USER_NAME, PASSWORD, USER_CODE, USER_NAME, PASSWORD,
IDCARD, SEX, MOBILE IDCARD, SEX, MOBILE,
) PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userCode,jdbcType=NVARCHAR2}, #{userName,jdbcType=NVARCHAR2}, #{password,jdbcType=NVARCHAR2}, #{userCode,jdbcType=NVARCHAR2}, #{userName,jdbcType=NVARCHAR2}, #{password,jdbcType=NVARCHAR2},
#{idcard,jdbcType=NVARCHAR2}, #{sex,jdbcType=NVARCHAR2}, #{mobile,jdbcType=NVARCHAR2} #{idcard,jdbcType=NVARCHAR2}, #{sex,jdbcType=NVARCHAR2}, #{mobile,jdbcType=NVARCHAR2},
) #{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
#{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=NVARCHAR2})
</insert> </insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser"> <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser">
update LL.SYS_USER <!--
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP}, WARNING - @mbggenerated
CREATE_USERID = #{createUserid,jdbcType=DECIMAL}, This element is automatically generated by MyBatis Generator, do not modify.
STATE = #{state,jdbcType=DECIMAL}, This element was generated on Tue Oct 22 14:44:12 CST 2019.
USER_CODE = #{userCode,jdbcType=NVARCHAR2}, -->
USER_NAME = #{userName,jdbcType=NVARCHAR2}, update LL.SYS_USER
PASSWORD = #{password,jdbcType=NVARCHAR2}, set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
IDCARD = #{idcard,jdbcType=NVARCHAR2}, CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
SEX = #{sex,jdbcType=NVARCHAR2}, STATE = #{state,jdbcType=DECIMAL},
MOBILE = #{mobile,jdbcType=NVARCHAR2} USER_CODE = #{userCode,jdbcType=NVARCHAR2},
where ID = #{id,jdbcType=DECIMAL} USER_NAME = #{userName,jdbcType=NVARCHAR2},
</update> PASSWORD = #{password,jdbcType=NVARCHAR2},
IDCARD = #{idcard,jdbcType=NVARCHAR2},
SEX = #{sex,jdbcType=NVARCHAR2},
MOBILE = #{mobile,jdbcType=NVARCHAR2},
PAGE_COUNT = #{pageCount,jdbcType=DECIMAL},
ERROR_COUNT = #{errorCount,jdbcType=DECIMAL},
ERROR_TIME = #{errorTime,jdbcType=TIMESTAMP},
LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
LAST_IP = #{lastIp,jdbcType=NVARCHAR2}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD, select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD,
SEX, MOBILE SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from LL.SYS_USER from LL.SYS_USER
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</select> </select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD, select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD,
SEX, MOBILE SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from LL.SYS_USER from LL.SYS_USER
</select> </select>
<select id="selectByCode" resultMap="BaseResultMap"> <select id="selectByCode" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD, select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD,
SEX, MOBILE SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from sys_user from LL.SYS_USER
where USER_CODE=#{code,jdbcType=VARCHAR} where USER_CODE=#{code,jdbcType=VARCHAR}
and STATE != 0 and STATE != 0
</select> </select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysUserMenuRsMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, MENU_ID select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, MENU_ID
from LL.SYS_USER_MENU_RS from LL.SYS_USER_MENU_RS
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserMenuRs">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="USER_ID" jdbcType="DECIMAL" property="userId" />
<result column="MENU_ID" jdbcType="DECIMAL" property="menuId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_USER_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysUserMenuRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_MENU_RS_ID.nextval from dual
</selectKey>
insert into LL.SYS_USER_MENU_RS (CREATE_DATE, CREATE_USERID, STATE,
USER_ID, MENU_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{menuId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserMenuRs">
update LL.SYS_USER_MENU_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL},
MENU_ID = #{menuId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, MENU_ID
from LL.SYS_USER_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, MENU_ID
from LL.SYS_USER_MENU_RS
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysUserOrgRsMapper.xml
...@@ -40,43 +40,4 @@ ...@@ -40,43 +40,4 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ORG_ID select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ORG_ID
from LL.SYS_USER_ORG_RS from LL.SYS_USER_ORG_RS
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserOrgRs">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="USER_ID" jdbcType="DECIMAL" property="userId" />
<result column="ORG_ID" jdbcType="DECIMAL" property="orgId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_USER_ORG_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysUserOrgRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ORG_RS_ID.nextval from dual
</selectKey>
insert into LL.SYS_USER_ORG_RS (CREATE_DATE, CREATE_USERID, STATE,
USER_ID, ORG_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{orgId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserOrgRs">
update LL.SYS_USER_ORG_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL},
ORG_ID = #{orgId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ORG_ID
from LL.SYS_USER_ORG_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ORG_ID
from LL.SYS_USER_ORG_RS
</select>
</mapper> </mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysUserRoleRsMapper.xml
...@@ -40,43 +40,9 @@ ...@@ -40,43 +40,9 @@
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID
from LL.SYS_USER_ROLE_RS from LL.SYS_USER_ROLE_RS
</select> </select>
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SysUserRoleRs"> <select id="selectRoleByUser" resultMap="BaseResultMap">
<id column="ID" jdbcType="DECIMAL" property="id" /> select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" /> from LL.SYS_USER_ROLE_RS
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" /> where USER_ID=#{userId,jdbcType=DECIMAL}
<result column="STATE" jdbcType="DECIMAL" property="state" /> </select>
<result column="USER_ID" jdbcType="DECIMAL" property="userId" />
<result column="ROLE_ID" jdbcType="DECIMAL" property="roleId" />
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from LL.SYS_USER_ROLE_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.bsoft.api.model.SysUserRoleRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_SYS_USER_ROLE_RS_ID.nextval from dual
</selectKey>
insert into LL.SYS_USER_ROLE_RS (CREATE_DATE, CREATE_USERID, STATE,
USER_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUserRoleRs">
update LL.SYS_USER_ROLE_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL},
ROLE_ID = #{roleId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID
from LL.SYS_USER_ROLE_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID
from LL.SYS_USER_ROLE_RS
</select>
</mapper> </mapper>
\ No newline at end of file
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