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

fix: 定时报告统一错误提示

Browse Source
This commit is contained in:
fit2cloud-chenyw 2024-03-06 16:35:31 +08:00
parent 99449cb56a
commit ac88bf9fef
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
View File

@ -178,7 +178,10 @@ public class EmailTaskHandler extends TaskHandler implements Job {
@Async("priorityExecutor")
public void sendReport(GlobalTaskInstance taskInstance, SysUserEntity user, Boolean isTempTask) {
if (ObjectUtils.isEmpty(user) || ObjectUtils.isEmpty(user.getEnabled()) || user.getEnabled().equals(0)) {
error(taskInstance, new RuntimeException("任务发起用户不存在或不可用！"));
return;
}
EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
AuthUserServiceImpl userService = SpringContextUtil.getBean(AuthUserServiceImpl.class);
SysUserService sysUserService = SpringContextUtil.getBean(SysUserService.class);

34
core/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
View File

@ -1,14 +1,8 @@
package io.dataease.service.chart;
import com.google.gson.internal.LinkedTreeMap;
import io.dataease.plugins.common.exception.DataEaseException;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.reflect.TypeToken;
import io.dataease.auth.annotation.DePermissionProxy;
import io.dataease.commons.model.excel.ExcelSheetModel;
import io.dataease.commons.utils.ExcelUtils;
@ -18,17 +12,20 @@ import io.dataease.dto.PermissionProxy;
import io.dataease.dto.chart.ChartViewDTO;
import io.dataease.dto.panel.PanelGroupDTO;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.service.panel.PanelGroupService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.io.File;
import java.lang.reflect.Type;
import java.util.*;
import java.util.stream.Collectors;
import com.google.gson.reflect.TypeToken;
@Service
public class ViewExportExcel {
@ -79,7 +76,7 @@ public class ViewExportExcel {
chartExtRequest.setFilter(chartExtFilterRequests);
chartExtRequest.setResultCount((int) resultCount);
chartExtRequest.setResultMode(resultMode);
if(tableInfoViewIds.contains(entry.getKey())){
if (tableInfoViewIds.contains(entry.getKey())) {
chartExtRequest.setGoPage(1L);
chartExtRequest.setPageSize(1000000L);
chartExtRequest.setExcelExportFlag(true);
@ -116,13 +113,14 @@ public class ViewExportExcel {
List<ChartViewFieldDTO> fields = gson.fromJson(gson.toJson(objectFields), fieldTokenType);
List<String> heads = new ArrayList<>();
List<String> headKeys = new ArrayList<>();
fields.forEach(field -> {
if (ObjectUtils.isNotEmpty(field.getName()) && ObjectUtils.isNotEmpty(field.getDataeaseName())) {
heads.add(field.getName());
headKeys.add(field.getDataeaseName());
}
});
if (CollectionUtils.isNotEmpty(fields)) {
fields.forEach(field -> {
if (ObjectUtils.isNotEmpty(field.getName()) && ObjectUtils.isNotEmpty(field.getDataeaseName())) {
heads.add(field.getName());
headKeys.add(field.getDataeaseName());
}
});
}
Object objectTableRow = chart.get("tableRow");
List<Map<String, Object>> tableRow = (List<Map<String, Object>>) objectTableRow;