Skip to content

J
jz-dmp-service
Commit 805ae1f7 authored by mcb's avatar mcb
Browse files
Options

no message

parent 93bd69b0
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 92 deletions
src/main/java/com/jz/dmp/modules/model/DmpNavigationTree.java
View file @ 805ae1f7
......@@ -40,11 +40,6 @@ public class DmpNavigationTree implements Serializable {
*/
@ApiModelProperty(value = "序号")
private Integer treeSort;
/**
* 图标
*/
@ApiModelProperty(value = "图标")
private String icon;
/**
* 是否叶子节点
*/
......@@ -55,16 +50,6 @@ public class DmpNavigationTree implements Serializable {
*/
@ApiModelProperty(value = "是否启用")
private String isEnable;
/**
* 被谁锁定
*/
@ApiModelProperty(value = "被谁锁定")
private String lockByUser;
/**
* 锁定时间
*/
@ApiModelProperty(value = "锁定时间")
private Date lockTime;
/**
* 数据状态
*/
......@@ -142,14 +127,6 @@ public class DmpNavigationTree implements Serializable {
this.treeSort = treeSort;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public String getIsLevel() {
return isLevel;
}
......@@ -166,22 +143,6 @@ public class DmpNavigationTree implements Serializable {
this.isEnable = isEnable;
}
public String getLockByUser() {
return lockByUser;
}
public void setLockByUser(String lockByUser) {
this.lockByUser = lockByUser;
}
public Date getLockTime() {
return lockTime;
}
public void setLockTime(Date lockTime) {
this.lockTime = lockTime;
}
public String getDataStatus() {
return dataStatus;
}
......
src/main/resources/mapper/dmp/DmpNavigationTreeMapper.xml
View file @ 805ae1f7
......@@ -8,11 +8,8 @@
<result property="type" column="TYPE" jdbcType="VARCHAR"/>
<result property="name" column="NAME" jdbcType="VARCHAR"/>
<result property="treeSort" column="TREE_SORT" jdbcType="INTEGER"/>
<result property="icon" column="ICON" jdbcType="VARCHAR"/>
<result property="isLevel" column="IS_LEVEL" jdbcType="VARCHAR"/>
<result property="isEnable" column="IS_ENABLE" jdbcType="VARCHAR"/>
<result property="lockByUser" column="LOCK_BY_USER" jdbcType="VARCHAR"/>
<result property="lockTime" column="LOCK_TIME" jdbcType="TIMESTAMP"/>
<result property="dataStatus" column="DATA_STATUS" jdbcType="VARCHAR"/>
<result property="createUserId" column="CREATE_USER_ID" jdbcType="VARCHAR"/>
<result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
......@@ -25,7 +22,7 @@
<!--查询单个-->
<select id="queryById" resultMap="DmpNavigationTreeMap">
select
ID, CATEGORY, TYPE, NAME, TREE_SORT, ICON, IS_LEVEL, IS_ENABLE, LOCK_BY_USER, LOCK_TIME, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID
ID, CATEGORY, TYPE, NAME, TREE_SORT, IS_LEVEL, IS_ENABLE, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID
from dmp_navigation_tree
where ID = #{id}
</select>
......@@ -33,7 +30,7 @@
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="DmpNavigationTreeMap">
select
ID, CATEGORY, TYPE, NAME, TREE_SORT, ICON, IS_LEVEL, IS_ENABLE, LOCK_BY_USER, LOCK_TIME, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID
ID, CATEGORY, TYPE, NAME, TREE_SORT, IS_LEVEL, IS_ENABLE, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID
from dmp_navigation_tree
limit #{offset}, #{limit}
</select>
......@@ -41,7 +38,7 @@
<!--通过实体作为筛选条件查询-->
<select id="queryAll" resultMap="DmpNavigationTreeMap">
select
ID, CATEGORY, TYPE, NAME, TREE_SORT, ICON, IS_LEVEL, IS_ENABLE, LOCK_BY_USER, LOCK_TIME, DATA_STATUS,
ID, CATEGORY, TYPE, NAME, TREE_SORT, IS_LEVEL, IS_ENABLE, DATA_STATUS,
CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID
from dmp_navigation_tree
<where>
......@@ -60,21 +57,12 @@
<if test="treeSort != null">
and TREE_SORT = #{treeSort}
</if>
<if test="icon != null and icon != ''">
and ICON = #{icon}
</if>
<if test="isLevel != null and isLevel != ''">
and IS_LEVEL = #{isLevel}
</if>
<if test="isEnable != null and isEnable != ''">
and IS_ENABLE = #{isEnable}
</if>
<if test="lockByUser != null and lockByUser != ''">
and LOCK_BY_USER = #{lockByUser}
</if>
<if test="lockTime != null">
and LOCK_TIME = #{lockTime}
</if>
<if test="dataStatus != null and dataStatus != ''">
and DATA_STATUS = #{dataStatus}
</if>
......@@ -101,36 +89,34 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into dmp_navigation_tree(CATEGORY, TYPE, NAME, TREE_SORT, ICON, IS_LEVEL, IS_ENABLE, LOCK_BY_USER, LOCK_TIME, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID)
values (#{category}, #{type}, #{name}, #{treeSort}, #{icon}, #{isLevel}, #{isEnable}, #{lockByUser}, #{lockTime}, #{dataStatus}, #{createUserId}, #{createTime}, #{updateUserId}, #{updateTime}, #{projectId}, #{parentId})
insert into dmp_navigation_tree(CATEGORY, TYPE, NAME, TREE_SORT, IS_LEVEL, IS_ENABLE, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID, PARENT_ID)
values (#{category}, #{type}, #{name}, #{treeSort}, #{isLevel}, #{isEnable}, #{dataStatus}, #{createUserId}, #{createTime}, #{updateUserId}, #{updateTime}, #{projectId}, #{parentId})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into dmp_navigation_tree(CATEGORY, TYPE, NAME, TREE_SORT, ICON, IS_LEVEL, IS_ENABLE,
LOCK_BY_USER, LOCK_TIME, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID,
insert into dmp_navigation_tree(CATEGORY, TYPE, NAME, TREE_SORT, IS_LEVEL, IS_ENABLE,
DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID,
PARENT_ID)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.category}, #{entity.type}, #{entity.name}, #{entity.treeSort}, #{entity.icon}, #{entity.isLevel},
#{entity.isEnable}, #{entity.lockByUser}, #{entity.lockTime}, #{entity.dataStatus}, #{entity.createUserId},
(#{entity.category}, #{entity.type}, #{entity.name}, #{entity.treeSort}, #{entity.isLevel},
#{entity.isEnable}, #{entity.dataStatus}, #{entity.createUserId},
#{entity.createTime}, #{entity.updateUserId}, #{entity.updateTime}, #{entity.projectId}, #{entity.parentId})
</foreach>
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into dmp_navigation_tree(CATEGORY, TYPE, NAME, TREE_SORT, ICON, IS_LEVEL, IS_ENABLE,
LOCK_BY_USER, LOCK_TIME, DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID,
insert into dmp_navigation_tree(CATEGORY, TYPE, NAME, TREE_SORT, IS_LEVEL, IS_ENABLE,
DATA_STATUS, CREATE_USER_ID, CREATE_TIME, UPDATE_USER_ID, UPDATE_TIME, PROJECT_ID,
PARENT_ID)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.category}, #{entity.type}, #{entity.name}, #{entity.treeSort}, #{entity.icon}, #{entity.isLevel},
#{entity.isEnable}, #{entity.lockByUser}, #{entity.lockTime}, #{entity.dataStatus}, #{entity.createUserId},
(#{entity.category}, #{entity.type}, #{entity.name}, #{entity.treeSort}, #{entity.isLevel},
#{entity.isEnable}, #{entity.dataStatus}, #{entity.createUserId},
#{entity.createTime}, #{entity.updateUserId}, #{entity.updateTime}, #{entity.projectId}, #{entity.parentId})
</foreach>
on duplicate key update
CATEGORY = values(CATEGORY) , TYPE = values(TYPE) , NAME = values(NAME) , TREE_SORT = values(TREE_SORT) , ICON =
values(ICON) , IS_LEVEL = values(IS_LEVEL) , IS_ENABLE = values(IS_ENABLE) , LOCK_BY_USER = values(LOCK_BY_USER)
, LOCK_TIME = values(LOCK_TIME) , DATA_STATUS = values(DATA_STATUS) , CREATE_USER_ID = values(CREATE_USER_ID) ,
CATEGORY = values(CATEGORY) , TYPE = values(TYPE) , NAME = values(NAME) , TREE_SORT = values(TREE_SORT) , IS_LEVEL = values(IS_LEVEL) , IS_ENABLE = values(IS_ENABLE) , DATA_STATUS = values(DATA_STATUS) , CREATE_USER_ID = values(CREATE_USER_ID) ,
CREATE_TIME = values(CREATE_TIME) , UPDATE_USER_ID = values(UPDATE_USER_ID) , UPDATE_TIME = values(UPDATE_TIME)
, PROJECT_ID = values(PROJECT_ID) , PARENT_ID = values(PARENT_ID)
</insert>
......@@ -151,21 +137,12 @@
<if test="treeSort != null">
TREE_SORT = #{treeSort},
</if>
<if test="icon != null and icon != ''">
ICON = #{icon},
</if>
<if test="isLevel != null and isLevel != ''">
IS_LEVEL = #{isLevel},
</if>
<if test="isEnable != null and isEnable != ''">
IS_ENABLE = #{isEnable},
</if>
<if test="lockByUser != null and lockByUser != ''">
LOCK_BY_USER = #{lockByUser},
</if>
<if test="lockTime != null">
LOCK_TIME = #{lockTime},
</if>
<if test="dataStatus != null and dataStatus != ''">
DATA_STATUS = #{dataStatus},
</if>
......
src/main/resources/mapper/dmp/DmpTableFieldMappingMapper.xml
View file @ 805ae1f7
......@@ -12,7 +12,7 @@
<select id="queryById" resultMap="DmpTableFieldMappingMap">
select
ID, SOURCE_ID, TARGET_ID
from dmp_web.dmp_table_field_mapping
from dmp_table_field_mapping
where ID = #{id}
</select>
......@@ -20,7 +20,7 @@
<select id="queryAllByLimit" resultMap="DmpTableFieldMappingMap">
select
ID, SOURCE_ID, TARGET_ID
from dmp_web.dmp_table_field_mapping
from dmp_table_field_mapping
limit #{offset}, #{limit}
</select>
......@@ -28,7 +28,7 @@
<select id="queryAll" resultMap="DmpTableFieldMappingMap">
select
ID, SOURCE_ID, TARGET_ID
from dmp_web.dmp_table_field_mapping
from dmp_table_field_mapping
<where>
<if test="id != null">
and ID = #{id}
......@@ -44,12 +44,12 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into dmp_web.dmp_table_field_mapping(SOURCE_ID, TARGET_ID)
insert into dmp_table_field_mapping(SOURCE_ID, TARGET_ID)
values (#{sourceId}, #{targetId})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into dmp_web.dmp_table_field_mapping(SOURCE_ID, TARGET_ID)
insert into dmp_table_field_mapping(SOURCE_ID, TARGET_ID)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.sourceId}, #{entity.targetId})
......@@ -57,7 +57,7 @@
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into dmp_web.dmp_table_field_mapping(SOURCE_ID, TARGET_ID)
insert into dmp_table_field_mapping(SOURCE_ID, TARGET_ID)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.sourceId}, #{entity.targetId})
......@@ -68,7 +68,7 @@
<!--通过主键修改数据-->
<update id="update">
update dmp_web.dmp_table_field_mapping
update dmp_table_field_mapping
<set>
<if test="sourceId != null">
SOURCE_ID = #{sourceId},
......@@ -82,7 +82,7 @@
<!--通过主键删除-->
<delete id="deleteById">
delete from dmp_web.dmp_table_field_mapping where ID = #{id}
delete from dmp_table_field_mapping where ID = #{id}
</delete>
</mapper>
\ No newline at end of file
src/main/resources/mapper/dmp/DmpTableFieldSchemaMapper.xml
View file @ 805ae1f7
......@@ -14,7 +14,7 @@
<select id="queryById" resultMap="DmpTableFieldSchemaMap">
select
ID, DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT
from dmp_web.dmp_table_field_schema
from dmp_table_field_schema
where ID = #{id}
</select>
......@@ -22,7 +22,7 @@
<select id="queryAllByLimit" resultMap="DmpTableFieldSchemaMap">
select
ID, DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT
from dmp_web.dmp_table_field_schema
from dmp_table_field_schema
limit #{offset}, #{limit}
</select>
......@@ -30,7 +30,7 @@
<select id="queryAll" resultMap="DmpTableFieldSchemaMap">
select
ID, DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT
from dmp_web.dmp_table_field_schema
from dmp_table_field_schema
<where>
<if test="id != null">
and ID = #{id}
......@@ -52,12 +52,12 @@
<!--新增所有列-->
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
insert into dmp_web.dmp_table_field_schema(DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT)
insert into dmp_table_field_schema(DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT)
values (#{dsId}, #{typeCategory}, #{fieldType}, #{isCatDefault})
</insert>
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
insert into dmp_web.dmp_table_field_schema(DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT)
insert into dmp_table_field_schema(DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.dsId}, #{entity.typeCategory}, #{entity.fieldType}, #{entity.isCatDefault})
......@@ -65,7 +65,7 @@
</insert>
<insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
insert into dmp_web.dmp_table_field_schema(DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT)
insert into dmp_table_field_schema(DS_ID, TYPE_CATEGORY, FIELD_TYPE, IS_CAT_DEFAULT)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.dsId}, #{entity.typeCategory}, #{entity.fieldType}, #{entity.isCatDefault})
......@@ -77,7 +77,7 @@
<!--通过主键修改数据-->
<update id="update">
update dmp_web.dmp_table_field_schema
update dmp_table_field_schema
<set>
<if test="dsId != null">
DS_ID = #{dsId},
......@@ -97,7 +97,7 @@
<!--通过主键删除-->
<delete id="deleteById">
delete from dmp_web.dmp_table_field_schema where ID = #{id}
delete from dmp_table_field_schema where ID = #{id}
</delete>
<select id="getTableFieldsMapping" parameterType="java.util.Map" resultType="java.util.Map">
......
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