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 | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapping/TableInfoMapper.xml b/src/main/resources/mapping/TableInfoMapper.xml
index ef1f047..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" >
@@ -477,7 +477,6 @@
)
</select>
-
<update id="updateRecordByMaintainId" statementType="STATEMENT" >
update ${tableTempName}
INNER JOIN maintain_detail on ${tableTempName}.id = maintain_detail.pre_merge_id
@@ -487,11 +486,46 @@
</update>
<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