From 2933b7ac36d9ccb9262bbeaafbbbdd738c31be15 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Mon, 17 Nov 2025 17:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mini/capi/api/job/jobController.java     |  2 +-
 .../com/mini/capi/biz/domain/DataTableField.java |  4 ++--
 .../com/mini/capi/biz/domain/DataTableInfo.java  |  4 ++--
 src/main/java/com/mini/capi/mybatis/demo.java    |  2 +-
 .../java/com/mini/capi/utils/MysqlUtils.java     |  8 ++++----
 src/main/java/com/mini/capi/utils/SqlUtils.java  | 11 ++++-------
 .../resources/mapper/DataTableFieldMapper.xml    |  4 ++--
 .../resources/mapper/DataTableInfoMapper.xml     |  4 ++--
 src/main/resources/templates/data.html           | 16 ++++++++--------
 src/main/resources/templates/index.html          |  3 ++-
 10 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/mini/capi/api/job/jobController.java b/src/main/java/com/mini/capi/api/job/jobController.java
index 37dff71..e9515ef 100644
--- a/src/main/java/com/mini/capi/api/job/jobController.java
+++ b/src/main/java/com/mini/capi/api/job/jobController.java
@@ -110,7 +110,7 @@ public class jobController {
                             dataTableFieldService.save(tableField);
                         }
                         dataTableInfoService.save(tableInfo);
-                        logger.info("已同步数据库:", tableInfo.getDataSource(), ",数据表:", tableInfo.getTableName(), ",总计:", tableFields.size(), "个字段");
+                        logger.info("已同步数据库:", tableInfo.getDataSource(), ",数据表:", tableInfo.getDataName(), ",总计:", tableFields.size(), "个字段");
                     }
                 } catch (Exception e) {
                     logger.error(e.getMessage());
diff --git a/src/main/java/com/mini/capi/biz/domain/DataTableField.java b/src/main/java/com/mini/capi/biz/domain/DataTableField.java
index 4690e9d..56951ba 100644
--- a/src/main/java/com/mini/capi/biz/domain/DataTableField.java
+++ b/src/main/java/com/mini/capi/biz/domain/DataTableField.java
@@ -51,8 +51,8 @@ public class DataTableField implements Serializable {
     /**
      * 数据表名称
      */
-    @TableField("table_name")
-    private String tableName;
+    @TableField("data_name")
+    private String dataName;
 
     /**
      * 字段序号（表示字段在表中的顺序）
diff --git a/src/main/java/com/mini/capi/biz/domain/DataTableInfo.java b/src/main/java/com/mini/capi/biz/domain/DataTableInfo.java
index 0d2fb30..cec228f 100644
--- a/src/main/java/com/mini/capi/biz/domain/DataTableInfo.java
+++ b/src/main/java/com/mini/capi/biz/domain/DataTableInfo.java
@@ -40,8 +40,8 @@ public class DataTableInfo implements Serializable {
     /**
      * 数据表名称
      */
-    @TableField("table_name")
-    private String tableName;
+    @TableField("data_name")
+    private String dataName;
 
     /**
      * 数据表描述
diff --git a/src/main/java/com/mini/capi/mybatis/demo.java b/src/main/java/com/mini/capi/mybatis/demo.java
index 5c1705a..7b4daca 100644
--- a/src/main/java/com/mini/capi/mybatis/demo.java
+++ b/src/main/java/com/mini/capi/mybatis/demo.java
@@ -29,7 +29,7 @@ public class demo {
                             .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper"));
                 })
                 .strategyConfig(builder -> {
-                    builder.addInclude("biz_db_config")
+                    builder.addInclude("data_table_info,data_table_field")
                             .addTablePrefix("biz_,erp_")
                             .entityBuilder()
                             .enableLombok()
diff --git a/src/main/java/com/mini/capi/utils/MysqlUtils.java b/src/main/java/com/mini/capi/utils/MysqlUtils.java
index 9dbc083..2bba060 100644
--- a/src/main/java/com/mini/capi/utils/MysqlUtils.java
+++ b/src/main/java/com/mini/capi/utils/MysqlUtils.java
@@ -97,7 +97,7 @@ public class MysqlUtils {
             try (ResultSet tableRs = tablePs.executeQuery()) {
                 while (tableRs.next()) {
                     DataTableInfo tableInfo = buildDataTableInfo(tableRs, dbName);
-                    List<DataTableField> fields = getFieldsByTable(conn, dbName, tableInfo.getTableName());
+                    List<DataTableField> fields = getFieldsByTable(conn, dbName, tableInfo.getDataName());
                     fields.forEach(field -> field.setTableId(tableInfo.getTableId()));
                     tableInfos.add(tableInfo);
                 }
@@ -112,7 +112,7 @@ public class MysqlUtils {
     private static DataTableInfo buildDataTableInfo(ResultSet tableRs, String dbName) throws SQLException {
         DataTableInfo tableInfo = new DataTableInfo();
         tableInfo.setTableId(vId.getUid());
-        tableInfo.setTableName(tableRs.getString("TABLE_NAME"));
+        tableInfo.setDataName(tableRs.getString("TABLE_NAME"));
         tableInfo.setTableComment(tableRs.getString("TABLE_COMMENT"));
         long dataLength = tableRs.getLong("DATA_LENGTH");
         long indexLength = tableRs.getLong("INDEX_LENGTH");
@@ -162,7 +162,7 @@ public class MysqlUtils {
         DataTableField field = new DataTableField();
         field.setFieldId(vId.getUid());
         field.setDataSource(fieldRs.getString("TABLE_SCHEMA"));
-        field.setTableName(fieldRs.getString("TABLE_NAME"));
+        field.setDataName(fieldRs.getString("TABLE_NAME"));
         field.setFieldName(fieldRs.getString("COLUMN_NAME"));
         String fieldType = fieldRs.getString("COLUMN_TYPE");
         field.setFieldType(fieldType);
@@ -202,7 +202,7 @@ public class MysqlUtils {
             for (Map.Entry<String, List<DataTableInfo>> entry : schemaInfo.entrySet()) {
                 for (DataTableInfo tableInfo : entry.getValue()) {
                     tableInfo.setDbId(dbConfig.getId());
-                    List<DataTableField> dataTableFields = getFieldsByTable(conn, entry.getKey(), tableInfo.getTableName());
+                    List<DataTableField> dataTableFields = getFieldsByTable(conn, entry.getKey(), tableInfo.getDataName());
                     dataTableFields.stream().forEach(tableField -> tableField.setTableId(tableInfo.getTableId()));
                     tableTrees.add(new TableTree(tableInfo, dataTableFields));
                 }
diff --git a/src/main/java/com/mini/capi/utils/SqlUtils.java b/src/main/java/com/mini/capi/utils/SqlUtils.java
index f947bab..c81f787 100644
--- a/src/main/java/com/mini/capi/utils/SqlUtils.java
+++ b/src/main/java/com/mini/capi/utils/SqlUtils.java
@@ -18,7 +18,7 @@ public class SqlUtils {
     public static String CreateTableSql(DataTableInfo tableInfo, List<DataTableField> fieldList) {
         StringBuilder sb = new StringBuilder();
         // 表定义开始
-        sb.append("CREATE TABLE ").append(tableInfo.getTableName()).append(" (\n");
+        sb.append("CREATE TABLE ").append(tableInfo.getDataName()).append(" (\n");
         // 拼接字段定义
         for (int i = 0; i < fieldList.size(); i++) {
             DataTableField field = fieldList.get(i);
@@ -69,16 +69,15 @@ public class SqlUtils {
     public static String SelectSqlComments(DataTableInfo tableInfo, List<DataTableField> fieldList) {
         StringBuilder sb = new StringBuilder();
         // 表注释
-        sb.append("-- 表名：").append(tableInfo.getTableName()).append("\n");
+        sb.append("-- 表名：").append(tableInfo.getDataName()).append("\n");
         sb.append("-- 描述：").append(tableInfo.getTableComment() != null ? tableInfo.getTableComment() : "无").append("\n");
         sb.append("-- 数据来源：").append(tableInfo.getDataSource() != null ? tableInfo.getDataSource() : "未知").append("\n");
         // SELECT语句开始
         sb.append("SELECT\n");
-
         // 拼接字段（带注释）
         for (int i = 0; i < fieldList.size(); i++) {
             DataTableField field = fieldList.get(i);
-            sb.append("  ").append(field.getFieldName()).append("");
+            sb.append("  ").append(field.getFieldName());
             // 字段注释
             if (field.getFieldRemark() != null && !field.getFieldRemark().isEmpty()) {
                 sb.append("  -- ").append(field.getFieldRemark());
@@ -89,10 +88,8 @@ public class SqlUtils {
             }
             sb.append("\n");
         }
-
         // 表名
-        sb.append("FROM ").append(tableInfo.getTableName()).append(";");
-
+        sb.append("FROM ").append(tableInfo.getDataName()).append(";");
         return sb.toString();
     }
 }
diff --git a/src/main/resources/mapper/DataTableFieldMapper.xml b/src/main/resources/mapper/DataTableFieldMapper.xml
index f18a248..71ea998 100644
--- a/src/main/resources/mapper/DataTableFieldMapper.xml
+++ b/src/main/resources/mapper/DataTableFieldMapper.xml
@@ -8,7 +8,7 @@
         <result column="create_time" property="createTime" />
         <result column="table_id" property="tableId" />
         <result column="data_source" property="dataSource" />
-        <result column="table_name" property="tableName" />
+        <result column="data_name" property="dataName" />
         <result column="field_order" property="fieldOrder" />
         <result column="field_type" property="fieldType" />
         <result column="field_name" property="fieldName" />
@@ -23,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        create_time, field_id, table_id, data_source, table_name, field_order, field_type, field_name, field_length, field_remark, ds, f_tenant_id, f_flow_id, f_flow_task_id, f_flow_state
+        create_time, field_id, table_id, data_source, data_name, field_order, field_type, field_name, field_length, field_remark, ds, f_tenant_id, f_flow_id, f_flow_task_id, f_flow_state
     </sql>
 
 </mapper>
diff --git a/src/main/resources/mapper/DataTableInfoMapper.xml b/src/main/resources/mapper/DataTableInfoMapper.xml
index ddb775e..a2e44f7 100644
--- a/src/main/resources/mapper/DataTableInfoMapper.xml
+++ b/src/main/resources/mapper/DataTableInfoMapper.xml
@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.mini.capi.biz.domain.DataTableInfo">
         <id column="table_id" property="tableId" />
         <result column="create_time" property="createTime" />
-        <result column="table_name" property="tableName" />
+        <result column="data_name" property="dataName" />
         <result column="table_comment" property="tableComment" />
         <result column="table_size" property="tableSize" />
         <result column="data_source" property="dataSource" />
@@ -24,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        create_time, table_id, table_name, table_comment, table_size, data_source, creator, data_rows, update_time, remarks, db_id, ds, f_tenant_id, f_flow_id, f_flow_task_id, f_flow_state
+        create_time, table_id, data_name, table_comment, table_size, data_source, creator, data_rows, update_time, remarks, db_id, ds, f_tenant_id, f_flow_id, f_flow_task_id, f_flow_state
     </sql>
 
 </mapper>
diff --git a/src/main/resources/templates/data.html b/src/main/resources/templates/data.html
index 6895258..4c1ae89 100644
--- a/src/main/resources/templates/data.html
+++ b/src/main/resources/templates/data.html
@@ -142,12 +142,12 @@
         <div class="bg-white p-4 rounded-lg shadow-sm mb-4">
             <div class="flex flex-col sm:flex-row gap-3">
                 <div class="relative flex-1">
-                    <input
-                            type="text"
-                            id="searchInput"
-                            placeholder="请输入表名称或描述进行查询..."
-                            class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
-                    >
+                    <label for="searchInput"></label><input
+                        type="text"
+                        id="searchInput"
+                        placeholder="请输入表名称或描述进行查询..."
+                        class="w-full pl-10 pr-4 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
+                >
                     <i class="fa fa-search absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400"></i>
                 </div>
 
@@ -180,7 +180,7 @@
                      th:each="table : ${tables}">
                     <div class="mb-2">
                         <div class="flex justify-between items-start">
-                            <h3 class="font-semibold text-gray-800 table-name" th:text="${table.getTableName()}"></h3>
+                            <h3 class="font-semibold text-gray-800 table-name" th:text="${table.getDataName()}"></h3>
                             <span class="text-xs bg-blue-100 text-blue-800 px-2 py-0.5 rounded"
                                   th:text="${table.getDataSource()}"></span>
                         </div>
@@ -238,7 +238,7 @@
 <!-- 背景遮罩 -->
 <div class="overlay" id="overlay"></div>
 
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+<script th:src="@{/bootstrap/dist/js/bootstrap.bundle.min.js}"></script>
 <script>
     document.addEventListener('DOMContentLoaded', function () {
         // 核心元素获取
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index fba3220..87f9967 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -419,7 +419,8 @@
 </div>
 
 <!-- 引入Bootstrap JS -->
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
+
+<script th:src="@{/bootstrap/dist/js/bootstrap.bundle.min.js}"></script>
 <script>
     // 提示弹窗工具函数 - 新增
     function showToast(message, type = 'success') {