提交 ebe6f306 authored 作者: junjie's avatar junjie

feat(数据集):编辑数据集修改

上级 c839b3cb
...@@ -16,8 +16,7 @@ public class DataSetTableRequest extends DatasetTable { ...@@ -16,8 +16,7 @@ public class DataSetTableRequest extends DatasetTable {
private String sort; private String sort;
private List<String> tableNames; private List<String> tableNames;
private String row = "1000"; private String row = "1000";
private String userId; private String userId;
private Integer editType; private Integer editType;
private Boolean isRename;
} }
...@@ -114,13 +114,26 @@ public class DataSetTableService { ...@@ -114,13 +114,26 @@ public class DataSetTableService {
} }
} else { } else {
int update = datasetTableMapper.updateByPrimaryKeySelective(datasetTable); int update = datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
// sql 更新 if (datasetTable.getIsRename() == null || !datasetTable.getIsRename()) {
// 更新数据和字段
if (update == 1) { if (update == 1) {
if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql") || StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) { if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql") || StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
// 删除所有字段,重新抽象 // 删除所有字段,重新抽象
dataSetTableFieldsService.deleteByTableId(datasetTable.getId()); dataSetTableFieldsService.deleteByTableId(datasetTable.getId());
saveTableField(datasetTable); saveTableField(datasetTable);
} }
if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
if (datasetTable.getEditType() == 0) {
commonThreadPool.addTask(() -> {
extractDataService.extractData(datasetTable.getId(), null, "all_scope", null);
});
} else if (datasetTable.getEditType() == 1) {
commonThreadPool.addTask(() -> {
extractDataService.extractData(datasetTable.getId(), null, "add_scope", null);
});
}
}
}
} }
} }
return datasetTable; return datasetTable;
......
...@@ -395,6 +395,7 @@ export default { ...@@ -395,6 +395,7 @@ export default {
table.mode = parseInt(table.mode) table.mode = parseInt(table.mode)
this.$refs['tableForm'].validate((valid) => { this.$refs['tableForm'].validate((valid) => {
if (valid) { if (valid) {
table.isRename = true
addTable(table).then(response => { addTable(table).then(response => {
this.closeTable() this.closeTable()
this.$message({ this.$message({
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论