CodeCow/datax-web
1
0
Fork 0
mirror of https://github.com/WeiYe-Jing/datax-web.git synced 2026-06-27 21:01:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

删除冗余代码 规范代码格式

Browse Source
This commit is contained in:
Administrator 2020-04-15 11:07:57 +08:00
parent 02f3145348
commit 29ea71cdfb
5 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
datax-admin/src/main/java/com/wugui/datax/admin/entity/JobLog.java
View File

@ -59,12 +59,12 @@ public class JobLog {
@ApiModelProperty("DataX进程Id")
private String processId;
private String TASK_START_TIME_SUFFIX ;
private String TASK_END_TIME_SUFFIX ;
private String TASK_TOTAL_TIME_SUFFIX ;
private String TASK_AVERAGE_FLOW_SUFFIX ;
private String TASK_RECORD_WRITING_SPEED_SUFFIX ;
private int TASK_RECORD_READER_NUM_SUFFIX ;
private int TASK_RECORD_WRITING_NUM_SUFFIX ;
private String task_start_time_suffix ;
private String task_end_time_suffix ;
private String task_total_time_suffix ;
private String task_average_flow_suffix ;
private String task_record_writing_speed_suffix ;
private int task_record_reader_num_suffix ;
private int task_record_writing_num_suffix ;
}

17
datax-admin/src/main/java/com/wugui/datax/admin/service/impl/AdminBizImpl.java
View File

@ -134,16 +134,15 @@ public class AdminBizImpl implements AdminBiz {
log.setHandleCode(resultCode);
log.setHandleMsg(handleMsg.toString());
System.out.println( handleMsg.toString());
String[] strs = handleMsg.toString().split(",");
if (strs.length > 0) {
log.setTASK_START_TIME_SUFFIX(strs[0]);
log.setTASK_END_TIME_SUFFIX(strs[1]);
log.setTASK_TOTAL_TIME_SUFFIX(strs[2]);
log.setTASK_AVERAGE_FLOW_SUFFIX(strs[3]);
log.setTASK_RECORD_WRITING_SPEED_SUFFIX(strs[4]);
log.setTASK_RECORD_READER_NUM_SUFFIX(Integer.parseInt(strs[5]));
log.setTASK_RECORD_WRITING_NUM_SUFFIX(Integer.parseInt(strs[6]));
if (strs.length ==7) {
log.setTask_start_time_suffix(strs[0]);
log.setTask_end_time_suffix(strs[1]);
log.setTask_total_time_suffix(strs[2]);
log.setTask_average_flow_suffix(strs[3]);
log.setTask_record_writing_speed_suffix(strs[4]);
log.setTask_record_reader_num_suffix(Integer.parseInt(strs[5]));
log.setTask_record_writing_num_suffix(Integer.parseInt(strs[6]));
}
jobLogMapper.updateHandleInfo(log);
jobInfoMapper.updateLastHandleCode(log.getJobId(), resultCode);

74
datax-admin/src/main/java/com/wugui/datax/admin/tool/query/BaseQueryTool.java
View File

@ -69,8 +69,8 @@ public abstract class BaseQueryTool implements QueryToolInterface {
}
sqlBuilder = DatabaseMetaFactory.getByDbType(jobDatasource.getDatasource());
currentSchema = getSchema(jobDatasource.getJdbcUsername());
ClickHouseConstant.database_name=currentSchema;
currentDatabase=jobDatasource.getDatasource();
ClickHouseConstant.database_name = currentSchema;
currentDatabase = jobDatasource.getDatasource();
LocalCacheUtil.set(jobDatasource.getDatasourceName(), this.connection, 4 * 60 * 60 * 1000);
}
@ -234,47 +234,43 @@ public abstract class BaseQueryTool implements QueryToolInterface {
}
Statement statement = connection.createStatement();
Statement statement = connection.createStatement();
if (currentDatabase.equals(JdbcConstants.MYSQL) || currentDatabase.equals(JdbcConstants.ORACLE)) {
DatabaseMetaData databaseMetaData = connection.getMetaData();
ResultSet resultSet = databaseMetaData.getPrimaryKeys(null, null, tableName);
if(currentDatabase.equals(JdbcConstants.MYSQL) || currentDatabase.equals(JdbcConstants.ORACLE)){
DatabaseMetaData databaseMetaData = connection.getMetaData();
while (resultSet.next()) {
String name = resultSet.getString("COLUMN_NAME");
res.forEach(e -> {
if (e.getColumnName().equals(name)) {
e.setIsprimaryKey(true);
} else {
e.setIsprimaryKey(false);
}
});
}
ResultSet resultSet = databaseMetaData.getPrimaryKeys(null, null, tableName);
while (resultSet.next()) {
String name = resultSet.getString("COLUMN_NAME");
res.forEach(e -> {
if (e.getColumnName().equals(name)) {
e.setIsprimaryKey(true);
} else {
e.setIsprimaryKey(false);
}
});
}
res.forEach(e -> {
String sqlQueryComment = sqlBuilder.getSQLQueryComment(currentSchema, tableName, e.getColumnName());
//查询字段注释
try {
ResultSet resultSetComment = statement.executeQuery(sqlQueryComment);
while (resultSetComment.next()) {
e.setColumnComment(resultSetComment.getString(1));
}
JdbcUtils.close(resultSetComment);
} catch (SQLException e1) {
logger.error("[buildDasColumn executeQuery Exception] --> "
+ "the exception message is:" + e1.getMessage());
}
});
}
res.forEach(e -> {
String sqlQueryComment = sqlBuilder.getSQLQueryComment(currentSchema, tableName, e.getColumnName());
//查询字段注释
try {
ResultSet resultSetComment = statement.executeQuery(sqlQueryComment);
while (resultSetComment.next()) {
e.setColumnComment(resultSetComment.getString(1));
}
JdbcUtils.close(resultSetComment);
} catch (SQLException e1) {
logger.error("[buildDasColumn executeQuery Exception] --> "
+ "the exception message is:" + e1.getMessage());
}
});
}
JdbcUtils.close(statement);
} catch (SQLException e) {
@ -425,10 +421,8 @@ public abstract class BaseQueryTool implements QueryToolInterface {
}
public void execeBuildTableSql(String querySql) {
if(querySql.equals("")){
public void execeBuildTableSql(String querySql) {
if (StringUtils.isBlank(querySql)) {
return;
}

4
datax-admin/src/main/java/com/wugui/datax/admin/util/JSONUtils.java
View File

@ -33,8 +33,8 @@ public class JSONUtils {
JSONObject params = JSONObject.parseObject(keyObj.getString("parameter"));
String dUsername = null, dPassword = null;
if (decrypt.equals(changeType)) { //解密
dUsername = AESUtil.decrypt(AESUtil.decrypt(params.getString("username")));
dPassword = AESUtil.decrypt(AESUtil.decrypt(params.getString("password")));
dUsername = AESUtil.decrypt(params.getString("username"));
dPassword = AESUtil.decrypt(params.getString("password"));
} else if (encrypt.equals(changeType)) {//加密

14
datax-admin/src/main/resources/mybatis-mapper/JobLogMapper.xml
View File

@ -165,13 +165,13 @@
`handle_code`= #{handleCode},
`handle_msg`= #{handleMsg} ,
`TASK_START_TIME_SUFFIX`= #{TASK_START_TIME_SUFFIX} ,
`TASK_END_TIME_SUFFIX`= #{TASK_END_TIME_SUFFIX} ,
`TASK_TOTAL_TIME_SUFFIX`= #{TASK_TOTAL_TIME_SUFFIX} ,
`TASK_AVERAGE_FLOW_SUFFIX`= #{TASK_AVERAGE_FLOW_SUFFIX} ,
`TASK_RECORD_WRITING_SPEED_SUFFIX`= #{TASK_RECORD_WRITING_SPEED_SUFFIX} ,
`TASK_RECORD_READER_NUM_SUFFIX`= #{TASK_RECORD_READER_NUM_SUFFIX} ,
`TASK_RECORD_WRITING_NUM_SUFFIX`= #{TASK_RECORD_WRITING_NUM_SUFFIX}
`TASK_START_TIME_SUFFIX`= #{task_start_time_suffix} ,
`TASK_END_TIME_SUFFIX`= #{task_end_time_suffix} ,
`TASK_TOTAL_TIME_SUFFIX`= #{task_total_time_suffix} ,
`TASK_AVERAGE_FLOW_SUFFIX`= #{task_average_flow_suffix} ,
`TASK_RECORD_WRITING_SPEED_SUFFIX`= #{task_record_writing_speed_suffix} ,
`TASK_RECORD_READER_NUM_SUFFIX`= #{task_record_reader_num_suffix} ,
`TASK_RECORD_WRITING_NUM_SUFFIX`= #{task_record_writing_num_suffix}