From c2c1fdf7cafdbdb4a0431c7fce555f44199a245d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 1 Nov 2022 16:26:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0):?= =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E9=9B=86=E8=AF=A6=E6=83=85-=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=9F=A5=E7=9C=8B=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/DataSetTableTaskController.java | 7 ++++++- frontend/src/views/dataset/data/UpdateInfo.vue | 11 +++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) 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 90b7bf6c6e..a4a36265ee 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -67,7 +67,12 @@ public class DataSetTableTaskController { @PostMapping("list/{goPage}/{pageSize}") public Pager> list(@RequestBody DatasetTableTask datasetTableTask, @PathVariable int goPage, @PathVariable int pageSize) { Page page = PageHelper.startPage(goPage, pageSize, true); - return PageUtils.setPageInfo(page, dataSetTableTaskService.list(datasetTableTask)); + Pager> listPager = PageUtils.setPageInfo(page, dataSetTableTaskService.list(datasetTableTask)); + List listObject = listPager.getListObject(); + for (DataSetTaskDTO dto : listObject) { + dataSetTableTaskLogService.lastExecStatus(dto); + } + return listPager; } @ApiOperation("分页查询") diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index c9d90257ce..b51c4da2f2 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/frontend/src/views/dataset/data/UpdateInfo.vue @@ -66,8 +66,15 @@ v-if="scope.row.lastExecStatus" :class="[`de-${scope.row.lastExecStatus}-pre`, 'de-status']" >{{ - $t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`) - }} + $t(`dataset.${scope.row.lastExecStatus.toLocaleLowerCase()}`) + }} + - From 9b37a875d842f4af45d76f2b794832af04888069 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 1 Nov 2022 22:52:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=20sqlserver=20=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/datasource/JdbcProvider.java | 65 ++++++++++--------- .../service/dataset/DataSetTableService.java | 2 +- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index ea5b3a204e..beb65cab8a 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -89,8 +89,8 @@ public class JdbcProvider extends DefaultJdbcProvider { } DatabaseMetaData databaseMetaData = connection.getMetaData(); String tableNamePattern = datasourceRequest.getTable(); - if(datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mysql.name())){ - if(databaseMetaData.getDriverMajorVersion() < 8){ + if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mysql.name())) { + if (databaseMetaData.getDriverMajorVersion() < 8) { tableNamePattern = String.format(MySQLConstants.KEYWORD_TABLE, tableNamePattern); } } @@ -98,29 +98,36 @@ public class JdbcProvider extends DefaultJdbcProvider { while (resultSet.next()) { String tableName = resultSet.getString("TABLE_NAME"); String database; - if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name()) ||datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.impala.name())) { + String schema = resultSet.getString("TABLE_SCHEM"); + if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name()) + || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.impala.name())) { database = resultSet.getString("TABLE_SCHEM"); } else { database = resultSet.getString("TABLE_CAT"); } - if(datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name())){ - if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDsSchema(datasourceRequest))) { - TableField tableField = getTableFiled(resultSet, datasourceRequest); - list.add(tableField); - } - }else { - if (database != null) { - if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) { - TableField tableField = getTableFiled(resultSet, datasourceRequest); - list.add(tableField); - } - } else { - if (tableName.equals(datasourceRequest.getTable())) { - TableField tableField = getTableFiled(resultSet, datasourceRequest); - list.add(tableField); - } - } - } + if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name())) { + if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDsSchema(datasourceRequest))) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + } else if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())) { + if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest)) && schema.equalsIgnoreCase(getDsSchema(datasourceRequest))) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + } else { + if (database != null) { + if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + } else { + if (tableName.equals(datasourceRequest.getTable())) { + TableField tableField = getTableFiled(resultSet, datasourceRequest); + list.add(tableField); + } + } + } } resultSet.close(); @@ -165,9 +172,9 @@ public class JdbcProvider extends DefaultJdbcProvider { } else { String size = resultSet.getString("COLUMN_SIZE"); if (size == null) { - if(dbType.equals("JSON") && datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mysql.name())){ + if (dbType.equals("JSON") && datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mysql.name())) { tableField.setFieldSize(65535); - }else { + } else { tableField.setFieldSize(1); } @@ -176,7 +183,7 @@ public class JdbcProvider extends DefaultJdbcProvider { } } } - if(StringUtils.isNotEmpty(tableField.getFieldType()) && tableField.getFieldType().equalsIgnoreCase("DECIMAL")){ + if (StringUtils.isNotEmpty(tableField.getFieldType()) && tableField.getFieldType().equalsIgnoreCase("DECIMAL")) { tableField.setAccuracy(Integer.valueOf(resultSet.getString("DECIMAL_DIGITS"))); } return tableField; @@ -746,16 +753,16 @@ public class JdbcProvider extends DefaultJdbcProvider { } @Override - public void checkConfiguration(Datasource datasource)throws Exception{ - if (StringUtils.isEmpty(datasource.getConfiguration())){ + public void checkConfiguration(Datasource datasource) throws Exception { + if (StringUtils.isEmpty(datasource.getConfiguration())) { throw new Exception("Datasource configuration is empty"); } try { JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasource.getConfiguration(), JdbcConfiguration.class); - if(jdbcConfiguration.getQueryTimeout() < 0){ - throw new Exception("Querytimeout cannot be less than zero." ); + if (jdbcConfiguration.getQueryTimeout() < 0) { + throw new Exception("Querytimeout cannot be less than zero."); } - }catch (Exception e){ + } catch (Exception e) { throw new Exception("Invalid configuration: " + e.getMessage()); } diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 82953e556d..9f5ffd29cc 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -170,7 +170,7 @@ public class DataSetTableService { datasetTableTask.setTableId(datasetTable.getId()); datasetTableTask.setRate(ScheduleType.SIMPLE.toString()); datasetTableTask.setType("all_scope"); - datasetTableTask.setName(datasetTable.getName() + " 更新设置"); + datasetTableTask.setName(datasetTable.getName() + " 更新设置-" + System.currentTimeMillis()); datasetTableTask.setEnd("0"); datasetTableTask.setStatus(TaskStatus.Underway.name()); datasetTableTask.setStartTime(System.currentTimeMillis()); From 0b11b835a094c7b12827ab8ac09e5f4af4809403 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 2 Nov 2022 10:56:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?revert(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=E6=8E=89=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=8C=87=E5=AE=9A=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/FieldEdit.vue | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index 51520f9b31..a666b0e68f 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -211,16 +211,16 @@ /> - + + + + + + + + + + - + + + + + + + + + +