From 3f857d8bf33d6bcdd24a8ae377fd225f3de34052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 6 Nov 2024 08:58:15 +0800
Subject: [PATCH] 'commit'

---
 .../Tools/{DataSetAddXzqh.java => Step1_DataSetAddXzqh.java} | 5 +----
 .../base/Tools/{DataSetInit.java => Step2_DataSetInit.java}  | 2 +-
 .../{DataSetFakeData.java => Step3_DataSetFakeData.java}     | 3 ++-
 .../com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java   | 5 ++---
 .../com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java     | 4 ++--
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename src/main/java/com/dsideal/base/Tools/{DataSetAddXzqh.java => Step1_DataSetAddXzqh.java} (91%)
 rename src/main/java/com/dsideal/base/Tools/{DataSetInit.java => Step2_DataSetInit.java} (91%)
 rename src/main/java/com/dsideal/base/Tools/{DataSetFakeData.java => Step3_DataSetFakeData.java} (96%)

diff --git a/src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java b/src/main/java/com/dsideal/base/Tools/Step1_DataSetAddXzqh.java
similarity index 91%
rename from src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java
rename to src/main/java/com/dsideal/base/Tools/Step1_DataSetAddXzqh.java
index de683dc8..bfb34fb9 100644
--- a/src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java
+++ b/src/main/java/com/dsideal/base/Tools/Step1_DataSetAddXzqh.java
@@ -2,16 +2,13 @@ package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
-import com.dsideal.base.Tools.Util.SshMysqlConnectUtil;
 import com.jcraft.jsch.JSchException;
 import com.jfinal.plugin.activerecord.Record;
 
 import java.io.IOException;
 import java.util.List;
 
-import com.jcraft.jsch.Session;
-
-public class DataSetAddXzqh {
+public class Step1_DataSetAddXzqh {
 
     public static DataEaseModel dm = new DataEaseModel();
 
diff --git a/src/main/java/com/dsideal/base/Tools/DataSetInit.java b/src/main/java/com/dsideal/base/Tools/Step2_DataSetInit.java
similarity index 91%
rename from src/main/java/com/dsideal/base/Tools/DataSetInit.java
rename to src/main/java/com/dsideal/base/Tools/Step2_DataSetInit.java
index 17c91ec4..07ee3687 100644
--- a/src/main/java/com/dsideal/base/Tools/DataSetInit.java
+++ b/src/main/java/com/dsideal/base/Tools/Step2_DataSetInit.java
@@ -5,7 +5,7 @@ import com.dsideal.base.Tools.Util.LocalMysqlConnectUtil;
 
 import java.io.IOException;
 
-public class DataSetInit {
+public class Step2_DataSetInit {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException {
diff --git a/src/main/java/com/dsideal/base/Tools/DataSetFakeData.java b/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java
similarity index 96%
rename from src/main/java/com/dsideal/base/Tools/DataSetFakeData.java
rename to src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java
index c6f488fc..f3594b6c 100644
--- a/src/main/java/com/dsideal/base/Tools/DataSetFakeData.java
+++ b/src/main/java/com/dsideal/base/Tools/Step3_DataSetFakeData.java
@@ -9,7 +9,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-public class DataSetFakeData {
+public class Step3_DataSetFakeData {
     public static DataEaseModel dm = new DataEaseModel();
 
     /**
@@ -26,6 +26,7 @@ public class DataSetFakeData {
             r.set("上级行政区划", parent_name);
             r.remove("id");
         }
+        System.out.println(table_name);
         Db.use(DataEaseModel.DB_NAME).batchSave(table_name, list, 100);
     }
 
diff --git a/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java b/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java
index 708d3722..6afaf8e9 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java
+++ b/src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java
@@ -2,9 +2,8 @@ package com.dsideal.base.Tools.Util;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
 import com.dsideal.base.Plugin.YamlProp;
-import com.dsideal.base.Tools.DataSetInit;
+import com.dsideal.base.Tools.Step2_DataSetInit;
 import com.jfinal.kit.Prop;
-import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
@@ -37,7 +36,7 @@ public class LocalMysqlConnectUtil {
 
         //遍历sql目录下所有的sql文件
         File sqlDir;
-        String basePath = DataSetInit.class.getResource("/").getPath();
+        String basePath = Step2_DataSetInit.class.getResource("/").getPath();
         sqlDir = new File(basePath + "/Sql");
         File[] sqlFiles = sqlDir.listFiles();
         for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {
diff --git a/src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java b/src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java
index e3d3b951..f0a82c8a 100644
--- a/src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java
+++ b/src/main/java/com/dsideal/base/Tools/Util/SshMysqlConnectUtil.java
@@ -1,7 +1,7 @@
 package com.dsideal.base.Tools.Util;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Tools.DataSetInit;
+import com.dsideal.base.Tools.Step2_DataSetInit;
 import com.dsideal.base.Util.SSHConnector;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
@@ -45,7 +45,7 @@ public class SshMysqlConnectUtil {
 
             //遍历sql目录下所有的sql文件
             File sqlDir;
-            String basePath = DataSetInit.class.getResource("/").getPath();
+            String basePath = Step2_DataSetInit.class.getResource("/").getPath();
             sqlDir = new File(basePath + "/Sql");
             File[] sqlFiles = sqlDir.listFiles();
             for (File sqlFile : sqlFiles != null ? sqlFiles : new File[0]) {