ZhuDeKang 4 місяців тому
батько
коміт
04b9c166ba

+ 6 - 0
ruoyi-admin/pom.xml

@@ -43,6 +43,12 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+            <version>11.2.0.3</version>
+        </dependency>
+
         <!-- 核心模块 -->
         <dependency>
             <groupId>com.ruoyi</groupId>

+ 16 - 1
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/MdDataSetSql.java

@@ -22,6 +22,10 @@ public class MdDataSetSql extends BaseEntity
     /** 数据集id */
     @Excel(name = "数据集id")
     private String dcCode;
+    /**
+     * 数据源id
+     */
+    private String dsCode;
 
     /** 运行sql */
     @Excel(name = "运行sql")
@@ -31,7 +35,18 @@ public class MdDataSetSql extends BaseEntity
     @Excel(name = "参数列表 多个参数用,分割")
     private String pars;
 
-    public void setId(Long id) 
+    public MdDataSetSql() {
+    }
+
+    public String getDsCode() {
+        return dsCode;
+    }
+
+    public void setDsCode(String dsCode) {
+        this.dsCode = dsCode;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }

+ 6 - 1
ruoyi-api-patform/src/main/resources/mapper/interfaces/MdDataSetSqlMapper.xml

@@ -7,12 +7,13 @@
     <resultMap type="com.ruoyi.interfaces.domain.MdDataSetSql" id="MdDataSetSqlResult">
         <result property="id"    column="ID"    />
         <result property="dcCode"    column="DC_CODE"    />
+        <result property="dsCode"    column="DS_CODE"    />
         <result property="runSql"    column="RUN_SQL"    />
         <result property="pars"    column="PARS"    />
     </resultMap>
 
     <sql id="selectMdDataSetSqlVo">
-        select ID, DC_CODE, RUN_SQL, PARS from md_data_set_sql
+        select ID, DC_CODE,DS_CODE, RUN_SQL, PARS from md_data_set_sql
     </sql>
 
     <select id="selectMdDataSetSqlList" parameterType="com.ruoyi.interfaces.domain.MdDataSetSql" resultMap="MdDataSetSqlResult">
@@ -20,6 +21,7 @@
         <where>
             <if test="id != null "> and ID = #{id}</if>
             <if test="dcCode != null  and dcCode != ''"> and DC_CODE = #{dcCode}</if>
+            <if test="dsCode != null  and dsCode != ''"> and DS_CODE = #{dsCode}</if>
             <if test="runSql != null  and runSql != ''"> and RUN_SQL = #{runSql}</if>
             <if test="pars != null  and pars != ''"> and PARS = #{pars}</if>
         </where>
@@ -34,11 +36,13 @@
         insert into md_data_set_sql
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="dcCode != null">DC_CODE,</if>
+            <if test="dsCode != null">DS_CODE,</if>
             <if test="runSql != null">RUN_SQL,</if>
             <if test="pars != null">PARS,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dcCode != null">#{dcCode},</if>
+            <if test="dsCode != null">#{dsCode},</if>
             <if test="runSql != null">#{runSql},</if>
             <if test="pars != null">#{pars},</if>
         </trim>
@@ -48,6 +52,7 @@
         update md_data_set_sql
         <trim prefix="SET" suffixOverrides=",">
             <if test="dcCode != null">DC_CODE = #{dcCode},</if>
+            <if test="dsCode != null">DS_CODE = #{dsCode},</if>
             <if test="runSql != null">RUN_SQL = #{runSql},</if>
             <if test="pars != null">PARS = #{pars},</if>
         </trim>