diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java index 423b23201d..54a75269dc 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java @@ -1,6 +1,5 @@ package io.dataease.base.mapper.ext; -import io.dataease.base.domain.DatasetTableTaskLog; import io.dataease.base.mapper.ext.query.GridExample; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO; diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index 391dc78a2e..8de2a81f80 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -7,7 +7,6 @@ import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.request.dataset.DataSetTaskRequest; import io.dataease.controller.sys.base.BaseGridRequest; -import io.dataease.controller.sys.response.SysUserGridResponse; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.service.dataset.DataSetTableTaskLogService; import io.dataease.service.dataset.DataSetTableTaskService; diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index 6d93e4d8b3..f01135a926 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -185,7 +185,7 @@ public class DorisQueryProvider extends QueryProvider { // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); // 处理横轴过滤 - xWheres.addAll(getXWheres(x, originField, fieldAlias)); +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index 7a3e858797..c987623e1d 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -175,7 +175,7 @@ public class MysqlQueryProvider extends QueryProvider { // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); // 处理横轴过滤 - xWheres.addAll(getXWheres(x, originField, fieldAlias)); +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 1ea83f57a8..b24b3ba44a 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -209,7 +209,7 @@ public class OracleQueryProvider extends QueryProvider { // 处理横轴字段 xFields.add(getXFields(x, originField, fieldAlias)); // 处理横轴过滤 - xWheres.addAll(getXWheres(x, originField, fieldAlias)); +// xWheres.addAll(getXWheres(x, originField, fieldAlias)); // 处理横轴排序 if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) { xOrders.add(SQLObj.builder() diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 3b4b6efdef..e49ee0bfa4 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -6,7 +6,6 @@ import io.dataease.base.mapper.DatasetTableMapper; import io.dataease.base.mapper.DatasetTableTaskMapper; import io.dataease.base.mapper.DatasourceMapper; import io.dataease.base.mapper.ext.ExtChartViewMapper; -import io.dataease.base.mapper.ext.UtilMapper; import io.dataease.commons.constants.*; import io.dataease.commons.model.AuthURD; import io.dataease.commons.utils.*; @@ -90,8 +89,6 @@ public class ExtractDataService { private DatasourceService datasourceService; @Resource private ExtChartViewMapper extChartViewMapper; - @Resource - private UtilMapper utilMapper; private static String lastUpdateTime = "${__last_update_time__}"; private static String currentUpdateTime = "${__current_update_time__}"; @@ -270,6 +267,9 @@ public class ExtractDataService { }); String dorisTablColumnSql = createDorisTablColumnSql(datasetTableFields); + boolean msg = false; + JobStatus jobStatus = JobStatus.Completed; + Long execTime = null; switch (updateType) { case all_scope: // 全量更新 try { @@ -284,29 +284,22 @@ public class ExtractDataService { } else { generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()))); } - Long execTime = System.currentTimeMillis(); + execTime = System.currentTimeMillis(); extractData(datasetTable, "all_scope"); replaceTable(DorisTableUtils.dorisName(datasetTableId)); saveSucessLog(datasetTableTaskLog); - - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, true); - - deleteFile("all_scope", datasetTableId); - - updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed); - + msg = true; + jobStatus = JobStatus.Completed; } catch (Exception e) { saveErrorLog(datasetTableId, taskId, e); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error); - - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,false); - updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); - dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); - deleteFile("all_scope", datasetTableId); + msg = false; + jobStatus = JobStatus.Error; } finally { + try { deleteFile("all_scope", datasetTableId); }catch (Exception ignore){} + try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){} + try { dataSetTableTaskService.updateTaskStatus(datasetTableTask, jobStatus); }catch (Exception ignore){} + try { updateTableStatus(datasetTableId, datasetTable, jobStatus, execTime); }catch (Exception ignore){} + try { dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); }catch (Exception ignore){} } break; @@ -326,7 +319,7 @@ public class ExtractDataService { if (datasetTableTask == null ) { datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, taskId); } - Long execTime = System.currentTimeMillis(); + execTime = System.currentTimeMillis(); if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加 String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString()) .replace(currentUpdateTime, Long.valueOf(System.currentTimeMillis()).toString()); @@ -344,24 +337,17 @@ public class ExtractDataService { } saveSucessLog(datasetTableTaskLog); - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,true); - - deleteFile("incremental_add", datasetTableId); - deleteFile("incremental_delete", datasetTableId); - - updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed); + msg = true; + jobStatus = JobStatus.Completed; } catch (Exception e) { saveErrorLog(datasetTableId, taskId, e); - sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog,false); - updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null); - - dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error); - - deleteFile("incremental_add", datasetTableId); - deleteFile("incremental_delete", datasetTableId); + msg = false; + jobStatus = JobStatus.Error; } finally { + try { deleteFile("incremental_add", datasetTableId); deleteFile("incremental_delete", datasetTableId); }catch (Exception ignore){} + try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){} + try { dataSetTableTaskService.updateTaskStatus(datasetTableTask, jobStatus); }catch (Exception ignore){} + try { updateTableStatus(datasetTableId, datasetTable, jobStatus, execTime); }catch (Exception ignore){} } break; } @@ -868,13 +854,18 @@ public class ExtractDataService { textFileOutputMeta.setExtension(extention); if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) { - TextFileField[] outputFields = new TextFileField[datasetTableFields.size()]; + TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1]; for(int i=0;i< datasetTableFields.size();i++){ TextFileField textFileField = new TextFileField(); textFileField.setName(datasetTableFields.get(i).getOriginName()); textFileField.setType("String"); outputFields[i] = textFileField; } + TextFileField textFileField = new TextFileField(); + textFileField.setName("dataease_uuid"); + textFileField.setType("String"); + outputFields[datasetTableFields.size()] = textFileField; + textFileOutputMeta.setOutputFields(outputFields); }else { textFileOutputMeta.setOutputFields(new TextFileField[0]); diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index 28e25ee900..bf4542347d 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -274,10 +274,12 @@ public class SysMsgService { @Cacheable(value = SysMsgConstants.SYS_MSG_USER_SUBSCRIBE, key = "#userId") public List subscribes(Long userId) { SysMsgSettingExample example = new SysMsgSettingExample(); - example.createCriteria().andUserIdEqualTo(userId).andEnableEqualTo(true); + /*example.createCriteria().andUserIdEqualTo(userId).andEnableEqualTo(true);*/ + example.createCriteria().andUserIdEqualTo(userId); List sysMsgSettings = sysMsgSettingMapper.selectByExample(example); // 添加默认订阅 sysMsgSettings = addDefault(sysMsgSettings); + sysMsgSettings = sysMsgSettings.stream().filter(SysMsgSetting::getEnable).collect(Collectors.toList()); // sysMsgSettings.addAll(defaultSettings()); List resultLists = sysMsgSettings.stream().map(item -> { SubscribeNode subscribeNode = new SubscribeNode(); diff --git a/backend/src/main/resources/db/migration/V16__update_chart_filter.sql b/backend/src/main/resources/db/migration/V16__update_chart_filter.sql new file mode 100644 index 0000000000..05600e6900 --- /dev/null +++ b/backend/src/main/resources/db/migration/V16__update_chart_filter.sql @@ -0,0 +1 @@ +UPDATE `chart_view` SET `custom_filter` = '[]'; \ No newline at end of file diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index 7d5f866d4f..f39727594b 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -138,6 +138,7 @@ export default { methods: { close() { + this.clearCanvas() this.$emit('close-left-panel') this.$nextTick(() => { bus.$emit('PanelSwitchComponent', { name: 'PanelMain' }) diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index 64031a1c50..f3bcac3f3e 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -249,10 +249,8 @@ export default { this.table = {} this.checkedList = [] this.unionData = [] - this.height = 500 this.data = [] this.fields = [] - this.customType = ['db', 'sql', 'excel'] } } diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index c7aee57a3e..b777f543ba 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -270,7 +270,7 @@ export default { type: 'excel', mode: parseInt(this.mode), // info: '{"data":"' + this.path + '"}', - info: JSON.stringify({ data: this.path }), + info: JSON.stringify({ data: this.path, sheets: [this.sheets[0]] }), editType: this.param.editType ? this.param.editType : 0 } } diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index 4cb93f2393..d6b19279a7 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -307,16 +307,12 @@ export default { resetComponent() { this.dataSource = '' - this.options = [] this.name = '' this.sql = '' this.data = [] this.fields = [] this.mode = '0' this.syncType = 'sync_now' - this.height = 500 - this.kettleRunning = false - this.$refs.plxTable.reloadData(this.data) } } } diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index b42a0dfeb3..0fce9646b3 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -1,7 +1,7 @@