manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

--------去掉对es的支持和依赖，默认去掉对hive的包依赖，maven依赖关系优化，页面位置调整，增加build.bat的支持，支持jar直接启动，去掉历史遗留的无用前端代码，依赖的maven包升级--------

Browse Source
This commit is contained in:
暮光：城中城
2021-11-17 22:31:46 +08:00
parent 5bdf1ec0c6
commit 085b76f4b4
200 changed files with 1412 additions and 56618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/SqlParseUtil.java
View File

@@ -226,7 +226,7 @@ public class SqlParseUtil {
if (select.getOracleHierarchical() != null) {
countSql.append(select.getOracleHierarchical().toString());
}
countSql.append(PlainSelect.getFormatedList(select.getGroupByColumnReferences(), "GROUP BY"));
countSql.append(PlainSelect.getFormatedList(select.getGroupBy().getGroupingSets(), "GROUP BY"));
if (select.getHaving() != null) {
countSql.append(" HAVING ").append(select.getHaving());
}

5
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/framework/db/transfer/TransferDataServer.java
View File

@@ -1,6 +1,7 @@
package com.zyplayer.doc.db.framework.db.transfer;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.data.config.security.DocUserDetails;
@@ -103,7 +104,7 @@ public class TransferDataServer {
ThreadPoolUtil.getThreadPool().submit(() -> {
String executeInfo = String.format("[%s] 任务开始执行", DateTime.now().toString());
dbTransferTaskService.addExecuteInfo(taskId, TransferTaskStatus.EXECUTING.getCode(), executeInfo);
String executeId = RandomUtil.simpleUUID();
String executeId = IdUtil.simpleUUID();
taskExecuteMap.put(taskId, executeId);
this.transferData(transferTask, executeId);
});
@@ -188,7 +189,7 @@ public class TransferDataServer {
List<ExecuteParam> executeParamList = SqlParseUtil.getExecuteParamList(storageSql, selectResultList);
for (ExecuteParam executeParam : executeParamList) {
executeParam.setDatasourceId(storageSourceId);
executeParam.setExecuteId(RandomUtil.simpleUUID());
executeParam.setExecuteId(IdUtil.simpleUUID());
sqlExecutor.execute(executeParam);
}
selectResultList.clear();

3
zyplayer-doc-db/src/main/java/com/zyplayer/doc/db/service/database/MysqlServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.zyplayer.doc.db.service.database;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.zyplayer.doc.db.controller.vo.TableDdlVo;
import com.zyplayer.doc.db.framework.db.dto.ColumnInfoDto;
@@ -113,7 +114,7 @@ public class MysqlServiceImpl extends DbBaseService {
// 执行创建SQL
ExecuteParam executeParam = new ExecuteParam();
executeParam.setDatasourceId(sourceId);
executeParam.setExecuteId(RandomUtil.randomUUID());
executeParam.setExecuteId(IdUtil.randomUUID());
executeParam.setExecuteType(ExecuteType.ALL);
executeParam.setSql(procSql);
executeParam.setMaxRows(1000);