Эх сурвалжийг харах

fix:修复生产环境sql执行数据源异常问题

韩帛霖 1 жил өмнө
parent
commit
7ebb432cbc

+ 8 - 8
zkqy-system/src/main/resources/mapper/dragmapper/DragFormMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDragFormVo">
-        select f_id,sql_key, df_name, df_nickname, df_vue_template, df_html_template, df_form_sql, df_node_id, df_database, df_table_name, df_flie_path, df_notes, del_flag, create_time, create_by, update_by, update_time, spare, spare1 from drag_form
+        select f_id,sql_key, df_name, df_nickname, df_vue_template, df_html_template, df_form_sql, df_node_id, df_database, df_table_name, df_flie_path, df_notes, del_flag, create_time, create_by, update_by, update_time, spare, spare1 from {DBNAME}.drag_form
     </sql>
 
     <select id="selectDragFormList" parameterType="com.zkqy.system.entity.DragForm" resultMap="DragFormResult">
@@ -75,13 +75,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.update_time,
             d.spare,
             d.spare1,
-            dtf.dt_id from drag_form d
-                LEFT JOIN drag_table_form dtf ON d.f_id = dtf.df_id
+            dtf.dt_id from {DBNAME}.drag_form d
+                LEFT JOIN {DBNAME}.drag_table_form dtf ON d.f_id = dtf.df_id
         where d.f_id = #{fId}
     </select>
         
     <insert id="insertDragForm" parameterType="com.zkqy.system.entity.DragForm" useGeneratedKeys="true" keyProperty="fId">
-        insert into drag_form
+        insert into {DBNAME}.drag_form
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="sqlKey != null">sql_key,</if>
             <if test="dfName != null">df_name,</if>
@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateDragForm" parameterType="com.zkqy.system.entity.DragForm">
-        update drag_form
+        update {DBNAME}.drag_form
         <trim prefix="SET" suffixOverrides=",">
             <if test="sqlKey != null">sql_key = #{sqlKey},</if>
             <if test="dfName != null">df_name = #{dfName},</if>
@@ -147,13 +147,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDragFormByFId" parameterType="Long">
-        update drag_form
+        update {DBNAME}.drag_form
         set del_flag = 1
         where f_id = #{fId}
     </delete>
 
     <delete id="deleteDragFormByFIds" parameterType="String">
-        update drag_form
+        update {DBNAME}.drag_form
         set del_flag = 1 where f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDragFormFId" resultType="int">
-        select f_id from drag_form ORDER BY f_id desc LIMIT 1
+        select f_id from {DBNAME}.drag_form ORDER BY f_id desc LIMIT 1
     </select>
 
 

+ 14 - 14
zkqy-system/src/main/resources/mapper/dragmapper/DragTableMapper.xml

@@ -46,10 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDragTableVo">
-        select t_id, dt_name, dt_nickname, table_key, sql_key, dt_table_name,time_format, dt_notes, dt_column_name, spare, spare1, del_flag, create_by, create_time, update_by, update_time, is_selection,menu_id,primary_key from drag_table
+        select t_id, dt_name, dt_nickname, table_key, sql_key, dt_table_name,time_format, dt_notes, dt_column_name, spare, spare1, del_flag, create_by, create_time, update_by, update_time, is_selection,menu_id,primary_key from {DBNAME}.drag_table
     </sql>
     <sql id="selectDragTableVoOne">
-        select t_id, dt_name, dt_nickname, table_key, sql_key, dt_table_name,time_format, dt_notes, dt_column_name, spare, spare1, del_flag, create_by, create_time, update_by, update_time, is_selection,echo_data,menu_id,primary_key from drag_table
+        select t_id, dt_name, dt_nickname, table_key, sql_key, dt_table_name,time_format, dt_notes, dt_column_name, spare, spare1, del_flag, create_by, create_time, update_by, update_time, is_selection,echo_data,menu_id,primary_key from {DBNAME}.drag_table
     </sql>
     <select id="selectDragTableList" parameterType="com.zkqy.system.entity.DragTable" resultMap="DragTableResult">
         <include refid="selectDragTableVo"/>
@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertDragTable" parameterType="com.zkqy.system.entity.DragTable" useGeneratedKeys="true" keyProperty="tId">
-        insert into drag_table
+        insert into {DBNAME}.drag_table
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="dtName != null">dt_name,</if>
             <if test="dtNickname != null">dt_nickname,</if>
@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateDragTable" parameterType="com.zkqy.system.entity.DragTable">
-        update drag_table
+        update {DBNAME}.drag_table
         <trim prefix="SET" suffixOverrides=",">
             <if test="dtName != null">dt_name = #{dtName},</if>
             <if test="dtNickname != null">dt_nickname = #{dtNickname},</if>
@@ -154,18 +154,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDragTableByTId" parameterType="Long">
-        delete from drag_table where t_id = #{tId}
+        delete from {DBNAME}.drag_table where t_id = #{tId}
     </delete>
 
     <delete id="deleteDragTableByTIds" parameterType="String">
-        delete from drag_table where t_id in 
+        delete from {DBNAME}.drag_table where t_id in
         <foreach item="tId" collection="list" open="(" separator="," close=")">
             #{tId}
         </foreach>
     </delete>
 
     <delete id="deleteDragTableByTableKeys" parameterType="list" >
-        delete from drag_table where table_key in
+        delete from {DBNAME}.drag_table where table_key in
         <foreach item="tableKey" collection="list" open="(" separator="," close=")">
             #{tableKey}
         </foreach>
@@ -180,8 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             dt.*,
             ts.table_sql,
-            ts.table_export_field FROM drag_table dt
-                LEFT JOIN table_sql ts ON dt.sql_key = ts.sql_key
+            ts.table_export_field FROM {DBNAME}.drag_table dt
+            LEFT JOIN {DBNAME}.table_sql ts ON dt.sql_key = ts.sql_key
         WHERE
             dt.t_id = #{tId}
     </select>
@@ -197,9 +197,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ts.table_sql,
         ts.table_export_field,
         ts.order_by_column
-        FROM drag_table dt
-        LEFT JOIN table_sql ts ON dt.sql_key = ts.sql_key
-        where  table_key in
+        FROM {DBNAME}.drag_table dt
+        LEFT JOIN {DBNAME}.table_sql ts ON dt.sql_key = ts.sql_key
+        where table_key in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
@@ -211,8 +211,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ts.table_sql,
         ts.table_export_field,
         ts.order_by_column
-        FROM drag_table dt
-        LEFT JOIN table_sql ts ON dt.sql_key = ts.sql_key
+        FROM {DBNAME}.drag_table dt
+        LEFT JOIN {DBNAME}.table_sql ts ON dt.sql_key = ts.sql_key
         where  table_key in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item}