dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复存在未完成的视图导出 Excel 任务会导致de 无法启动

Browse Source
This commit is contained in:
taojinlong 2024-06-21 17:36:14 +08:00
parent e3b657bac5
commit 452e545957
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java
View File

@ -2,6 +2,7 @@ package io.dataease.service.exportCenter;
import com.google.gson.Gson; import com.google.gson.Gson;
import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.auth.service.AuthUserService;
import io.dataease.commons.constants.ParamConstants; import io.dataease.commons.constants.ParamConstants;
import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.*; import io.dataease.commons.utils.*;
@ -124,7 +125,8 @@ public class ExportCenterService {
private int corePoolSize = 10; private int corePoolSize = 10;
private int keepAliveSeconds = 600; private int keepAliveSeconds = 600;
private Map<String, Future> Running_Task = new HashMap<>(); private Map<String, Future> Running_Task = new HashMap<>();
@Resource
private AuthUserService authUserService;
@Autowired @Autowired
private WsService wsService; private WsService wsService;
@ -394,11 +396,10 @@ public class ExportCenterService {
} }
private void startViewTask(ExportTask exportTask, PanelViewDetailsRequest request) { private void startViewTask(ExportTask exportTask, PanelViewDetailsRequest request) {
String dataPath = exportData_path + exportTask.getId(); String dataPath = exportData_path + exportTask.getId();
File directory = new File(dataPath); File directory = new File(dataPath);
boolean isCreated = directory.mkdir(); boolean isCreated = directory.mkdir();
CurrentUserDto currentUserDto = AuthUtils.getUser(); CurrentUserDto currentUserDto = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId());
Future future = scheduledThreadPoolExecutor.submit(() -> { Future future = scheduledThreadPoolExecutor.submit(() -> {
AuthUtils.setUser(currentUserDto); AuthUtils.setUser(currentUserDto);
try { try {
@ -597,7 +598,9 @@ public class ExportCenterService {
String dataPath = exportData_path + exportTask.getId(); String dataPath = exportData_path + exportTask.getId();
File directory = new File(dataPath); File directory = new File(dataPath);
boolean isCreated = directory.mkdir(); boolean isCreated = directory.mkdir();
CurrentUserDto user = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId());
Future future = scheduledThreadPoolExecutor.submit(() -> { Future future = scheduledThreadPoolExecutor.submit(() -> {
AuthUtils.setUser(user);
try { try {
exportTask.setExportStatus("IN_PROGRESS"); exportTask.setExportStatus("IN_PROGRESS");
exportTaskMapper.updateByPrimaryKey(exportTask); exportTaskMapper.updateByPrimaryKey(exportTask);