From dec3ee1dc6a8699c84c7b6c9aadfb1d8623279c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 31 Oct 2024 10:56:06 +0800
Subject: [PATCH] 'commit'

---
 .../base/DataEase/Model/DataEaseModel.java      |  4 +++-
 .../dsideal/base/Tools/InitDataEaseDataSet.java | 17 ++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
index 66a94ece..72d5d305 100644
--- a/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
+++ b/src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java
@@ -8,9 +8,11 @@ import net.sf.json.JSONObject;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.dsideal.base.Tools.InitDataEaseDataSet.DB_NAME;
 
 public class DataEaseModel {
+    //DataEase数据库名称
+    public static final String DB_NAME = "dataease";
+
     /**
      * 获取当前人员可以看到哪些数据集
      *
diff --git a/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java b/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java
index 96d80fd6..bc90ad62 100644
--- a/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java
+++ b/src/main/java/com/dsideal/base/Tools/InitDataEaseDataSet.java
@@ -1,5 +1,6 @@
 package com.dsideal.base.Tools;
 
+import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Plugin.YamlProp;
 import com.jfinal.kit.Kv;
 import com.jfinal.kit.Prop;
@@ -15,8 +16,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class InitDataEaseDataSet {
-    //DataEase数据库名称
-    public static final String DB_NAME = "dataease";
 
     /**
      * 获取数据集的表名
@@ -67,7 +66,7 @@ public class InitDataEaseDataSet {
     public static List<String> getNotNullColumns(String tableName) {
         List<String> columns = new ArrayList<>();
         String sql = "SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND IS_NULLABLE = 'NO'";
-        List<Record> results = Db.find(sql, DB_NAME, tableName);
+        List<Record> results = Db.find(sql, DataEaseModel.DB_NAME, tableName);
         for (Record result : results) {
             columns.add(result.get("COLUMN_NAME").toString());
         }
@@ -77,14 +76,14 @@ public class InitDataEaseDataSet {
     // 检查表是否存在主键
     public static boolean hasPrimaryKey(String tableName) {
         String sql = "SELECT COUNT(*) as c FROM information_schema.TABLE_CONSTRAINTS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND CONSTRAINT_TYPE = 'PRIMARY KEY'";
-        return Db.use("dataease").queryInt(sql, DB_NAME, tableName) > 0;
+        return Db.use("dataease").queryInt(sql, DataEaseModel.DB_NAME, tableName) > 0;
     }
 
     // 添加主键列，并设置为主键
     public static void addPrimaryKey(String tableName) {
         // 添加 id 列
         String sql = "ALTER TABLE `" + tableName + "` ADD COLUMN `id` int(11) primary key auto_increment first";
-        Db.use(DB_NAME).update(sql);
+        Db.use(DataEaseModel.DB_NAME).update(sql);
     }
 
     /**
@@ -95,7 +94,7 @@ public class InitDataEaseDataSet {
     public static List<Record> getExcelTable() {
         // 查询所有以 excel_ 开头的表
         String sql = "SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA = 'dataease' AND TABLE_NAME LIKE 'excel\\_%'";
-        return Db.use(DB_NAME).find(sql);
+        return Db.use(DataEaseModel.DB_NAME).find(sql);
     }
 
     /**
@@ -133,7 +132,7 @@ public class InitDataEaseDataSet {
                     System.out.println("列" + col + "非空，正在去掉不允许为空的限制...");
                     //去掉不允许为空的限制
                     String sql = "ALTER TABLE `" + tableName + "` MODIFY `" + col + "` VARCHAR(255) NULL";
-                    Db.use(DB_NAME).update(sql);
+                    Db.use(DataEaseModel.DB_NAME).update(sql);
                     System.out.println("去掉不允许为空的限制成功");
                 }
             }
@@ -148,7 +147,7 @@ public class InitDataEaseDataSet {
                 PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         masterPlugin.start();
 
-        HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl").replace("ds_db", DB_NAME), PropKit.get("mysql.user"),
+        HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl").replace("ds_db", DataEaseModel.DB_NAME), PropKit.get("mysql.user"),
                 PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
         dataEasePlugin.start();
 
@@ -156,7 +155,7 @@ public class InitDataEaseDataSet {
         ActiveRecordPlugin arp = new ActiveRecordPlugin("master", masterPlugin);
         arp.setDialect(new MysqlDialect());
 
-        ActiveRecordPlugin arpDataEase = new ActiveRecordPlugin(DB_NAME, dataEasePlugin);
+        ActiveRecordPlugin arpDataEase = new ActiveRecordPlugin(DataEaseModel.DB_NAME, dataEasePlugin);
         arpDataEase.setDialect(new MysqlDialect());
 
         //遍历sql目录下所有的sql文件