Merge pull request #1322 from dataease/pr@dev@refactor_auth-model

backend/src/main/java/io/dataease/base/domain/VAuthModel.java

@@ -23,5 +23,7 @@ public class VAuthModel implements Serializable {
 
     private Long mode;
 
+    private String dataSourceId;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

backend/src/main/java/io/dataease/base/domain/VAuthModelExample.java

@@ -713,6 +713,76 @@ public class VAuthModelExample {
             addCriterion("`mode` not between", value1, value2, "mode");
             return (Criteria) this;
         }
+
+        public Criteria andDataSourceIdIsNull() {
+            addCriterion("data_source_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdIsNotNull() {
+            addCriterion("data_source_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdEqualTo(String value) {
+            addCriterion("data_source_id =", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdNotEqualTo(String value) {
+            addCriterion("data_source_id <>", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdGreaterThan(String value) {
+            addCriterion("data_source_id >", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("data_source_id >=", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdLessThan(String value) {
+            addCriterion("data_source_id <", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdLessThanOrEqualTo(String value) {
+            addCriterion("data_source_id <=", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdLike(String value) {
+            addCriterion("data_source_id like", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdNotLike(String value) {
+            addCriterion("data_source_id not like", value, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdIn(List<String> values) {
+            addCriterion("data_source_id in", values, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdNotIn(List<String> values) {
+            addCriterion("data_source_id not in", values, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdBetween(String value1, String value2) {
+            addCriterion("data_source_id between", value1, value2, "dataSourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDataSourceIdNotBetween(String value1, String value2) {
+            addCriterion("data_source_id not between", value1, value2, "dataSourceId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml

@@ -11,6 +11,7 @@
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="level" jdbcType="BIGINT" property="level" />
     <result column="mode" jdbcType="BIGINT" property="mode" />
+    <result column="data_source_id" jdbcType="VARCHAR" property="dataSourceId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.VAuthModelWithBLOBs">
     <result column="name" jdbcType="LONGVARCHAR" property="name" />
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, pid, node_type, model_type, model_inner_type, auth_type, create_by, `level`, 
-    `mode`
+    `mode`, data_source_id
   </sql>
   <sql id="Blob_Column_List">
     `name`, `label`
@@ -121,11 +122,13 @@
     insert into v_auth_model (id, pid, node_type, 
       model_type, model_inner_type, auth_type, 
       create_by, `level`, `mode`, 
-      `name`, `label`)
+      data_source_id, `name`, `label`
+      )
     values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{nodeType,jdbcType=VARCHAR}, 
       #{modelType,jdbcType=VARCHAR}, #{modelInnerType,jdbcType=VARCHAR}, #{authType,jdbcType=VARCHAR}, 
       #{createBy,jdbcType=VARCHAR}, #{level,jdbcType=BIGINT}, #{mode,jdbcType=BIGINT}, 
-      #{name,jdbcType=LONGVARCHAR}, #{label,jdbcType=LONGVARCHAR})
+      #{dataSourceId,jdbcType=VARCHAR}, #{name,jdbcType=LONGVARCHAR}, #{label,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.VAuthModelWithBLOBs">
     insert into v_auth_model
@@ -157,6 +160,9 @@
       <if test="mode != null">
         `mode`,
       </if>
+      <if test="dataSourceId != null">
+        data_source_id,
+      </if>
       <if test="name != null">
         `name`,
       </if>
@@ -192,6 +198,9 @@
       <if test="mode != null">
         #{mode,jdbcType=BIGINT},
       </if>
+      <if test="dataSourceId != null">
+        #{dataSourceId,jdbcType=VARCHAR},
+      </if>
       <if test="name != null">
         #{name,jdbcType=LONGVARCHAR},
       </if>
@@ -236,6 +245,9 @@
       <if test="record.mode != null">
         `mode` = #{record.mode,jdbcType=BIGINT},
       </if>
+      <if test="record.dataSourceId != null">
+        data_source_id = #{record.dataSourceId,jdbcType=VARCHAR},
+      </if>
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=LONGVARCHAR},
       </if>
@@ -258,6 +270,7 @@
       create_by = #{record.createBy,jdbcType=VARCHAR},
       `level` = #{record.level,jdbcType=BIGINT},
       `mode` = #{record.mode,jdbcType=BIGINT},
+      data_source_id = #{record.dataSourceId,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=LONGVARCHAR},
       `label` = #{record.label,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -274,7 +287,8 @@
       auth_type = #{record.authType,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       `level` = #{record.level,jdbcType=BIGINT},
-      `mode` = #{record.mode,jdbcType=BIGINT}
+      `mode` = #{record.mode,jdbcType=BIGINT},
+      data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>

backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.java

@@ -8,6 +8,6 @@ import java.util.List;
 
 public interface ExtVAuthModelMapper {
 
-    List<VAuthModelDTO> queryAuthModel (@Param("request") VAuthModelRequest request);
+    List<VAuthModelDTO> queryAuthModel (@Param("record") VAuthModelRequest request);
 
 }

backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml

@@ -55,6 +55,48 @@
 		) authInfo ON v_auth_model.id = authInfo.auth_source
 	WHERE
 		FIND_IN_SET( v_auth_model.id, cids )
+		<if test="record.id != null">
+			and v_auth_model.id = #{record.id,jdbcType=VARCHAR}
+		</if>
+		<if test="record.pid != null">
+			and v_auth_model.pid = #{record.pid,jdbcType=VARCHAR}
+		</if>
+		<if test="record.nodeType != null">
+			and v_auth_model.node_type = #{record.nodeType,jdbcType=VARCHAR}
+		</if>
+		<if test="record.modelType != null">
+			and v_auth_model.model_type = #{record.modelType,jdbcType=VARCHAR}
+		</if>
+		<if test="record.modelInnerType != null">
+			and v_auth_model.model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR}
+		</if>
+		<if test="record.authType != null">
+			and v_auth_model.auth_type = #{record.authType,jdbcType=VARCHAR}
+		</if>
+		<if test="record.createBy != null">
+			and v_auth_model.create_by = #{record.createBy,jdbcType=VARCHAR}
+		</if>
+		<if test="record.level != null">
+			and v_auth_model.`level` = #{record.level,jdbcType=BIGINT}
+		</if>
+		<if test="record.mode != null">
+			and v_auth_model.`mode` = #{record.mode,jdbcType=BIGINT}
+		</if>
+		<if test="record.dataSourceId != null">
+			and v_auth_model.data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}
+		</if>
+		<if test="record.name != null">
+			and v_auth_model.`name` = #{record.name,jdbcType=LONGVARCHAR}
+		</if>
+		<if test="record.label != null">
+			and v_auth_model.`label` = #{record.label,jdbcType=LONGVARCHAR}
+		</if>
+		<if test="record.modelInnerTypeArray != null and record.modelInnerTypeArray.size() > 0">
+			v_auth_model.model_inner_type in
+			<foreach collection="modelInnerTypeArray" item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
 		ORDER BY v_auth_model.node_type desc, CONVERT(v_auth_model.label using gbk) asc
   </select>
 

backend/src/main/java/io/dataease/controller/request/authModel/VAuthModelRequest.java

@@ -3,6 +3,8 @@ package io.dataease.controller.request.authModel;
 import io.dataease.dto.authModel.VAuthModelDTO;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Author: wangjiahao
  * Date: 2021/11/24
@@ -15,5 +17,6 @@ public class VAuthModelRequest extends VAuthModelDTO {
     private String privileges;
     private Integer datasetMode;
     private boolean clearEmptyDir;
+    private List<String> modelInnerTypeArray;
 
 }