1

unimall-data/src/main/java/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.java

@@ -6,14 +6,13 @@ import org.apache.ibatis.session.RowBounds;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.iotechn.unimall.data.domain.tools.gen.GenTable;
-import com.iotechn.unimall.data.domain.tools.gen.GenTableColumn;
 
 public interface GenTableMapper extends BaseMapper<GenTable>{
 	
 	/**
      * 查询据库列表
      *
-     * @param tableNames 表名称组
+     * @param genTable 表名称组
      * @return 数据库表集合
      */
 	public List<GenTable> selectDbTableList(RowBounds rowBounds,GenTable genTable);

unimall-data/src/main/resources/com/iotechn/unimall/data/mapper/tools/gen/GenTableMapper.xml

@@ -2,50 +2,50 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.iotechn.unimall.data.mapper.tools.gen.GenTableMapper">
 
-	<resultMap type="GenTable" id="GenTableResult">
-		<id     property="tableId"        column="table_id"        />
-		<result property="tableName"      column="table_name"      />
-		<result property="tableComment"   column="table_comment"   />
-		<result property="className"      column="class_name"      />
-		<result property="tplCategory"    column="tpl_category"    />
-		<result property="packageName"    column="package_name"    />
-		<result property="moduleName"     column="module_name"     />
-		<result property="businessName"   column="business_name"   />
-		<result property="functionName"   column="function_name"   />
-		<result property="functionAuthor" column="function_author" />
-		<result property="options"        column="options"         />
-		<result property="createBy"       column="create_by"       />
-		<result property="createTime"     column="create_time"     />
-		<result property="updateBy"       column="update_by"       />
-		<result property="updateTime"     column="update_time"     />
-		<result property="remark"         column="remark"          />
-		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
-	</resultMap>
+<!--	<resultMap type="GenTable" id="GenTableResult">-->
+<!--		<id     property="tableId"        column="table_id"        />-->
+<!--		<result property="tableName"      column="table_name"      />-->
+<!--		<result property="tableComment"   column="table_comment"   />-->
+<!--		<result property="className"      column="class_name"      />-->
+<!--		<result property="tplCategory"    column="tpl_category"    />-->
+<!--		<result property="packageName"    column="package_name"    />-->
+<!--		<result property="moduleName"     column="module_name"     />-->
+<!--		<result property="businessName"   column="business_name"   />-->
+<!--		<result property="functionName"   column="function_name"   />-->
+<!--		<result property="functionAuthor" column="function_author" />-->
+<!--		<result property="options"        column="options"         />-->
+<!--		<result property="createBy"       column="create_by"       />-->
+<!--		<result property="createTime"     column="create_time"     />-->
+<!--		<result property="updateBy"       column="update_by"       />-->
+<!--		<result property="updateTime"     column="update_time"     />-->
+<!--		<result property="remark"         column="remark"          />-->
+<!--		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />-->
+<!--	</resultMap>-->
 
-	<resultMap type="GenTableColumn" id="GenTableColumnResult">
-		<id     property="columnId"       column="column_id"      />
-		<result property="tableId"        column="table_id"       />
-		<result property="columnName"     column="column_name"    />
-		<result property="columnComment"  column="column_comment" />
-		<result property="columnType"     column="column_type"    />
-		<result property="javaType"       column="java_type"      />
-		<result property="javaField"      column="java_field"     />
-		<result property="isPk"           column="is_pk"          />
-		<result property="isIncrement"    column="is_increment"   />
-		<result property="isRequired"     column="is_required"    />
-		<result property="isInsert"       column="is_insert"      />
-		<result property="isEdit"         column="is_edit"        />
-		<result property="isList"         column="is_list"        />
-		<result property="isQuery"        column="is_query"       />
-		<result property="queryType"      column="query_type"     />
-		<result property="htmlType"       column="html_type"      />
-		<result property="dictType"       column="dict_type"      />
-		<result property="sort"           column="sort"           />
-		<result property="createBy"       column="create_by"      />
-		<result property="createTime"     column="create_time"    />
-		<result property="updateBy"       column="update_by"      />
-		<result property="updateTime"     column="update_time"    />
-	</resultMap>
+<!--	<resultMap type="GenTableColumn" id="GenTableColumnResult">-->
+<!--		<id     property="columnId"       column="column_id"      />-->
+<!--		<result property="tableId"        column="table_id"       />-->
+<!--		<result property="columnName"     column="column_name"    />-->
+<!--		<result property="columnComment"  column="column_comment" />-->
+<!--		<result property="columnType"     column="column_type"    />-->
+<!--		<result property="javaType"       column="java_type"      />-->
+<!--		<result property="javaField"      column="java_field"     />-->
+<!--		<result property="isPk"           column="is_pk"          />-->
+<!--		<result property="isIncrement"    column="is_increment"   />-->
+<!--		<result property="isRequired"     column="is_required"    />-->
+<!--		<result property="isInsert"       column="is_insert"      />-->
+<!--		<result property="isEdit"         column="is_edit"        />-->
+<!--		<result property="isList"         column="is_list"        />-->
+<!--		<result property="isQuery"        column="is_query"       />-->
+<!--		<result property="queryType"      column="query_type"     />-->
+<!--		<result property="htmlType"       column="html_type"      />-->
+<!--		<result property="dictType"       column="dict_type"      />-->
+<!--		<result property="sort"           column="sort"           />-->
+<!--		<result property="createBy"       column="create_by"      />-->
+<!--		<result property="createTime"     column="create_time"    />-->
+<!--		<result property="updateBy"       column="update_by"      />-->
+<!--		<result property="updateTime"     column="update_time"    />-->
+<!--	</resultMap>-->
 	<sql id="selectDictTypeVo">
 		SELECT
 			table_id AS tableId,
@@ -84,7 +84,7 @@
 			#{item}
 		</foreach>
 	</select>
-	<select id="selectDbTableList" parameterType="GenTable" resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
+	<select id="selectDbTableList"  resultType="com.iotechn.unimall.data.domain.tools.gen.GenTable">
 		SELECT
 		table_name as tableName,
 		table_comment as tableComment,
@@ -104,7 +104,7 @@
 			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 		</if>
 	</select>
-	<select id="selectDbTableCount" parameterType="GenTable" resultType="java.lang.Integer">
+	<select id="selectDbTableCount"  resultType="java.lang.Integer">
 		SELECT
 		COUNT(*)
 		FROM