mirror of
https://github.com/dataease/dataease.git
synced 2026-05-15 05:22:13 +08:00
fix:【操作日志】新增操作类型为【导出视图】和【下载】
This commit is contained in:
@@ -308,7 +308,7 @@ public class ChartDataServer implements ChartDataApi {
|
||||
DEException.throwException(e);
|
||||
}
|
||||
} else {
|
||||
exportCenterManage.addTask(request.getViewId(), "chart", request);
|
||||
exportCenterManage.addTask(request.getViewId(), "chart", request, request.getBusiFlag());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -169,7 +169,7 @@ public class ExportCenterDownLoadManage {
|
||||
}
|
||||
}
|
||||
|
||||
@DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.DRIVER_FILE)
|
||||
@DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.DATA_FILLING)
|
||||
public void startDataFillingTask(CoreExportTask exportTask, HashMap<String, Object> request) {
|
||||
if (ObjectUtils.isEmpty(getDataFillingApi())) {
|
||||
return;
|
||||
@@ -412,7 +412,17 @@ public class ExportCenterDownLoadManage {
|
||||
Running_Task.put(exportTask.getId(), future);
|
||||
}
|
||||
|
||||
@DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.VIEW)
|
||||
@DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.PANEL)
|
||||
public void startPanelViewTask(CoreExportTask exportTask, ChartExcelRequest request) {
|
||||
startViewTask(exportTask, request);
|
||||
}
|
||||
|
||||
@DeLog(id = "#p0.exportFrom", ot = LogOT.EXPORT, st = LogST.SCREEN)
|
||||
public void startDataVViewTask(CoreExportTask exportTask, ChartExcelRequest request) {
|
||||
startViewTask(exportTask, request);
|
||||
}
|
||||
|
||||
|
||||
public void startViewTask(CoreExportTask exportTask, ChartExcelRequest request) {
|
||||
String dataPath = exportData_path + exportTask.getId();
|
||||
File directory = new File(dataPath);
|
||||
|
||||
@@ -246,7 +246,7 @@ public class ExportCenterManage implements BaseExportApi {
|
||||
return hostname;
|
||||
}
|
||||
|
||||
public void addTask(String exportFrom, String exportFromType, ChartExcelRequest request) {
|
||||
public void addTask(String exportFrom, String exportFromType, ChartExcelRequest request, String busiFlag) {
|
||||
CoreExportTask exportTask = new CoreExportTask();
|
||||
exportTask.setId(IDUtils.snowID().toString());
|
||||
exportTask.setUserId(AuthUtils.getUser().getUserId());
|
||||
@@ -259,7 +259,12 @@ public class ExportCenterManage implements BaseExportApi {
|
||||
exportTask.setParams(JsonUtil.toJSONString(request).toString());
|
||||
exportTask.setExportMachineName(hostName());
|
||||
exportTaskMapper.insert(exportTask);
|
||||
exportCenterDownLoadManage.startViewTask(exportTask, request);
|
||||
if(busiFlag.equalsIgnoreCase("dashboard")){
|
||||
exportCenterDownLoadManage.startPanelViewTask(exportTask, request);
|
||||
}else {
|
||||
exportCenterDownLoadManage.startDataVViewTask(exportTask, request);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void addTask(Long exportFrom, String exportFromType, DataSetExportRequest request) throws Exception {
|
||||
@@ -338,6 +343,7 @@ public class ExportCenterManage implements BaseExportApi {
|
||||
downLoadInfos.add(downLoadInfo);
|
||||
}
|
||||
}
|
||||
|
||||
private List<DownLoadInfo> downLoadInfos = new ArrayList<>();
|
||||
|
||||
@Scheduled(fixedRate = 10 * 1000)
|
||||
|
||||
@@ -76,8 +76,8 @@ public interface InteractiveAuthApi {
|
||||
@PostMapping("/queryAuth/{id}")
|
||||
PermissionValVO queryAuth(@PathVariable("id") Long id);
|
||||
|
||||
@GetMapping("/query2Root/{id}/{flag}")
|
||||
List<ResourceNodeVO> query2Root(@PathVariable("id") Long id, @PathVariable("flag") Integer flag);
|
||||
@GetMapping("/query2Root/{id}/{flag}/{logOT}")
|
||||
List<ResourceNodeVO> query2Root(@PathVariable("id") Long id, @PathVariable("flag") Integer flag, Integer logOT);
|
||||
|
||||
@GetMapping("/checkEmpty")
|
||||
boolean checkEmpty();
|
||||
|
||||
Reference in New Issue
Block a user