'commit'

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

@@ -1,9 +1,7 @@
 package com.dsideal.base.Tools;
 
 import com.dsideal.base.DataEase.Model.DataEaseModel;
-import com.dsideal.base.Plugin.YamlProp;
 import com.dsideal.base.Util.SSHConnector;
-import com.jfinal.kit.Prop;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
@@ -12,47 +10,33 @@ import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import com.jcraft.jsch.Channel;
+
-import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.Session;
 
 public class SelectNoXzqh {
 
     public static void main(String[] args) throws IOException {
-
+        //远程主机的SSH登录信息
         String sshHost = "117.78.60.214";
         int sshPort = 52025;
         String sshUser = "root";
         String sshPassword = "DsIdeal@123";
         String mysqlHost = "127.0.0.1"; // MySQL server host
         int mysqlPort = 3306; // MySQL server port
-
         Session session = SSHConnector.createSSHSession(sshHost, sshPort, sshUser, sshPassword);
         try {
-            // Set up port forwarding
             int localPort = 33306; // Local port to forward to MySQL server
             session.setPortForwardingL(localPort, mysqlHost, mysqlPort);
+            String jdbcUrl = "jdbc:mysql://localhost:" + localPort + "/ds_db";
 
-            // Now you can connect to MySQL using the local port
+            String user = "root";
-            String url = "jdbc:mysql://localhost:" + localPort + "/ds_db";
+            String password = "Password123@mysql";
-            // Use this URL to connect to your MySQL database using JDBC
+            String driverClassName = "com.mysql.cj.jdbc.Driver";
-            // For example, with DriverManager.getConnection(url, username, password);
 
-            session.disconnect();
+            HikariCpPlugin masterPlugin = new HikariCpPlugin(jdbcUrl, user, password, driverClassName);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        /*
-        //加载配置文件
-        String configFile = "application_huawei.yaml";
-        Prop PropKit = new YamlProp(configFile);
-        HikariCpPlugin masterPlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl"), PropKit.get("mysql.user"),
-                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
             masterPlugin.start();
 
-        HikariCpPlugin dataEasePlugin = new HikariCpPlugin(PropKit.get("mysql.jdbcUrl").replace("ds_db", DataEaseModel.DB_NAME), PropKit.get("mysql.user"),
+            HikariCpPlugin dataEasePlugin = new HikariCpPlugin(jdbcUrl.replace("ds_db", DataEaseModel.DB_NAME), user, password, driverClassName);
-                PropKit.get("mysql.password").trim(), PropKit.get("mysql.driverClassName"));
             dataEasePlugin.start();
 
             // 配置ActiveRecord插件
@@ -79,8 +63,8 @@ public class SelectNoXzqh {
 
             DataEaseModel dm = new DataEaseModel();
 
-        //遍历所有的非省级管理员的，以excel_开头的表，找出这些表中是不是存在行政区划的列名
+            //遍历所有以excel_开头的表，找出这些表中是不是存在行政区划,上级行政区划的列名
-        for (int identity_id : new int[]{2, 3}) {
+            for (int identity_id : new int[]{1, 2, 3}) {
                 List<Record> list = dm.getDataSetByIdentityId(identity_id);
                 //开始检查
                 for (Record record : list) {
@@ -89,16 +73,21 @@ public class SelectNoXzqh {
 
                     //这张表中存在行政区划的列名，就跳过，不处理
                     if (dm.hasNoColumnName(tableName, "行政区划")) {
-                    System.out.println((identity_id == 2 ? "【市州】" : "【县区】") + dataSetName + "表：" + tableName + "没有行政区划的列名，请手动添加");
+                        //System.out.println((identity_id == 2 ? "【市州】" : "【县区】") + dataSetName + "表：" + tableName + "没有行政区划的列名，请手动添加");
                         dm.addColumn(tableName, "行政区划");
                     }
                     //这张表中存在上级行政区划的列名，就跳过，不处理
                     if (dm.hasNoColumnName(tableName, "上级行政区划")) {
-                    System.out.println((identity_id == 2 ? "【市州】" : "【县区】") + dataSetName + "表：" + tableName + "没有行政区划的列名，请手动添加");
+                        //System.out.println((identity_id == 2 ? "【市州】" : "【县区】") + dataSetName + "表：" + tableName + "没有行政区划的列名，请手动添加");
                         dm.addColumn(tableName, "上级行政区划");
                     }
                 }
             }
-        System.out.println("恭喜，所有数据处理完毕。");*/
+            System.out.println("恭喜，所有数据处理完毕。");
+
+            session.disconnect();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }