lxy/meta-kit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改方法名

Browse Source
This commit is contained in:
lxy
2020-08-07 09:19:38 +08:00
parent 68eea7b27d
commit b78a482d3b
6 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/tccn/base/IpKit.java
View File

@@ -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);
}

2
src/main/java/net/tccn/base/dbq/DbExecutors.java
View File

@@ -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<Integer> countFuture = CompletableFuture.supplyAsync(() -> dbKit.queryColumn(sqls[0], int.class));
CompletableFuture<Integer> countFuture = CompletableFuture.supplyAsync(() -> dbKit.findColumn(sqls[0], int.class));
CompletableFuture<List<Map>> listFuture = CompletableFuture.supplyAsync(() -> dbKit.findList(sqls[1], Map.class));
List<Map> rows = listFuture.get();

6
src/main/java/net/tccn/base/dbq/jdbc/api/DbKit.java
View File

@@ -65,8 +65,8 @@ public class DbKit implements DbSource{
}
@Override
public <T> T queryColumn(String sql, Class<T> type) {
return dbSource.queryColumn(sql, type);
public <T> T findColumn(String sql, Class<T> type) {
return dbSource.findColumn(sql, type);
}
@Override
@@ -91,7 +91,7 @@ public class DbKit implements DbSource{
return CompletableFuture.supplyAsync(() -> findList(sql, type));
}
public <T> CompletableFuture<T> queryColumnAsync(String sql, Class<T> type) {
return CompletableFuture.supplyAsync(() -> queryColumn(sql, type));
return CompletableFuture.supplyAsync(() -> findColumn(sql, type));
}
public CompletableFuture<Void> exetuteAsync(String sql) {
return CompletableFuture.runAsync(() -> exetute(sql));

10
src/main/java/net/tccn/base/dbq/jdbc/api/DbSource.java
View File

@@ -17,7 +17,7 @@ public interface DbSource extends IService {
<T> T findFirst(String sql, Class<T> type);
<T> T queryColumn(String sql, Class<T> type);
<T> T findColumn(String sql, Class<T> type);
//待实现
default <T> void save(String tableName, T t) {}
@@ -26,16 +26,16 @@ public interface DbSource extends IService {
default <T> 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);

31
src/main/java/net/tccn/base/dbq/jdbc/api/DbSourceMysql.java
View File

@@ -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 <T> List<T> findList(String sql, Class<T> 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> T queryColumn(String sql, Class<T> type) {
public <T> T findColumn(String sql, Class<T> 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<Connection> 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<Connection> queue = conns.getOrDefault(accountKey, new LinkedBlockingQueue<>(15));
try {

2
src/test/java/RunTest.java
View File

@@ -372,7 +372,7 @@ public class RunTest<T> {
// find list
List<Map> 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);