2112A-ONE
/
muyu-source
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

09042040:优化资产展示的代码

master
冷调 2024-09-04 20:40:58 +08:00
parent 596f8c673c
commit a60944c925
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
muyu-source-common/src/main/java/com/muyu/source/domain/DataSource.java
View File

@ -216,7 +216,7 @@ public class DataSource extends BaseEntity {
.maxNum(req.getMaxNum())
.maxWaitSize(req.getMaxWaitSize())
.maxWaitTime(req.getMaxWaitTime())
.driverName(req.getDriverName())
.driverName("com.mysql.cj.jdbc.Driver")
.build();
}
@ -226,13 +226,17 @@ public class DataSource extends BaseEntity {
*/
public String getUrl(){
StringBuilder urlSb = new StringBuilder(BaseConfig.MYSQLJDBCPRO);
urlSb.append(this.ip);//拼接ip
//拼接ip
urlSb.append(this.ip);
urlSb.append(":");
urlSb.append(this.port); //拼接端口
//拼接端口
urlSb.append(this.port);
urlSb.append("/");
urlSb.append(this.databaseName);//拼接数据库
//拼接数据库
urlSb.append(this.databaseName);
urlSb.append("?");
urlSb.append(this.connectionParam);//useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
//useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
urlSb.append(this.connectionParam);
return urlSb.toString();
}

38
muyu-source-common/src/main/java/com/muyu/source/pool/config/BaseConfig.java
View File

@ -19,25 +19,25 @@ public class BaseConfig {
public static final String SELECT="select ";
public static final String SELECTALL="select * from ";
public static final String FROM=" from ";
public static final String SELECTFIELD=" SELECT \" +\n" +
" \" COLUMN_NAME , \" +\n" +
" \" COLUMN_COMMENT ,\" +\n" +
" \" CASE WHEN COLUMN_KEY = 'PRI' THEN '是' ELSE '否' END ,\" +\n" +
" \" CASE \\n\" +\n" +
" \" WHEN DATA_TYPE = 'int' THEN 'Integer' \" +\n" +
" \" WHEN DATA_TYPE = 'bigint' THEN 'Long' \" +\n" +
" \" WHEN DATA_TYPE = 'varchar' THEN 'String' \" +\n" +
" \" WHEN DATA_TYPE = 'decimal' THEN 'BigDecimal' \" +\n" +
" \" WHEN DATA_TYPE = 'tinyint' AND COLUMN_TYPE = 'tinyint(1)' THEN 'Boolean'\" +\n" +
" \" ELSE DATA_TYPE \\n\" +\n" +
" \" END , \" +\n" +
" \" DATA_TYPE , \\n\" +\n" +
" \" COLUMN_TYPE , \\n\" +\n" +
" \" CHARACTER_MAXIMUM_LENGTH , \\n\" +\n" +
" \" NUMERIC_SCALE , \\n\" +\n" +
" \" IS_NULLABLE , \\n\" +\n" +
" \" COLUMN_DEFAULT \\n\" +\n" +
" \"FROM INFORMATION_SCHEMA.COLUMNS ";
public static final String SELECTFIELD=" SELECT \" +\n" +
" \" COLUMN_NAME , \" +\n" +
" \" COLUMN_COMMENT ,\" +\n" +
" \" CASE WHEN COLUMN_KEY = 'PRI' THEN '是' ELSE '否' END ,\" +\n" +
" \" CASE \\n\" +\n" +
" \" WHEN DATA_TYPE = 'int' THEN 'Integer' \" +\n" +
" \" WHEN DATA_TYPE = 'bigint' THEN 'Long' \" +\n" +
" \" WHEN DATA_TYPE = 'varchar' THEN 'String' \" +\n" +
" \" WHEN DATA_TYPE = 'decimal' THEN 'BigDecimal' \" +\n" +
" \" WHEN DATA_TYPE = 'tinyint' AND COLUMN_TYPE = 'tinyint(1)' THEN 'Boolean'\" +\n" +
" \" ELSE DATA_TYPE \\n\" +\n" +
" \" END , \" +\n" +
" \" DATA_TYPE , \\n\" +\n" +
" \" COLUMN_TYPE , \\n\" +\n" +
" \" CHARACTER_MAXIMUM_LENGTH , \\n\" +\n" +
" \" NUMERIC_SCALE , \\n\" +\n" +
" \" IS_NULLABLE , \\n\" +\n" +
" \" COLUMN_DEFAULT \\n\" +\n" +
" \"FROM INFORMATION_SCHEMA.COLUMNS ";

8
muyu-source-server/src/main/java/com/muyu/source/service/Impl/DataSourceServiceImpl.java
View File

@ -23,6 +23,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import static com.muyu.source.pool.config.BaseConfig.SELECTALL;
import static com.muyu.source.pool.config.BaseConfig.SELECTFIELD;
/**
* @author Lenovo
@ -244,6 +245,9 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
ExecutorService threadPool = Executors.newCachedThreadPool();
PreparedStatement ps = null;
try {
conn.prepareStatement(SELECTFIELD+"WHERE \n" +
"TABLE_SCHEMA = '" + databaseName + "' \n" +
"AND TABLE_NAME = '" + table.getTableName() + "'");
ps = conn.prepareStatement(" SELECT " +
" COLUMN_NAME , " +
" COLUMN_COMMENT ," +
@ -276,7 +280,7 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
String dataType = String.valueOf(resultSet.getObject(5));
String columnType = String.valueOf(resultSet.getObject(6));
String characterMaximumLength = String.valueOf(resultSet.getInt(7));
String NumericScale = String.valueOf(resultSet.getInt(8));
String numericScale = String.valueOf(resultSet.getInt(8));
String isNullable = String.valueOf(resultSet.getObject(9));
String columnDefault = String.valueOf(resultSet.getObject(10));
@ -288,7 +292,7 @@ public class DataSourceServiceImpl extends ServiceImpl<DataSourceMapper, DataSou
.javaType(end)
.columnType(columnType)
.columnLength(characterMaximumLength)
.columnDecimals(NumericScale)
.columnDecimals(numericScale)
.isNull("YES".equals(isNullable) ? "Y" : "N")
.defaultValue(columnDefault)
.build();