'commit'

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -22,8 +22,7 @@ import java.util.stream.Collectors;
 
 public class DataEaseModel {
     //DataEase数据库名称
-    public static final String DB_NAME = "dataease";
+    public static String DB_NAME = "dataease";
-
     /**
      * 获取当前人员可以看到哪些数据集
      *

src/main/java/com/dsideal/base/Tools/ChangUrlLink.java

@@ -15,7 +15,7 @@ public class ChangUrlLink {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        LocalMysqlConnectUtil.Init(null);
+        LocalMysqlConnectUtil.Init();
         //原地址
         String sourceHost = "http://10.10.21.20:9000/dsBase/";
         //目标地址

src/main/java/com/dsideal/base/Tools/DataSetAddXzqh.java

@@ -16,7 +16,7 @@ public class DataSetAddXzqh {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        LocalMysqlConnectUtil.Init(null);
+        LocalMysqlConnectUtil.Init();
 
         //遍历所有以excel_开头的表，找出这些表中是不是存在行政区划,上级行政区划的列名
         for (int identity_id : new int[]{1, 2, 3}) {

src/main/java/com/dsideal/base/Tools/DataSetFakeData.java

@@ -23,12 +23,17 @@ public class DataSetFakeData {
         List<Record> list = Db.use(DataEaseModel.DB_NAME).find(sql);
         for (Record r : list) {
             r.set("行政区划", area_name);
+            r.remove("id");
         }
         Db.use(DataEaseModel.DB_NAME).batchSave(table_name, list, 100);
     }
 
     public static void main(String[] args) throws IOException {
-        LocalMysqlConnectUtil.Init("dataease_huanghai");
+        //切换至测试数据库
+        DataEaseModel.DB_NAME = "dataease_huanghai";
+        //初始化数据库链接
+        LocalMysqlConnectUtil.Init();
+
         DataEaseModel dm = new DataEaseModel();
 
         //这几个是要保留的地名
@@ -57,6 +62,8 @@ public class DataSetFakeData {
                 int cnt = Db.use(DataEaseModel.DB_NAME).queryInt(sql);
                 if (cnt == 0) {
                     CopyData(table_name, area_name, "昆明市");
+                } else {
+                    System.out.println("数据集：" + table_name + " 已经存在，跳过");
                 }
             }
         }
@@ -74,12 +81,14 @@ public class DataSetFakeData {
             List<Record> list = dm.getDataSetByIdentityId(identity_id, null);
             for (Record record : list) {
                 String table_name = record.getStr("table_name");
-                System.out.println("正在处理数据集：" + table_name);
+                System.out.println(area_name + "正在处理数据集：" + table_name);
                 //检查这个行政区划，在本数据表中是不是存在过，判断办法是 列名: `行政区划`= area_name,如果存在则不作处理，否则拷贝昆明市的数据
                 String sql = "select count(1) from `" + table_name + "` where `行政区划`='" + area_name + "'";
                 int cnt = Db.use(DataEaseModel.DB_NAME).queryInt(sql);
                 if (cnt == 0) {
                     CopyData(table_name, area_name, "寻甸县");
+                } else {
+                    System.out.println("数据集：" + table_name + " 已经存在，跳过");
                 }
             }
         }

src/main/java/com/dsideal/base/Tools/DataSetInit.java

@@ -9,7 +9,7 @@ public class DataSetInit {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException {
-        LocalMysqlConnectUtil.Init(null);
+        LocalMysqlConnectUtil.Init();
         //1、添加到数据集表中
         dm.collectDataSet();
         //2、加上主键

src/main/java/com/dsideal/base/Tools/InitOrgPerson.java

@@ -24,7 +24,7 @@ public class InitOrgPerson {
     public static Prop PropKit;
 
     public static void main(String[] args) throws Exception {
-        LocalMysqlConnectUtil.Init(null);
+        LocalMysqlConnectUtil.Init();
 
         // 用于缓存模块的redis服务
         RedisPlugin redis = new RedisPlugin("myRedis", PropKit.get("redis.ip"), PropKit.getInt("redis.port"), 10 * 1000);

src/main/java/com/dsideal/base/Tools/Test/ExportExcel.java

@@ -14,7 +14,7 @@ public class ExportExcel {
     public static DataEaseModel dm = new DataEaseModel();
 
     public static void main(String[] args) throws IOException, JSchException {
-        LocalMysqlConnectUtil.Init(null);
+        LocalMysqlConnectUtil.Init();
 
         //Excel的保存目录
         String exportPath = "D:/360Downloads/Excel";

src/main/java/com/dsideal/base/Tools/Util/LocalMysqlConnectUtil.java

@@ -14,15 +14,14 @@ import java.io.File;
 public class LocalMysqlConnectUtil {
     public static Prop PropKit;
 
-    public static void Init(String database_dbName) {
+    public static void Init() {
         //加载配置文件
         String configFile = "application.yaml";
         PropKit = new YamlProp(configFile);
-        if (StrKit.isBlank(database_dbName)) database_dbName = "dataease";
 
         HikariCpPlugin masterPlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
                 PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
-        HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl").replace("ds_db", database_dbName), 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"));
 
         masterPlugin.start();