center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(应用): 修复应用新建自定义数据集可能无效的问题

Browse Source
This commit is contained in:
wangjiahao 2022-11-07 10:09:26 +08:00
parent 2f76a9aece
commit a446ac999b
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2865,4 +2865,8 @@ public class DataSetTableService {
// custom 创建doris视图
createDorisView(TableUtils.tableName(tableId), sql);
}
public void updateDatasetInfo(DatasetTable datasetTable){
datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
}
}

11
backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
View File

@ -159,7 +159,7 @@ public class PanelAppTemplateService {
}
@Transactional(rollbackFor = Exception.class)
public String applyPanel(PanelGroupRequest panelInfo, Map<String, String> chartViewsRealMap, String newPanelId, String panelName, String pid) {
public String applyPanel(PanelGroupRequest panelInfo, Map<String, String> chartViewsRealMap,Map<String,String> datasetsRealMap ,Map<String,String> datasetFieldsRealMap, String newPanelId, String panelName, String pid) {
panelInfo.setId(newPanelId);
panelInfo.setPid(pid);
panelInfo.setName(panelName);
@ -167,6 +167,12 @@ public class PanelAppTemplateService {
panelInfo.setPanelType("self");
panelInfo.setCreateBy(AuthUtils.getUser().getUsername());
panelInfo.setCreateTime(System.currentTimeMillis());
datasetsRealMap.forEach((k, v) -> {
panelInfo.setPanelData(panelInfo.getPanelData().replaceAll(k, v));
});
datasetFieldsRealMap.forEach((k, v) -> {
panelInfo.setPanelData(panelInfo.getPanelData().replaceAll(k, v));
});
panelGroupService.newPanelFromApp(panelInfo, chartViewsRealMap);
return newPanelId;
}
@ -184,6 +190,7 @@ public class PanelAppTemplateService {
datasetRequest.setOptFrom("appApply");
datasetRequest.setSyncType("sync_now");
DatasetTable newDataset = dataSetTableService.save(datasetRequest);
datasetTable.setId(newDataset.getId());
datasetsRealMap.put(oldId, newDataset.getId());
}
return datasetsRealMap;
@ -233,6 +240,8 @@ public class PanelAppTemplateService {
} else if (DatasetType.UNION.name().equalsIgnoreCase(datasetTable.getType())) {
dataSetTableService.createAppUnionDorisView(datasetTable.getInfo(), datasetTable.getId());
}
}else{
dataSetTableService.updateDatasetInfo(datasetTable);
}
}
}

2
backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
View File

@ -873,7 +873,7 @@ public class PanelGroupService {
panelAppTemplateService.applyViewsField(chartViewFieldsInfo,chartViewsRealMap,datasetsRealMap,datasetFieldsRealMap);
panelAppTemplateService.applyPanel(panelInfo,chartViewsRealMap,newPanelId, request.getPanelName(), request.getPanelGroupPid());
panelAppTemplateService.applyPanel(panelInfo,chartViewsRealMap,datasetsRealMap,datasetFieldsRealMap,newPanelId, request.getPanelName(), request.getPanelGroupPid());
panelAppTemplateService.applyPanelView(panelViewsInfo,chartViewsRealMap,newPanelId);