diff --git a/src/main/java/net/tccn/base/IpKit.java b/src/main/java/net/tccn/base/IpKit.java index 384c134..0065957 100644 --- a/src/main/java/net/tccn/base/IpKit.java +++ b/src/main/java/net/tccn/base/IpKit.java @@ -34,7 +34,7 @@ public class IpKit { return ""; } if (isV4(startIp, endIp)) { - return v4Count(startIp, endIp) + ""; + return v4Count(startIp, endIp); } else { return v6Count(startIp, endIp); } diff --git a/src/main/java/net/tccn/base/dbq/DbExecutors.java b/src/main/java/net/tccn/base/dbq/DbExecutors.java index ca31451..64647b0 100644 --- a/src/main/java/net/tccn/base/dbq/DbExecutors.java +++ b/src/main/java/net/tccn/base/dbq/DbExecutors.java @@ -29,7 +29,7 @@ public class DbExecutors { DbKit dbKit = MetaKit.getDbKit(mainTable.getDbPlatId(), mainTable.getCatalog()); //System.out.printf("----------------%n countSql:%s%n findSql:%s%n----------------%n", sqls[0], sqls[1]); - CompletableFuture countFuture = CompletableFuture.supplyAsync(() -> dbKit.queryColumn(sqls[0], int.class)); + CompletableFuture countFuture = CompletableFuture.supplyAsync(() -> dbKit.findColumn(sqls[0], int.class)); CompletableFuture> listFuture = CompletableFuture.supplyAsync(() -> dbKit.findList(sqls[1], Map.class)); List rows = listFuture.get(); diff --git a/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java b/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java index 62564af..629f1b8 100644 --- a/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java +++ b/src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java @@ -65,8 +65,8 @@ public class DbKit implements DbSource{ } @Override - public T queryColumn(String sql, Class type) { - return dbSource.queryColumn(sql, type); + public T findColumn(String sql, Class type) { + return dbSource.findColumn(sql, type); } @Override @@ -91,7 +91,7 @@ public class DbKit implements DbSource{ return CompletableFuture.supplyAsync(() -> findList(sql, type)); } public CompletableFuture queryColumnAsync(String sql, Class type) { - return CompletableFuture.supplyAsync(() -> queryColumn(sql, type)); + return CompletableFuture.supplyAsync(() -> findColumn(sql, type)); } public CompletableFuture exetuteAsync(String sql) { return CompletableFuture.runAsync(() -> exetute(sql)); diff --git a/src/main/java/net/tccn/base/dbq/jdbc/api/DbSource.java b/src/main/java/net/tccn/base/dbq/jdbc/api/DbSource.java index 3fc4921..6684bd9 100644 --- a/src/main/java/net/tccn/base/dbq/jdbc/api/DbSource.java +++ b/src/main/java/net/tccn/base/dbq/jdbc/api/DbSource.java @@ -17,7 +17,7 @@ public interface DbSource extends IService { T findFirst(String sql, Class type); - T queryColumn(String sql, Class type); + T findColumn(String sql, Class type); //待实现 default void save(String tableName, T t) {} @@ -26,16 +26,16 @@ public interface DbSource extends IService { default void update(String tableName, T t) {} default int queryInt(String sql) { - return queryColumn(sql, int.class); + return findColumn(sql, int.class); } default long queryLong(String sql) { - return queryColumn(sql, long.class); + return findColumn(sql, long.class); } default double queryDouble(String sql) { - return queryColumn(sql, double.class); + return findColumn(sql, double.class); } default Date queryDate(String sql) { - return queryColumn(sql, Date.class); + return findColumn(sql, Date.class); } void createTable(String sql); diff --git a/src/main/java/net/tccn/base/dbq/jdbc/api/DbSourceMysql.java b/src/main/java/net/tccn/base/dbq/jdbc/api/DbSourceMysql.java index ea3e038..a214eb2 100644 --- a/src/main/java/net/tccn/base/dbq/jdbc/api/DbSourceMysql.java +++ b/src/main/java/net/tccn/base/dbq/jdbc/api/DbSourceMysql.java @@ -42,6 +42,7 @@ public class DbSourceMysql implements DbSource { this.dbAccount = dbAccount; this.accountKey = dbAccount.accountKey(); } + public DbSourceMysql(DbAccount dbAccount, String catalog) { this.dbAccount = dbAccount; this.catalog = catalog; @@ -57,8 +58,9 @@ public class DbSourceMysql implements DbSource { public List findList(String sql, Class type) { Connection connection = connection(); try ( - PreparedStatement ps = connection.prepareStatement(sql); - ResultSet rs = ps.executeQuery()) { + PreparedStatement ps = connection.prepareStatement(sql); + ResultSet rs = ps.executeQuery() + ) { List list = new ArrayList(); ResultSetMetaData metaData = rs.getMetaData(); int count = metaData.getColumnCount(); @@ -72,12 +74,12 @@ public class DbSourceMysql implements DbSource { if (rs.getObject(i) != null) { switch (columnTypeName) { - case "DATETIME": - case "TIMESTAMP": - case "DATE": - row.put(columnLabel, rs.getTimestamp(i).getTime()); break; - default: + case "DATETIME", "TIMESTAMP", "DATE" -> { + row.put(columnLabel, rs.getTimestamp(i).getTime()); + } + default -> { row.put(columnLabel, rs.getObject(i)); + } } } } @@ -86,7 +88,7 @@ public class DbSourceMysql implements DbSource { return list; } catch (SQLException e) { - System.out.println("sql :"+ sql); + System.out.println("sql :" + sql); e.printStackTrace(); return null; } finally { @@ -101,7 +103,7 @@ public class DbSourceMysql implements DbSource { } @Override - public T queryColumn(String sql, Class type) { + public T findColumn(String sql, Class type) { Connection connection = connection(); try ( PreparedStatement ps = connection.prepareStatement(sql); @@ -119,7 +121,8 @@ public class DbSourceMysql implements DbSource { case "DATETIME": case "TIMESTAMP": case "DATE": - v = rs.getTimestamp(i).getTime(); break; + v = rs.getTimestamp(i).getTime(); + break; default: v = rs.getObject(i); } @@ -138,12 +141,12 @@ public class DbSourceMysql implements DbSource { @Override public void createTable(String sql) { - new RuntimeException("DbSourceMysql.createTable NOT SUPPORT right now" ); // todo: + new RuntimeException("DbSourceMysql.createTable NOT SUPPORT right now"); // todo: } @Override public void dropTable(String tableName) { - new RuntimeException("[DbSourceMysql.dropTable] NOT SUPPORT right now" ); // todo: + new RuntimeException("[DbSourceMysql.dropTable] NOT SUPPORT right now"); // todo: } @Override @@ -151,7 +154,7 @@ public class DbSourceMysql implements DbSource { Connection connection = connection(); try ( PreparedStatement ps = connection.prepareStatement(sql); - ){ + ) { ps.execute(); //ps.executeUpdate(); } catch (SQLException e) { @@ -173,6 +176,7 @@ public class DbSourceMysql implements DbSource { } return connection; } + private Connection connection(int n) { LinkedBlockingQueue queue = conns.getOrDefault(accountKey, new LinkedBlockingQueue<>(15)); @@ -211,6 +215,7 @@ public class DbSourceMysql implements DbSource { conns.put(accountKey, queue); return conn; } + private void release(Connection connection) { LinkedBlockingQueue queue = conns.getOrDefault(accountKey, new LinkedBlockingQueue<>(15)); try { diff --git a/src/test/java/RunTest.java b/src/test/java/RunTest.java index 45928db..57e915e 100644 --- a/src/test/java/RunTest.java +++ b/src/test/java/RunTest.java @@ -372,7 +372,7 @@ public class RunTest { // find list List list = dbKit.findList(sql, Map.class); - int total = dbKit.queryColumn(countSql, int.class); + int total = dbKit.findColumn(countSql, int.class); System.out.println("总记录数:" + total); System.out.println(list);