From 5d15287b2a06f978485ac6af71e33e1a82b43a65 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 15 四月 2020 16:29:55 +0800
Subject: [PATCH] fix 上传后生成版本连接池用完不释放问题
---
src/main/resources/mapping/TableInfoMapper.xml | 72 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapping/TableInfoMapper.xml b/src/main/resources/mapping/TableInfoMapper.xml
index 2c07579..30eb5cf 100644
--- a/src/main/resources/mapping/TableInfoMapper.xml
+++ b/src/main/resources/mapping/TableInfoMapper.xml
@@ -7,11 +7,11 @@
</select>
<select id="getTableField" parameterType="String" resultType="com.highdatas.mdm.entity.TableSchemaResult">
- select COLUMN_NAME as fieldName,DATA_TYPE as dbType from information_schema.COLUMNS where table_name = #{tableName} and table_schema = (select database()) ;
+ select COLUMN_NAME as fieldName,DATA_TYPE as dbType from information_schema.COLUMNS where table_name = #{tableName} and table_schema = (select database())
</select>
<select id="getTableFieldFromDb" parameterType="com.highdatas.mdm.entity.TableSchema" resultType="com.highdatas.mdm.entity.TableSchemaResult">
- select COLUMN_NAME as fieldName,DATA_TYPE as dbType from information_schema.COLUMNS where table_name = #{tableName} and table_schema = #{dbName};
+ select COLUMN_NAME as fieldName,DATA_TYPE as dbType from information_schema.COLUMNS where table_name = #{tableName} and table_schema = #{dbName}
</select>
<select id="selectByPage" resultType="java.util.Map" statementType="STATEMENT" >
@@ -388,9 +388,9 @@
]]>
</select>
- <select id="insert" resultType="java.lang.Boolean" statementType="STATEMENT" >
+ <insert id="insert" statementType="STATEMENT" >
INSERT INTO ${tableName} (${fields}) VALUES ${values}
- </select>
+ </insert>
<update id="update">
update ${tableName} set ${updateSegment}
@@ -409,7 +409,7 @@
</delete>
<!-- temp 2 standrad-->
- <select id="tempCreate2std" statementType="STATEMENT" >
+ <insert id="tempCreate2std" statementType="STATEMENT" >
INSERT INTO ${tableName}
SELECT
${tempFields}
@@ -423,7 +423,7 @@
and operate = 'create'
and tm.id = t.id
)
- </select>
+ </insert>
<select id="getTempIdByStdId" statementType="STATEMENT" resultType="java.lang.String">
SELECT tm.id from ${tableTempName} tm
@@ -432,35 +432,35 @@
</select>
- <select id="insertMatintainDetailFromTemp" statementType="STATEMENT" resultType="java.lang.Integer">
+ <insert id="insertMatintainDetailFromTemp" statementType="STATEMENT" >
INSERT INTO maintain_detail
SELECT md5(uuid()) as id, ${maintainId} as parent_id, ${operate} as operate, id as pre_merge_id, NOW() as create_time
from ${tableTempName} m WHERE m.deal = 0
- </select>
+ </insert>
- <select id="insertMatintainDetailFromStandrad" statementType="STATEMENT" resultType="java.lang.Integer">
+ <insert id="insertMatintainDetailFromStandrad" statementType="STATEMENT" >
INSERT INTO maintain_detail
SELECT md5(uuid()) as id, ${maintainId} as parent_id, 'delete' as operate, id as pre_merge_id, NOW() as create_time
from ${tableTempName} m WHERE m.deal = 0
- </select>
+ </insert>
- <select id="updateStdId" statementType="STATEMENT" resultType="java.lang.Integer">
+ <update id="updateStdId" statementType="STATEMENT" >
update ${tableTempName}
set std_id = md5(uuid()) WHERE deal = 0
- </select>
+ </update>
- <select id="insertRecordFromStandrad" statementType="STATEMENT" resultType="java.lang.Integer">
+ <insert id="insertRecordFromStandrad" statementType="STATEMENT" >
INSERT INTO ${recordTableName}
SELECT ${tempFieldList}, 0 as deal
from ${tableName}
- </select>
+ </insert>
<select id="tempByOperate" statementType="STATEMENT" resultType="java.util.Map">
SELECT
@@ -477,21 +477,55 @@
)
</select>
-
- <select id="updateRecordByMaintainId" statementType="STATEMENT" resultType="java.lang.Integer">
+ <update id="updateRecordByMaintainId" statementType="STATEMENT" >
update ${tableTempName}
INNER JOIN maintain_detail on ${tableTempName}.id = maintain_detail.pre_merge_id
set ${updateSegment}
WHERE maintain_detail.parent_id = ${maintainId}
- </select>
+ </update>
- <select id="deleteRecordByMaintainId" statementType="STATEMENT" resultType="java.lang.Integer">
-
+ <delete id="deleteRecordByMaintainId" statementType="STATEMENT" >
DELETE ${tableTempName} from ${tableTempName}
INNER JOIN maintain_detail on maintain_detail.pre_merge_id = ${tableTempName}.id
WHERE maintain_detail.parent_id = ${maintainId} and ${tableTempName}.std_id = ${stdId}
+ </delete>
+ <select id="selectActMemberShip" parameterType="java.util.Map" resultType="java.util.Map">
+ select * from act_id_membership where USER_ID_ = #{userId} and GROUP_ID_ = #{roleId}
+ </select>
+ <select id="getOneTempFieldDataByMaintainExtent" statementType="STATEMENT" resultType="java.util.Map">
+ <![CDATA[
+ SELECT DISTINCT ${field} FROM ${tempTableName} t WHERE EXISTS (
+ SELECT pre_merge_id FROM ( SELECT pre_merge_id FROM maintain_detail WHERE EXISTS (
+ SELECT id FROM ( SELECT id FROM `maintain` WHERE
+ table_name = ${tableName}
+ AND order_no >= ${fromOrderNo}
+ AND order_no < ${toOrderNo}
+ ) a
+ WHERE
+ a.id = maintain_detail.parent_id )
+ ) a
+ WHERE t.id = a.pre_merge_id)
+
+ ]]>
+ </select>
+
+ <select id="getTempDataByMaintainExtent" statementType="STATEMENT" resultType="java.util.Map">
+ <![CDATA[
+ SELECT * FROM ${tempTableName} t WHERE EXISTS (
+ SELECT pre_merge_id FROM ( SELECT pre_merge_id FROM maintain_detail WHERE EXISTS (
+ SELECT id FROM ( SELECT id FROM `maintain` WHERE
+ table_name = ${tableName}
+ AND order_no >= ${fromOrderNo}
+ AND order_no < ${toOrderNo}
+ ) a
+ WHERE
+ a.id = maintain_detail.parent_id )
+ ) a
+ WHERE t.id = a.pre_merge_id)
+
+ ]]>
</select>
</mapper>
--
Gitblit v1.8.0