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

Merge pull request #7950 from dataease/dev

Browse Source 
merge v1.18.15
This commit is contained in:
fit2cloudrd 2024-01-31 17:48:34 +08:00 committed by GitHub
commit 97322dabc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
195 changed files with 4475 additions and 1801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.typos.toml
View File

@ -7,6 +7,9 @@ ba = "ba"
referer = "referer"
keynode = "keynode"
SCHEM = "SCHEM"
wheres = "wheres"
Wheres = "Wheres"
Parenthesed = "Parenthesed"
[files]
extend-exclude = [

4
core/backend/pom.xml
View File

@ -98,7 +98,7 @@
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.3.1</version>
<version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>jsqlparser</artifactId>
@ -109,7 +109,7 @@
<dependency>
<groupId>com.github.jsqlparser</groupId>
<artifactId>jsqlparser</artifactId>
<version>4.6</version>
<version>4.8</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>

6
core/backend/src/main/java/io/dataease/auth/aop/DeRateLimiterHandler.java
View File

@ -1,10 +1,10 @@
package io.dataease.auth.aop;
import cn.hutool.core.util.StrUtil;
import io.dataease.auth.annotation.DeRateLimiter;
import io.dataease.auth.service.DeLimitService;
import io.dataease.commons.utils.IPUtils;
import io.dataease.commons.utils.ServletUtils;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@ -34,8 +34,8 @@ public class DeRateLimiterHandler {
DeRateLimiter rateLimiter = AnnotationUtils.findAnnotation(method, DeRateLimiter.class);
if (rateLimiter != null) {
String key = rateLimiter.key();
if (StrUtil.isBlank(key)) {
key = method.getDeclaringClass().getName() + StrUtil.DOT + method.getName();
if (StringUtils.isBlank(key)) {
key = method.getDeclaringClass().getName() + "." + method.getName();
}
key = key + SEPARATOR + IPUtils.get();

4
core/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java
View File

@ -1,10 +1,10 @@
package io.dataease.auth.aop;
import cn.hutool.core.util.ArrayUtil;
import io.dataease.auth.annotation.SqlInjectValidator;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.KeywordRequest;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
@ -56,7 +56,7 @@ public class SqlInjectAop {
}
private boolean isIllegal(String[] value, List<String> orderList) {
if (CollectionUtils.isEmpty(orderList) || ArrayUtil.isEmpty(value)) return false;
if (CollectionUtils.isEmpty(orderList) || ArrayUtils.isEmpty(value)) return false;
Set<String> wordList = Arrays.stream(value).collect(Collectors.toSet());
wordList.add("asc");
wordList.add("desc");

4
core/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java
View File

@ -1,6 +1,5 @@
package io.dataease.auth.filter;
import cn.hutool.core.util.ArrayUtil;
import io.dataease.auth.entity.SysUserEntity;
import io.dataease.auth.entity.TokenInfo;
import io.dataease.auth.service.AuthUserService;
@ -9,6 +8,7 @@ import io.dataease.commons.license.DefaultLicenseService;
import io.dataease.commons.license.F2CLicenseResponse;
import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.commons.utils.LogUtil;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.web.filter.AccessControlFilter;
@ -66,7 +66,7 @@ public class F2CDocFilter extends AccessControlFilter {
String authorization = request.getHeader("Authorization");
if (StringUtils.isBlank(authorization)) {
Cookie[] cookies = request.getCookies();
if (ArrayUtil.isNotEmpty(cookies)) {
if (ArrayUtils.isNotEmpty(cookies)) {
Cookie cookie = Arrays.stream(cookies).filter(item -> StringUtils.equals(item.getName(), "Authorization")).findFirst().orElse(null);
if (ObjectUtils.isNotEmpty(cookie) && StringUtils.isNotBlank(cookie.getValue())) {
authorization = cookie.getValue();

4
core/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java
View File

@ -1,12 +1,12 @@
package io.dataease.auth.filter;
import cn.hutool.core.util.ObjectUtil;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.DecodedJWT;
import io.dataease.auth.util.JWTUtils;
import io.dataease.auth.util.LinkUtil;
import io.dataease.commons.utils.LogUtil;
import io.dataease.plugins.common.base.domain.PanelLink;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.web.filter.authc.AnonymousFilter;
import javax.servlet.ServletRequest;
@ -26,7 +26,7 @@ public class F2CLinkFilter extends AnonymousFilter {
String resourceId = jwt.getClaim("resourceId").asString();
Long userId = jwt.getClaim("userId").asLong();
PanelLink panelLink = LinkUtil.queryLink(resourceId, userId);
if (ObjectUtil.isEmpty(panelLink)) return false;
if (ObjectUtils.isEmpty(panelLink)) return false;
String pwd;
if (!panelLink.getEnablePwd()) {
panelLink.setPwd("dataease");

40
core/backend/src/main/java/io/dataease/commons/filter/HtmlResourceFilter.java Normal file
View File

@ -0,0 +1,40 @@
package io.dataease.commons.filter;
import org.springframework.core.Ordered;
import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@Component
public class HtmlResourceFilter implements Filter, Ordered {
@Override
public int getOrder() {
return 99;
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
Filter.super.init(filterConfig);
}
@Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
HttpServletResponse httpResponse = (HttpServletResponse) servletResponse;
// 禁用缓存
httpResponse.setHeader(HttpHeaders.CACHE_CONTROL, "no-cache");
httpResponse.setHeader("Cache", "no-cache");
httpResponse.setHeader(HttpHeaders.PRAGMA, "no-cache");
httpResponse.setHeader(HttpHeaders.EXPIRES, "0");
// 继续执行过滤器链
filterChain.doFilter(servletRequest, httpResponse);
}
@Override
public void destroy() {
Filter.super.destroy();
}
}

18
core/backend/src/main/java/io/dataease/commons/utils/BeanUtils.java
View File

@ -2,7 +2,10 @@ package io.dataease.commons.utils;
import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
public class BeanUtils {
@ -65,4 +68,19 @@ public class BeanUtils {
return null;
}
}
public static Map<String, Object> bean2Map(Object bean) {
Map<String, Object> result = new HashMap<>();
Class<?> aClass = bean.getClass();
Field[] fields = aClass.getDeclaredFields();
for (Field field : fields) {
field.setAccessible(true);
try {
result.put(field.getName(), field.get(bean));
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
return result;
}
}

2
core/backend/src/main/java/io/dataease/commons/utils/DatasetUtils.java
View File

@ -1,6 +1,6 @@
package io.dataease.commons.utils;
import io.dataease.dto.dataset.union.UnionDTO;
import io.dataease.plugins.common.dto.dataset.union.UnionDTO;
import org.apache.commons.collections4.CollectionUtils;
import java.util.List;

24
core/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java
View File

@ -1,23 +1,20 @@
package io.dataease.commons.utils;
import io.dataease.commons.model.excel.ExcelSheetModel;
import io.dataease.plugins.common.util.FileUtil;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import java.io.BufferedOutputStream;
import java.io.File;
import cn.hutool.core.io.FileUtil;
import io.dataease.commons.model.excel.ExcelSheetModel;
import java.io.FileOutputStream;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
public class ExcelUtils {
private static final String suffix = ".xlsx";
@ -78,10 +75,11 @@ public class ExcelUtils {
folderPath += Thread.currentThread().getId() + "/";
if (!FileUtil.exist(folderPath)) {
FileUtil.mkdir(folderPath);
new File(folderPath).mkdirs();
}
File result = new File(folderPath + realFileName.get());
BufferedOutputStream outputStream = FileUtil.getOutputStream(result);
FileOutputStream fos = new FileOutputStream(result);
BufferedOutputStream outputStream = new BufferedOutputStream(fos);
try {
wb.write(outputStream);
} catch (Exception e) {

10
core/backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java
View File

@ -1,6 +1,6 @@
package io.dataease.commons.utils;
import io.dataease.dto.dataset.ExcelSheetData;
import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.dto.datasource.TableField;
import org.apache.poi.hssf.eventusermodel.*;
@ -331,6 +331,11 @@ public class ExcelXlsReader implements HSSFListener {
if (flag && curRow != 0) { //该行不为空行且该行不是第一行，发送（第一行为列名，不需要）
if (!totalSheets.stream().map(ExcelSheetData::getExcelLabel).collect(Collectors.toList()).contains(sheetName)) {
if(cellList.size() < fields.size()){
for (int i = 0; i < fields.size() - cellList.size(); i++) {
cellList.add("");
}
}
ExcelSheetData excelSheetData = new ExcelSheetData();
excelSheetData.setData(new ArrayList<>(data));
excelSheetData.setExcelLabel(sheetName);
@ -370,6 +375,9 @@ public class ExcelXlsReader implements HSSFListener {
private String checkType(String str, int thisColumn) {
if (str.length() > 19) {
return "TEXT";
}
String type = null;
try {
double d = Double.valueOf(str);

26
core/backend/src/main/java/io/dataease/commons/utils/StaticResourceUtils.java
View File

@ -1,17 +1,17 @@
package io.dataease.commons.utils;
import static io.dataease.commons.constants.StaticResourceConstants.*;
import cn.hutool.core.codec.Base64Encoder;
import io.dataease.plugins.common.exception.DataEaseException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.lang.NonNull;
import org.springframework.util.Assert;
import org.springframework.util.Base64Utils;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import static io.dataease.commons.constants.StaticResourceConstants.*;
/**
* Author: wangjiahao
* Date: 2022/4/24
@ -19,7 +19,7 @@ import java.io.InputStream;
*/
public class StaticResourceUtils {
private final static String FILE_BASE_PATH = USER_HOME+ FILE_SEPARATOR+UPLOAD_URL_PREFIX;
private final static String FILE_BASE_PATH = USER_HOME + FILE_SEPARATOR + UPLOAD_URL_PREFIX;
private static final String FILE_NAME_REGEX_PATTERN = "^[A-Za-z0-9.-]{1,255}$";
@ -69,12 +69,11 @@ public class StaticResourceUtils {
}
/**
*
* @param imgFile local storage path
* @param imgFile local storage path
* @return
*/
public static String getImgFileToBase64(String imgFile) {
if(!validateStringFilenameUsingRegex(imgFile)){
if (!validateStringFilenameUsingRegex(imgFile)) {
DataEaseException.throwException("Illegal File Name");
}
//Convert the picture file into byte array and encode it with Base64
@ -82,7 +81,7 @@ public class StaticResourceUtils {
byte[] buffer = null;
//Read picture byte array
try {
inputStream = new FileInputStream(FILE_BASE_PATH+FILE_SEPARATOR+imgFile);
inputStream = new FileInputStream(FILE_BASE_PATH + FILE_SEPARATOR + imgFile);
int count = 0;
while (count == 0) {
count = inputStream.available();
@ -91,9 +90,9 @@ public class StaticResourceUtils {
inputStream.read(buffer);
} catch (IOException e) {
LogUtil.error(e);
}catch (Exception e){
} catch (Exception e) {
LogUtil.error(e);
}finally {
} finally {
if (inputStream != null) {
try {
// Close InputStream
@ -104,10 +103,9 @@ public class StaticResourceUtils {
}
}
// Encode byte array as Base64
if(buffer!=null){
return Base64Encoder.encode(buffer);
}else{
if (buffer != null) {
return Base64Utils.encodeToString(buffer);
} else {
return null;
}
}

1
core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
View File

@ -67,7 +67,6 @@ public class DataSetTableController {
@DePermissions(value = {
@DePermission(type = DePermissionType.DATASET, value = "id", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
@DePermission(type = DePermissionType.DATASOURCE, value = "dataSourceId", level = ResourceAuthLevel.DATASOURCE_LEVEL_USE)
}, logical = Logical.AND)
@ApiOperation("更新")

28
core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java
View File

@ -1,9 +1,9 @@
package io.dataease.controller.dataset;
import cn.hutool.core.collection.CollectionUtil;
import com.auth0.jwt.JWT;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.google.gson.Gson;
import io.dataease.auth.annotation.DePermission;
import io.dataease.auth.annotation.DePermissions;
import io.dataease.auth.filter.F2CLinkFilter;
@ -12,6 +12,7 @@ import io.dataease.commons.constants.ResourceAuthLevel;
import io.dataease.controller.request.dataset.DataSetTableRequest;
import io.dataease.controller.request.dataset.MultFieldValuesRequest;
import io.dataease.controller.response.DatasetTableField4Type;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.dto.dataset.DatasetTableFieldDTO;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.DatasetTable;
@ -21,7 +22,7 @@ import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.datasource.entity.Dateformat;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.service.dataset.DataSetFieldService;
import io.dataease.service.dataset.DataSetTableFieldsService;
import io.dataease.service.dataset.DataSetTableService;
@ -30,6 +31,7 @@ import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.engine.EngineService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -108,6 +110,8 @@ public class DataSetTableFieldController {
DatasetTableField datasetTableField = DatasetTableField.builder().build();
datasetTableField.setTableId(tableId);
datasetTableField.setGroupType("d");
DatasetTable datasetTable = dataSetTableService.get(tableId);
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
List<DatasetTableFieldDTO> dimensionList = new ArrayList<>();
dataSetTableFieldsService.list(datasetTableField).forEach(o -> {
DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO();
@ -118,6 +122,9 @@ public class DataSetTableFieldController {
deTypeCascader.add(datasetTableFieldDTO.getDateFormatType());
}
datasetTableFieldDTO.setDeTypeCascader(deTypeCascader);
if (dataTableInfoDTO.isSetKey() && dataTableInfoDTO.getKeys().contains(datasetTableFieldDTO.getOriginName())){
datasetTableFieldDTO.setKey(true);
}
dimensionList.add(datasetTableFieldDTO);
});
@ -133,6 +140,9 @@ public class DataSetTableFieldController {
deTypeCascader.add(datasetTableFieldDTO.getDateFormatType());
}
datasetTableFieldDTO.setDeTypeCascader(deTypeCascader);
if (dataTableInfoDTO.isSetKey() && dataTableInfoDTO.getKeys().contains(datasetTableFieldDTO.getOriginName())){
datasetTableFieldDTO.setKey(true);
}
quotaList.add(datasetTableFieldDTO);
});
@ -187,6 +197,16 @@ public class DataSetTableFieldController {
return dataSetTableFieldsService.save(datasetTableField);
}
@DePermission(type = DePermissionType.DATASET, value = "tableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ApiOperation("设置主键")
@PostMapping("saveKey")
public void saveKey(@RequestBody DatasetTableFieldDTO datasetTableField) throws Exception {
DatasetTable datasetTable = dataSetTableService.get(datasetTableField.getTableId());
if (datasetTable.getMode() == 1) {
dataSetTableService.saveKey(datasetTable, datasetTableField);
}
}
@DePermissions(value = {
@DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE, paramIndex = 1)
})
@ -215,7 +235,7 @@ public class DataSetTableFieldController {
List<Object> results = new ArrayList<>();
for (String fieldId : multFieldValuesRequest.getFieldIds()) {
List<Object> fieldValues = dataSetFieldService.fieldValues(fieldId, multFieldValuesRequest.getSort(), multFieldValuesRequest.getUserId(), true, false, multFieldValuesRequest.getKeyword());
if (CollectionUtil.isNotEmpty(fieldValues)) {
if (CollectionUtils.isNotEmpty(fieldValues)) {
results.addAll(fieldValues);
}
@ -248,7 +268,7 @@ public class DataSetTableFieldController {
List<Object> results = new ArrayList<>();
for (String fieldId : multFieldValuesRequest.getFieldIds()) {
List<Object> fieldValues = dataSetFieldService.fieldValues(fieldId, multFieldValuesRequest.getUserId(), false, true);
if (CollectionUtil.isNotEmpty(fieldValues)) {
if (CollectionUtils.isNotEmpty(fieldValues)) {
results.addAll(fieldValues);
}

30
core/backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java
View File

@ -5,16 +5,17 @@ import com.auth0.jwt.interfaces.DecodedJWT;
import io.dataease.auth.filter.F2CLinkFilter;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.plugins.common.base.domain.PanelGroupWithBLOBs;
import io.dataease.plugins.common.base.domain.PanelLink;
import io.dataease.controller.panel.api.LinkApi;
import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.controller.request.panel.link.*;
import io.dataease.dto.panel.link.GenerateDto;
import io.dataease.dto.panel.link.ValidateDto;
import io.dataease.plugins.common.base.domain.PanelGroupWithBLOBs;
import io.dataease.plugins.common.base.domain.PanelLink;
import io.dataease.service.chart.ChartViewService;
import io.dataease.service.panel.PanelLinkService;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@ -25,6 +26,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Map;
@RestController
@ -65,22 +67,32 @@ public class LinkServer implements LinkApi {
@Override
public ValidateDto validate(@RequestBody LinkValidateRequest request) throws Exception {
String link = request.getLink();
link = URLDecoder.decode(link, "UTF-8");
link = URLDecoder.decode(link, StandardCharsets.UTF_8);
String json = panelLinkService.decryptParam(link);
String[] jsonArray = json.split(",");
String uuid = null;
int len = jsonArray.length;
if (len > 1) {
uuid = jsonArray[1];
}
String user = request.getUser();
user = URLDecoder.decode(user, "UTF-8");
user = URLDecoder.decode(user, StandardCharsets.UTF_8);
user = panelLinkService.decryptParam(user);
ValidateDto dto = new ValidateDto();
dto.setUserId(user);
String resourceId = json;
String resourceId = jsonArray[0];
PanelLink one = panelLinkService.findOne(resourceId, Long.valueOf(user));
dto.setResourceId(resourceId);
if (ObjectUtils.isEmpty(one)) {
dto.setValid(false);
return dto;
}
String mappingUuid = panelLinkService.getMappingUuid(one);
if (!StringUtils.equals(uuid, mappingUuid)) {
dto.setValid(false);
return dto;
}
dto.setValid(one.getValid());
dto.setEnablePwd(one.getEnablePwd());
dto.setPassPwd(panelLinkService.validateHeads(one));
@ -94,8 +106,8 @@ public class LinkServer implements LinkApi {
}
@Override
public Object resourceDetail(@PathVariable String resourceId,@PathVariable String userId) {
return panelLinkService.resourceInfo(resourceId,userId);
public Object resourceDetail(@PathVariable String resourceId, @PathVariable String userId) {
return panelLinkService.resourceInfo(resourceId, userId);
}
@Override
@ -125,7 +137,7 @@ public class LinkServer implements LinkApi {
operateType = SysLogConstants.OPERATE_TYPE.MB_VIEW;
}
if (ObjectUtils.isEmpty(userId)) return;
PanelGroupWithBLOBs panelGroupWithBLOBs = panelLinkService.resourceInfo(panelId,String.valueOf(userId));
PanelGroupWithBLOBs panelGroupWithBLOBs = panelLinkService.resourceInfo(panelId, String.valueOf(userId));
String pid = panelGroupWithBLOBs.getPid();
DeLogUtils.save(operateType, SysLogConstants.SOURCE_TYPE.LINK, panelId, pid, userId, SysLogConstants.SOURCE_TYPE.USER);
}

2
core/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
View File

@ -1,6 +1,6 @@
package io.dataease.controller.request.dataset;
import io.dataease.dto.dataset.ExcelSheetData;
import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
import io.dataease.plugins.common.base.domain.DatasetTable;
import io.dataease.plugins.common.dto.datasource.TableField;
import io.swagger.annotations.ApiModelProperty;

1
core/backend/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
View File

@ -9,4 +9,5 @@ import java.util.List;
public class DatasetTableFieldDTO extends DatasetTableField {
private String jsonPath;
private List<Object> deTypeCascader;
private boolean isKey;
}

1
core/backend/src/main/java/io/dataease/dto/dataset/ExcelFileData.java
View File

@ -1,5 +1,6 @@
package io.dataease.dto.dataset;
import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

3
core/backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java
View File

@ -5,6 +5,7 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -22,7 +23,7 @@ public class MysqlConfiguration extends JdbcConfiguration {
return "jdbc:mysql://HOSTNAME:PORT/DATABASE".replace("HOSTNAME", getHost().trim()).replace("PORT", getPort().toString().trim()).replace("DATABASE", getDataBase().trim());
} else {
for (String illegalParameter : getIllegalParameters()) {
if (getExtraParams().toLowerCase().contains(illegalParameter.toLowerCase())) {
if (getExtraParams().toLowerCase().contains(illegalParameter.toLowerCase()) || URLDecoder.decode(getExtraParams()).contains(illegalParameter.toLowerCase())) {
throw new RuntimeException("Illegal parameter: " + illegalParameter);
}
}

6
core/backend/src/main/java/io/dataease/ext/ExtChartViewMapper.xml
View File

@ -309,7 +309,8 @@
`is_plugin`,
`senior`,
`data_from`,
`view_fields`)
`view_fields`,
`_aggregate`)
SELECT #{newChartId},
GET_CHART_VIEW_COPY_NAME(#{oldChartId}, #{panelId}) as `name`,
#{panelId},
@ -338,7 +339,8 @@
`is_plugin`,
`senior`,
`data_from`,
`view_fields`
`view_fields`,
`_aggregate`
FROM chart_view
WHERE id = #{oldChartId}
</insert>

77
core/backend/src/main/java/io/dataease/ext/MobileDirMapper.xml
View File

@ -3,17 +3,15 @@
<mapper namespace="io.dataease.ext.MobileDirMapper">
<select id="query" resultType="io.dataease.mobile.entity.PanelEntity">
SELECT
id,
NAME AS text,
pid,
node_type AS `type`
FROM
panel_group g,
( SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE ( #{userId}, 'panel' ) cids ) t
WHERE
g.pid = #{pid}
AND FIND_IN_SET( g.id, cids )
SELECT id,
NAME AS text,
pid,
node_type AS `type`
FROM panel_group g,
(SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE(#{userId}, 'panel') cids) t
WHERE g.pid = #{pid}
AND FIND_IN_SET(g.id, cids)
ORDER BY g.panel_sort desc, CONVERT(g.name using gbk)
</select>
<select id="queryWithName" resultType="io.dataease.mobile.entity.PanelEntity">
@ -26,35 +24,34 @@
panel_group g,
( SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE ( #{userId}, 'panel' ) cids ) t
WHERE
FIND_IN_SET( g.id, cids )
<if test="name != null">
and name like CONCAT('%', #{name, jdbcType=VARCHAR}, '%')
</if>
FIND_IN_SET( g.id, cids )
<if test="name != null">
and name like CONCAT('%', #{name, jdbcType=VARCHAR}, '%')
</if>
ORDER BY g.panel_sort desc, CONVERT(g.name using gbk)
</select>
<select id="idsWithUser" resultType="java.lang.String">
select a.auth_source
from sys_auth a
left join sys_auth_detail d on a.id = d.auth_id
where
a.auth_target_type = 'user' and
a.auth_target = #{userId} and
a.auth_source_type = 'panel' and
d.privilege_type = 1 and
d.privilege_value = 1
left join sys_auth_detail d on a.id = d.auth_id
where a.auth_target_type = 'user'
and a.auth_target = #{userId}
and a.auth_source_type = 'panel'
and d.privilege_type = 1
and d.privilege_value = 1
</select>
<select id="idsWithDept" resultType="java.lang.String">
select a.auth_source
from sys_auth a
left join sys_auth_detail d on a.id = d.auth_id
where
a.auth_target_type = 'dept' and
a.auth_target = #{deptId} and
a.auth_source_type = 'panel' and
d.privilege_type = 1 and
d.privilege_value = 1
left join sys_auth_detail d on a.id = d.auth_id
where a.auth_target_type = 'dept'
and a.auth_target = #{deptId}
and a.auth_source_type = 'panel'
and d.privilege_type = 1
and d.privilege_value = 1
</select>
<select id="idsWithRoles" resultType="java.lang.String">
@ -62,20 +59,16 @@
from sys_auth a
left join sys_auth_detail d on a.id = d.auth_id
where
a.auth_target_type = 'role' and
a.auth_target in
<foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
#{roleId}
</foreach>
and
a.auth_source_type = 'panel' and
d.privilege_type = 1 and
d.privilege_value = 1
a.auth_target_type = 'role' and
a.auth_target in
<foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
#{roleId}
</foreach>
and
a.auth_source_type = 'panel' and
d.privilege_type = 1 and
d.privilege_value = 1
</select>
</mapper>

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

@ -1,6 +1,5 @@
package io.dataease.job.sechedule.strategy.impl;
import cn.hutool.core.io.FileUtil;
import io.dataease.auth.entity.SysUserEntity;
import io.dataease.auth.entity.TokenInfo;
import io.dataease.auth.service.AuthUserService;
@ -16,6 +15,7 @@ import io.dataease.job.sechedule.strategy.TaskHandler;
import io.dataease.plugins.common.base.domain.SysUserAssist;
import io.dataease.plugins.common.entity.GlobalTaskEntity;
import io.dataease.plugins.common.entity.GlobalTaskInstance;
import io.dataease.plugins.common.util.FileUtil;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.xpack.dingtalk.dto.entity.DingtalkMsgResult;
import io.dataease.plugins.xpack.dingtalk.service.DingtalkXpackService;

78
core/backend/src/main/java/io/dataease/map/service/MapService.java
View File

@ -1,7 +1,6 @@
package io.dataease.map.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.io.FileUtil;
import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.listener.util.CacheUtils;
import io.dataease.map.dto.entity.AreaEntity;
@ -10,6 +9,8 @@ import io.dataease.map.utils.MapUtils;
import io.dataease.plugins.common.base.domain.AreaMappingGlobal;
import io.dataease.plugins.common.base.domain.AreaMappingGlobalExample;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.util.FileUtil;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.Cacheable;
@ -50,7 +51,7 @@ public class MapService {
return areaEntity.getChildren();
}
if (CollectionUtil.isNotEmpty(areaEntity.getChildren())) {
if (CollectionUtils.isNotEmpty(areaEntity.getChildren())) {
List<AreaEntity> areaEntities = entitiesByPid(areaEntity.getChildren(), pid);
if (null != areaEntities) {
return areaEntities;
@ -96,7 +97,7 @@ public class MapService {
Set<String> sets = nodes.stream().flatMap(node -> codesByNode(node, pLevel).stream()).collect(Collectors.toSet());
sets.forEach(code -> {
String countryCode = code.substring(0, 3);
String path = rootGeoPath + "/full/" + countryCode + "/" + code +"_full.json";
String path = rootGeoPath + "/full/" + countryCode + "/" + code + "_full.json";
if (FileUtil.exist(path)) {
FileUtil.del(path);
}
@ -107,19 +108,19 @@ public class MapService {
Set<String> sets = new TreeSet<>();
if (pLevel == 2) {
if(StringUtils.isNotBlank(node.getProvinceCode())) sets.add(node.getProvinceCode());
if(StringUtils.isNotBlank(node.getCityCode())) sets.add(node.getCityCode());
if(StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
if (StringUtils.isNotBlank(node.getProvinceCode())) sets.add(node.getProvinceCode());
if (StringUtils.isNotBlank(node.getCityCode())) sets.add(node.getCityCode());
if (StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
} else if (pLevel == 3) {
if(StringUtils.isNotBlank(node.getCityCode())) sets.add(node.getCityCode());
if(StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
if (StringUtils.isNotBlank(node.getCityCode())) sets.add(node.getCityCode());
if (StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
} else if (pLevel == 4) {
if(StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
if (StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
} else {
if(StringUtils.isNotBlank(node.getCountryCode())) sets.add(node.getCountryCode());
if(StringUtils.isNotBlank(node.getProvinceCode())) sets.add(node.getProvinceCode());
if(StringUtils.isNotBlank(node.getCityCode())) sets.add(node.getCityCode());
if(StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
if (StringUtils.isNotBlank(node.getCountryCode())) sets.add(node.getCountryCode());
if (StringUtils.isNotBlank(node.getProvinceCode())) sets.add(node.getProvinceCode());
if (StringUtils.isNotBlank(node.getCityCode())) sets.add(node.getCityCode());
if (StringUtils.isNotBlank(node.getCountyCode())) sets.add(node.getCountyCode());
}
return sets;
}
@ -132,7 +133,7 @@ public class MapService {
AreaMappingGlobalExample example = new AreaMappingGlobalExample();
AreaMappingGlobal curRoot = new AreaMappingGlobal();
List<AreaMappingGlobal> nodes = null;
if(pLevel == 0) {
if (pLevel == 0) {
nodes = MapUtils.selectByExample(example);
MapUtils.deleteByExample(example);
delFileByNodes(nodes, pLevel);
@ -147,7 +148,7 @@ public class MapService {
MapUtils.deleteByExample(example);
example.clear();
example.createCriteria().andCountryCodeEqualTo(pCode);
if (!MapUtils.exampleExist(example) && CollectionUtil.isNotEmpty(nodes)) {
if (!MapUtils.exampleExist(example) && CollectionUtils.isNotEmpty(nodes)) {
AreaMappingGlobal template = nodes.get(0);
curRoot.setCountryCode(template.getCountryCode());
curRoot.setCountryName(template.getCountryName());
@ -163,7 +164,7 @@ public class MapService {
example.clear();
example.createCriteria().andProvinceCodeEqualTo(pCode);
if (!MapUtils.exampleExist(example) && CollectionUtil.isNotEmpty(nodes)) {
if (!MapUtils.exampleExist(example) && CollectionUtils.isNotEmpty(nodes)) {
AreaMappingGlobal template = nodes.get(0);
curRoot.setCountryCode(template.getCountryCode());
curRoot.setCountryName(template.getCountryName());
@ -180,7 +181,7 @@ public class MapService {
example.clear();
example.createCriteria().andProvinceCodeEqualTo(pCode);
if (!MapUtils.exampleExist(example) && CollectionUtil.isNotEmpty(nodes)) {
if (!MapUtils.exampleExist(example) && CollectionUtils.isNotEmpty(nodes)) {
AreaMappingGlobal template = nodes.get(0);
curRoot.setCountryCode(template.getCountryCode());
curRoot.setCountryName(template.getCountryName());
@ -205,14 +206,15 @@ public class MapService {
DataEaseException.throwException("only json file supported");
}
}
@Transactional
public void saveMapNode(MapNodeRequest request, MultipartFile file) throws Exception{
public void saveMapNode(MapNodeRequest request, MultipartFile file) throws Exception {
validateFile(file);
String pCode = request.getPcode();
Integer plevel = request.getPlevel();
String code = request.getCode();
if(StringUtils.isBlank(code)) {
if (StringUtils.isBlank(code)) {
String newAreaCode = generateAreaCode(pCode);
request.setCode(newAreaCode);
}
@ -222,19 +224,17 @@ public class MapService {
if (plevel == 1) {
example.createCriteria().andCountryCodeEqualTo(code);
}
else if (plevel == 2) {
} else if (plevel == 2) {
example.createCriteria().andCountryCodeEqualTo(pCode).andProvinceCodeEqualTo(code);
}
else if (plevel == 3) {
} else if (plevel == 3) {
example.createCriteria().andProvinceCodeEqualTo(pCode).andCityCodeEqualTo(code);
}else if (plevel == 4) {
} else if (plevel == 4) {
example.createCriteria().andCityCodeEqualTo(pCode).andCountyCodeEqualTo(code);
} else {
DataEaseException.throwException("只支持3级行政区");
}
List<AreaMappingGlobal> lists = MapUtils.selectByExample(example);
if (CollectionUtil.isNotEmpty(lists)) {
if (CollectionUtils.isNotEmpty(lists)) {
DataEaseException.throwException("区域代码已存在");
}
@ -243,27 +243,26 @@ public class MapService {
if (plevel == 1) {
pExample.createCriteria().andCountryCodeIsNull().andProvinceCodeIsNull().andCityCodeIsNull().andCountyCodeIsNull();
List<AreaMappingGlobal> existLists = MapUtils.selectByExample(pExample);
if (CollectionUtil.isNotEmpty(existLists)) {
if (CollectionUtils.isNotEmpty(existLists)) {
AreaMappingGlobal node = existLists.get(0);
node.setCountryCode(code);
node.setCountryName(request.getName());
MapUtils.update(node);
}else {
} else {
AreaMappingGlobal node = new AreaMappingGlobal();
node.setCountryCode(code);
node.setCountryName(request.getName());
MapUtils.addNode(node);
}
}
else if (plevel == 2) {
} else if (plevel == 2) {
pExample.createCriteria().andCountryCodeEqualTo(pCode).andProvinceCodeIsNull().andCityCodeIsNull().andCountyCodeIsNull();
List<AreaMappingGlobal> existLists = MapUtils.selectByExample(pExample);
if (CollectionUtil.isNotEmpty(existLists)) {
if (CollectionUtils.isNotEmpty(existLists)) {
AreaMappingGlobal node = existLists.get(0);
node.setProvinceCode(code);
node.setProvinceName(request.getName());
MapUtils.update(node);
}else {
} else {
AreaMappingGlobal country = country(pCode);
AreaMappingGlobal node = new AreaMappingGlobal();
node.setCountryCode(pCode);
@ -272,16 +271,15 @@ public class MapService {
node.setProvinceName(request.getName());
MapUtils.addNode(node);
}
}
else if (plevel == 3) {
} else if (plevel == 3) {
pExample.createCriteria().andProvinceCodeEqualTo(pCode).andCityCodeIsNull();
List<AreaMappingGlobal> existLists = MapUtils.selectByExample(pExample);
if (CollectionUtil.isNotEmpty(existLists)) {
if (CollectionUtils.isNotEmpty(existLists)) {
AreaMappingGlobal node = existLists.get(0);
node.setCityCode(code);
node.setCityName(request.getName());
MapUtils.update(node);
}else {
} else {
AreaMappingGlobal province = province(pCode);
AreaMappingGlobal node = new AreaMappingGlobal();
node.setCountryCode(province.getCountryCode());
@ -295,12 +293,12 @@ public class MapService {
} else if (plevel == 4) {
pExample.createCriteria().andCountryCodeEqualTo(pCode).andCountyCodeIsNull();
List<AreaMappingGlobal> existLists = MapUtils.selectByExample(pExample);
if (CollectionUtil.isNotEmpty(existLists)) {
if (CollectionUtils.isNotEmpty(existLists)) {
AreaMappingGlobal node = existLists.get(0);
node.setCountyCode(code);
node.setCountyName(request.getName());
MapUtils.update(node);
}else {
} else {
AreaMappingGlobal city = city(pCode);
AreaMappingGlobal node = new AreaMappingGlobal();
node.setCountryCode(city.getCountryCode());
@ -320,7 +318,7 @@ public class MapService {
CacheUtils.removeAll("sys_map_areas_global");
}
public void uploadMapFile(MultipartFile file, String areaCode) throws Exception{
public void uploadMapFile(MultipartFile file, String areaCode) throws Exception {
String countryCode = areaCode.substring(0, 3);
String dir = rootGeoPath + "full/" + countryCode + "/";
@ -329,7 +327,7 @@ public class MapService {
fileDir.mkdirs();
}
String targetPath = dir + areaCode+"_full.json";
String targetPath = dir + areaCode + "_full.json";
File target = new File(targetPath);
file.transferTo(target);
}

7
core/backend/src/main/java/io/dataease/map/service/MapTransferService.java
View File

@ -1,12 +1,13 @@
package io.dataease.map.service;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ArrayUtil;
import com.google.gson.Gson;
import io.dataease.plugins.common.base.domain.ChartView;
import io.dataease.plugins.common.base.domain.ChartViewExample;
import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
import io.dataease.plugins.common.base.mapper.ChartViewMapper;
import io.dataease.plugins.common.util.FileUtil;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
@ -72,7 +73,7 @@ public class MapTransferService {
String chinaRootPath = geoPath + FULL_KEY + FILE_SEPARATOR;
File chinaRootDir = new File(chinaRootPath);
File[] files = chinaRootDir.listFiles();
if (ArrayUtil.isEmpty(files)) return;
if (ArrayUtils.isEmpty(files)) return;
Map<String, List<File>> listMap = Arrays.stream(files).filter(FileUtil::isFile).collect(Collectors.groupingBy(this::fileType));
if (ObjectUtils.isEmpty(listMap)) return;
moveFiles(listMap, BORDER_KEY);

40
core/backend/src/main/java/io/dataease/map/utils/HttpUtils.java
View File

@ -1,40 +0,0 @@
package io.dataease.map.utils;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import io.dataease.map.dto.request.MapRequest;
import io.dataease.map.dto.response.MapResponse;
import java.util.Map;
public class HttpUtils {
private static final String url = "https://restapi.amap.com/v3/config/district";
private static final String key = "a5d10d5d05a3a0868cec67c4d66cf025";
private static final String extensions = "all";
private static final Integer subdistrict = 0;
public static MapResponse get(MapRequest request){
request.setKey(key);
request.setExtensions(extensions);
request.setSubdistrict(subdistrict);
Map<String, Object> param = BeanUtil.beanToMap(request);
String s = HttpUtil.get(url, param);
MapResponse mapResponse = JSONUtil.toBean(s, MapResponse.class);
return mapResponse;
}
public static MapResponse get(String code) {
MapRequest request = MapRequest.builder().keywords(code).build();
return get(request);
}
}

5
core/backend/src/main/java/io/dataease/map/utils/MapUtils.java
View File

@ -1,6 +1,5 @@
package io.dataease.map.utils;
import cn.hutool.core.util.StrUtil;
import io.dataease.map.dto.entity.AreaEntity;
import io.dataease.map.dto.entity.Constants;
import io.dataease.plugins.common.base.domain.AreaMapping;
@ -84,7 +83,7 @@ public class MapUtils {
String city_code = map.getCityCode();
String county_code = map.getCountyCode();
// 是否是跨级直辖
Boolean isCrossLevel = StrUtil.equals(province_code, city_code) && !StrUtil.equals(province_code, "156710000");
Boolean isCrossLevel = StringUtils.equals(province_code, city_code) && !StringUtils.equals(province_code, "156710000");
if (!countryMap.containsKey(country_code)) {
String country_name = map.getCountryName();
@ -154,7 +153,7 @@ public class MapUtils {
county_code = formatCode(county_code);
// 是否是跨级直辖
Boolean isCrossLevel = StrUtil.equals(province_code, city_code) && !StrUtil.equals(province_code, "710000");
Boolean isCrossLevel = StringUtils.equals(province_code, city_code) && !StringUtils.equals(province_code, "710000");
if (!provinceMap.containsKey(province_code)) {
String province_name = map.get(Constants.PROVINCE_NAME).toString();

4
core/backend/src/main/java/io/dataease/plugins/server/CasServer.java
View File

@ -1,6 +1,5 @@
package io.dataease.plugins.server;
import cn.hutool.core.util.RandomUtil;
import io.dataease.auth.entity.SysUserEntity;
import io.dataease.auth.entity.TokenInfo;
import io.dataease.auth.service.AuthUserService;
@ -14,6 +13,7 @@ import io.dataease.i18n.Translator;
import io.dataease.service.sys.SysUserService;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.jasig.cas.client.authentication.AttributePrincipal;
import org.jasig.cas.client.util.AssertionHolder;
@ -67,7 +67,7 @@ public class CasServer {
sysUserEntity = authUserService.getCasUserByName(name);
}
if (null == sysUserEntity) {
String s = RandomUtil.randomString(6);
String s = RandomStringUtils.randomAlphanumeric(6);
String email = s + "@xxx.com";
sysUserService.validateCasUser(name);
sysUserService.saveCASUser(name, email);

4
core/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
View File

@ -1,7 +1,6 @@
package io.dataease.plugins.server;
import cn.hutool.core.collection.CollectionUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.dataease.auth.annotation.DeLog;
@ -30,6 +29,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -190,7 +190,7 @@ public class XDeptServer {
@PostMapping("/unBindUser")
public void unBindUser(@RequestBody XpackDeptBindRequest request) {
DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
if (CollectionUtil.isEmpty(request.getUserIds())) {
if (CollectionUtils.isEmpty(request.getUserIds())) {
DataEaseException.throwException("userIds can not be empty");
}
request.getUserIds().forEach(userId -> {

80
core/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
View File

@ -1,7 +1,5 @@
package io.dataease.plugins.server;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ArrayUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import io.dataease.auth.annotation.DeRateLimiter;
@ -22,8 +20,11 @@ import io.dataease.plugins.xpack.email.dto.response.XpackTaskInstanceDTO;
import io.dataease.plugins.xpack.email.service.EmailXpackService;
import io.dataease.service.ScheduleService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ByteArrayResource;
@ -35,10 +36,10 @@ import org.springframework.web.util.HtmlUtils;
import springfox.documentation.annotations.ApiIgnore;
import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -179,7 +180,7 @@ public class XEmailTaskServer {
Object object = future.get();
if (ObjectUtils.isNotEmpty(object)) {
bytes = (byte[]) object;
if (ArrayUtil.isNotEmpty(bytes)) {
if (ArrayUtils.isNotEmpty(bytes)) {
String fileName = request.getPanelId() + ".pdf";
ByteArrayResource bar = new ByteArrayResource(bytes);
HttpHeaders headers = new HttpHeaders();
@ -217,7 +218,7 @@ public class XEmailTaskServer {
Object object = future.get();
if (ObjectUtils.isNotEmpty(object)) {
bytes = (byte[]) object;
if (ArrayUtil.isNotEmpty(bytes)) {
if (ArrayUtils.isNotEmpty(bytes)) {
String fileName = request.getPanelId() + ".jpeg";
ByteArrayResource bar = new ByteArrayResource(bytes);
HttpHeaders headers = new HttpHeaders();
@ -340,35 +341,52 @@ public class XEmailTaskServer {
Pager<List<XpackTaskInstanceDTO>> listPager = instancesGrid(0, 0, request);
List<XpackTaskInstanceDTO> instanceDTOS = listPager.getListObject();
ExcelSheetModel excelSheetModel = excelSheetModel(instanceDTOS);
List<ExcelSheetModel> sheetModels = new ArrayList<>();
sheetModels.add(excelSheetModel);
File file = ExcelUtils.exportExcel(sheetModels, null, null);
InputStream inputStream = new FileInputStream(file);
HttpServletResponse response = ServletUtils.response();
OutputStream outputStream = response.getOutputStream();
try {
String filename = file.getName();
response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
response.setContentType("application/octet-stream;charset=UTF-8");
response.addHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(filename, "UTF-8"));
ServletOutputStream outputStream = response.getOutputStream();
byte[] buff = new byte[1024];
BufferedInputStream bis = null;
// 读取文件
bis = new BufferedInputStream(inputStream);
int i = bis.read(buff);
while (i != -1) {
outputStream.write(buff, 0, buff.length);
outputStream.flush();
i = bis.read(buff);
Workbook wb = new SXSSFWorkbook();
Sheet detailsSheet = wb.createSheet(excelSheetModel.getSheetName());
CellStyle cellStyle = wb.createCellStyle();
Font font = wb.createFont();
//设置字体大小
font.setFontHeightInPoints((short) 12);
//设置字体加粗
font.setBold(true);
//给字体设置样式
cellStyle.setFont(font);
//设置单元格背景颜色
cellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
//设置单元格填充样式(使用纯色背景颜色填充)
cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
List<List<String>> details = null;
if (CollectionUtils.isNotEmpty(details = excelSheetModel.getData())) {
details.add(0, excelSheetModel.getHeads());
for (int i = 0; i < details.size(); i++) {
Row row = detailsSheet.createRow(i);
List<String> rowData = details.get(i);
if (rowData != null) {
for (int j = 0; j < rowData.size(); j++) {
Cell cell = row.createCell(j);
cell.setCellValue(rowData.get(j));
if (i == 0) {// 头部
detailsSheet.setColumnWidth(j, 255 * 20);
cell.setCellStyle(cellStyle);
}
}
}
}
}
response.setContentType("application/vnd.ms-excel");
//文件名称
String fileName = excelSheetModel.getSheetName();
String encodeFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8);
response.setHeader("Content-disposition", "attachment;filename=" + encodeFileName + ".xlsx");
wb.write(outputStream);
outputStream.flush();
outputStream.close();
inputStream.close();
} catch (IOException ex) {
ex.printStackTrace();
} finally {
if (file.exists())
FileUtil.del(file);
} catch (Exception e) {
DataEaseException.throwException(e);
}
}

4
core/backend/src/main/java/io/dataease/provider/DDLProviderImpl.java
View File

@ -2,6 +2,8 @@ package io.dataease.provider;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.datasource.provider.DDLProvider;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
@ -30,7 +32,7 @@ public class DDLProviderImpl extends DDLProvider {
}
@Override
public String createTableSql(String name, List<DatasetTableField> datasetTableFields, Datasource engine, String version) {
public String createTableSql(DataTableInfoDTO dataTableInfoDTO, String name, List<DatasetTableField> datasetTableFields, Datasource engine, String version) {
return null;
}

24
core/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
View File

@ -11,26 +11,23 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import io.dataease.controller.sys.response.BasicInfo;
import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.dto.dataset.DatasetTableFieldDTO;
import io.dataease.plugins.common.dto.datasource.TableDesc;
import io.dataease.plugins.common.dto.datasource.TableField;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.datasource.entity.Status;
import io.dataease.plugins.datasource.provider.Provider;
import com.jayway.jsonpath.JsonPath;
import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.plugins.common.util.HttpClientConfig;
import io.dataease.plugins.common.util.HttpClientUtil;
import io.dataease.controller.request.datasource.ApiDefinition;
import io.dataease.controller.request.datasource.ApiDefinitionRequest;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
@ -106,6 +103,13 @@ public class ApiProvider extends Provider {
return tableFields;
}
@Override
public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception {
Status status = new Status();
status.setStatus(checkStatus(datasourceRequest));
return status;
}
public String checkStatus(DatasourceRequest datasourceRequest) throws Exception {
Gson gson = new Gson();
List<ApiDefinition> apiDefinitionList = gson.fromJson(datasourceRequest.getDatasource().getConfiguration(), new TypeToken<List<ApiDefinition>>() {
@ -243,9 +247,9 @@ public class ApiProvider extends Provider {
rootPath = "$[*]";
JsonNode jsonArray = null;
try {
jsonArray = new ObjectMapper().readTree(response);
jsonArray = CommonBeanFactory.getBean(ObjectMapper.class).readTree(response);
} catch (Exception e) {
e.printStackTrace();
DataEaseException.throwException(e.getMessage());
}
for (Object o : jsonArray) {
handleStr(apiDefinition, o.toString(), fields, rootPath);

14
core/backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
View File

@ -2,8 +2,8 @@ package io.dataease.provider.datasource;
import com.google.gson.Gson;
import com.google.gson.JsonParser;
import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.plugins.common.util.HttpClientConfig;
import io.dataease.plugins.common.util.HttpClientUtil;
import io.dataease.controller.request.datasource.es.EsResponse;
import io.dataease.controller.request.datasource.es.Request;
import io.dataease.controller.request.datasource.es.RequestWithCursor;
@ -14,6 +14,7 @@ import io.dataease.plugins.common.dto.datasource.TableDesc;
import io.dataease.plugins.common.dto.datasource.TableField;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.datasource.entity.Status;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.provider.query.es.EsQueryProvider;
import org.apache.commons.codec.binary.Base64;
@ -181,7 +182,7 @@ public class EsProvider extends Provider {
}
for (String[] row : esResponse.getRows()) {
if(!row[1].equalsIgnoreCase("STRUCT") && !row[2].equalsIgnoreCase("unsupported")){
if (!row[1].equalsIgnoreCase("STRUCT") && !row[2].equalsIgnoreCase("unsupported")) {
TableField field = new TableField();
field.setFieldName(row[0]);
field.setRemarks(row[0]);
@ -251,6 +252,13 @@ public class EsProvider extends Provider {
return new ArrayList<>();
}
@Override
public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception {
Status status = new Status();
status.setStatus(checkStatus(datasourceRequest));
return status;
}
@Override
public String checkStatus(DatasourceRequest datasourceRequest) throws Exception {

109
core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -5,7 +5,6 @@ import com.alibaba.druid.pool.DruidPooledConnection;
import com.google.gson.Gson;
import io.dataease.commons.utils.LogUtil;
import io.dataease.dto.datasource.*;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.plugins.common.base.domain.DeDriver;
@ -18,10 +17,11 @@ import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.datasource.entity.JdbcConfiguration;
import io.dataease.plugins.datasource.entity.Status;
import io.dataease.plugins.datasource.provider.DefaultJdbcProvider;
import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.provider.ProviderFactory;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -104,6 +104,42 @@ public class JdbcProvider extends DefaultJdbcProvider {
OracleConfiguration oracleConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), OracleConfiguration.class);
schemaPattern = oracleConfiguration.getSchema();
}
//获取主键
ResultSet primaryKeys = databaseMetaData.getPrimaryKeys(null, schemaPattern, tableNamePattern);
Set<String> primaryKeySet = new HashSet<>();
while (primaryKeys.next()) {
String tableName = primaryKeys.getString("TABLE_NAME");
String database;
String schema = primaryKeys.getString("TABLE_SCHEM");
if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name()) || datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.ck.name())
|| datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.impala.name())) {
database = primaryKeys.getString("TABLE_SCHEM");
} else {
database = primaryKeys.getString("TABLE_CAT");
}
//获取主键的名称
if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name())) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDsSchema(datasourceRequest))) {
primaryKeySet.add(primaryKeys.getString("COLUMN_NAME"));
}
} else if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest)) && schema.equalsIgnoreCase(getDsSchema(datasourceRequest))) {
primaryKeySet.add(primaryKeys.getString("COLUMN_NAME"));
}
} else {
if (database != null) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) {
primaryKeySet.add(primaryKeys.getString("COLUMN_NAME"));
}
} else {
if (tableName.equals(datasourceRequest.getTable())) {
primaryKeySet.add(primaryKeys.getString("COLUMN_NAME"));
}
}
}
}
ResultSet resultSet = databaseMetaData.getColumns(null, schemaPattern, tableNamePattern, "%");
while (resultSet.next()) {
String tableName = resultSet.getString("TABLE_NAME");
@ -117,23 +153,23 @@ public class JdbcProvider extends DefaultJdbcProvider {
}
if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.pg.name())) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDsSchema(datasourceRequest))) {
TableField tableField = getTableFiled(resultSet, datasourceRequest);
TableField tableField = getTableFiled(resultSet, datasourceRequest, primaryKeySet);
list.add(tableField);
}
} else if (datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest)) && schema.equalsIgnoreCase(getDsSchema(datasourceRequest))) {
TableField tableField = getTableFiled(resultSet, datasourceRequest);
TableField tableField = getTableFiled(resultSet, datasourceRequest, primaryKeySet);
list.add(tableField);
}
} else {
if (database != null) {
if (tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))) {
TableField tableField = getTableFiled(resultSet, datasourceRequest);
TableField tableField = getTableFiled(resultSet, datasourceRequest, primaryKeySet);
list.add(tableField);
}
} else {
if (tableName.equals(datasourceRequest.getTable())) {
TableField tableField = getTableFiled(resultSet, datasourceRequest);
TableField tableField = getTableFiled(resultSet, datasourceRequest, primaryKeySet);
list.add(tableField);
}
}
@ -155,7 +191,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
return list;
}
private TableField getTableFiled(ResultSet resultSet, DatasourceRequest datasourceRequest) throws SQLException {
private TableField getTableFiled(ResultSet resultSet, DatasourceRequest datasourceRequest, Set<String> primaryKeySet) throws SQLException {
TableField tableField = new TableField();
String colName = resultSet.getString("COLUMN_NAME");
tableField.setFieldName(colName);
@ -196,6 +232,14 @@ public class JdbcProvider extends DefaultJdbcProvider {
if (StringUtils.isNotEmpty(tableField.getFieldType()) && tableField.getFieldType().equalsIgnoreCase("DECIMAL")) {
tableField.setAccuracy(Integer.valueOf(resultSet.getString("DECIMAL_DIGITS")));
}
if (primaryKeySet.contains(colName)) {
tableField.setPrimaryKey(true);
}
if (StringUtils.equalsIgnoreCase(resultSet.getString("IS_NULLABLE"), "NO")) {
tableField.setNotNull(true);
}
return tableField;
}
@ -294,7 +338,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
break;
case Types.NUMERIC:
BigDecimal bigDecimal = rs.getBigDecimal(j + 1);
row[j] = bigDecimal == null ? null: bigDecimal.toString();
row[j] = bigDecimal == null ? null : bigDecimal.toString();
break;
default:
if (metaData.getColumnTypeName(j + 1).toLowerCase().equalsIgnoreCase("blob")) {
@ -369,6 +413,22 @@ public class JdbcProvider extends DefaultJdbcProvider {
return list;
}
@Override
public Status checkDsStatus(DatasourceRequest datasourceRequest) throws Exception {
Status status = new Status();
String queryStr = getTablesSql(datasourceRequest);
JdbcConfiguration jdbcConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), JdbcConfiguration.class);
int queryTimeout = jdbcConfiguration.getQueryTimeout() > 0 ? jdbcConfiguration.getQueryTimeout() : 0;
try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) {
status.setVersion(String.valueOf(con.getMetaData().getDatabaseMajorVersion()));
} catch (Exception e) {
LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e);
DataEaseException.throwException(e.getMessage());
}
status.setStatus("Success");
return status;
}
@Override
public String checkStatus(DatasourceRequest datasourceRequest) throws Exception {
String queryStr = getTablesSql(datasourceRequest);
@ -377,7 +437,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
try (Connection con = getConnection(datasourceRequest); Statement statement = getStatement(con, queryTimeout); ResultSet resultSet = statement.executeQuery(queryStr)) {
} catch (Exception e) {
LogUtil.error("Datasource is invalid: " + datasourceRequest.getDatasource().getName(), e);
io.dataease.plugins.common.exception.DataEaseException.throwException(e.getMessage());
DataEaseException.throwException(e.getMessage());
}
return "Success";
}
@ -521,7 +581,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
driverClassName = defaultDriver;
jdbcClassLoader = extendedJdbcClassLoader;
for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) {
if(value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())){
if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) {
surpportVersions = value.getSurpportVersions();
}
}
@ -546,10 +606,11 @@ public class JdbcProvider extends DefaultJdbcProvider {
Thread.currentThread().setContextClassLoader(classLoader);
}
if(StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0){
if(! Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))){
if (StringUtils.isNotEmpty(surpportVersions) && surpportVersions.split(",").length > 0) {
if (!Arrays.asList(surpportVersions.split(",")).contains(String.valueOf(conn.getMetaData().getDatabaseMajorVersion()))) {
DataEaseException.throwException("当前驱动不支持此版本!");
};
}
;
}
return conn;
}
@ -681,7 +742,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
throw new Exception(Translator.get("i18n_schema_is_empty"));
}
return "select table_name, owner, comments from all_tab_comments where owner='" + oracleConfiguration.getSchema() + "' AND table_type = 'TABLE'";
case pg:
case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class);
if (StringUtils.isEmpty(pgConfiguration.getSchema())) {
throw new Exception(Translator.get("i18n_schema_is_empty"));
@ -804,58 +865,58 @@ public class JdbcProvider extends DefaultJdbcProvider {
case StarRocks:
MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
mysqlConfiguration.getJdbc();
if(!mysqlConfiguration.getDataBase().matches("^[ 0-9a-zA-Z_.-]{1,}$")){
if (!mysqlConfiguration.getDataBase().matches("^[ 0-9a-zA-Z_.-]{1,}$")) {
throw new Exception("Invalid database name");
}
break;
case redshift:
RedshiftConfiguration redshiftConfiguration = new Gson().fromJson(datasource.getConfiguration(), RedshiftConfiguration.class);
if(redshiftConfiguration.getDataBase().length() > 64 || redshiftConfiguration.getDataBase().length() < 1){
if (redshiftConfiguration.getDataBase().length() > 64 || redshiftConfiguration.getDataBase().length() < 1) {
throw new Exception("Invalid database name");
}
if(!redshiftConfiguration.getDataBase().matches("^[a-z][a-z0-9_+.@-]*$")){
if (!redshiftConfiguration.getDataBase().matches("^[a-z][a-z0-9_+.@-]*$")) {
throw new Exception("Invalid database name");
}
break;
case sqlServer:
SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfiguration.class);
if(!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z-_.\u4E00-\u9FA5\u8FBD-\u9FBB\uFA0E-\uFA29\u2e80-\u9fff]{1,}$")){
if (!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z-_.\u4E00-\u9FA5\u8FBD-\u9FBB\uFA0E-\uFA29\u2e80-\u9fff]{1,}$")) {
throw new Exception("Invalid database name");
}
break;
case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class);
if(!pgConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
if (!pgConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")) {
throw new Exception("Invalid database name");
}
break;
case oracle:
OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class);
if(!oracleConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$") && !oracleConfiguration.getConnectionType().equalsIgnoreCase("serviceName")){
if (!oracleConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$") && !oracleConfiguration.getConnectionType().equalsIgnoreCase("serviceName")) {
throw new Exception("Invalid database name");
}
break;
case mongo:
MongodbConfiguration mongodbConfiguration = new Gson().fromJson(datasource.getConfiguration(), MongodbConfiguration.class);
if(!mongodbConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
if (!mongodbConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")) {
throw new Exception("Invalid database name");
}
break;
case impala:
ImpalaConfiguration impalaConfiguration = new Gson().fromJson(datasource.getConfiguration(), ImpalaConfiguration.class);
if(!impalaConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
if (!impalaConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")) {
throw new Exception("Invalid database name");
}
break;
case hive:
HiveConfiguration hiveConfiguration = new Gson().fromJson(datasource.getConfiguration(), HiveConfiguration.class);
if(!hiveConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
if (!hiveConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")) {
throw new Exception("Invalid database name");
}
break;
case db2:
Db2Configuration db2Configuration = new Gson().fromJson(datasource.getConfiguration(), Db2Configuration.class);
if(!db2Configuration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
if (!db2Configuration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")) {
throw new Exception("Invalid database name");
}
break;

85
core/backend/src/main/java/io/dataease/provider/engine/doris/DorisDDLProvider.java
View File

@ -1,14 +1,18 @@
package io.dataease.provider.engine.doris;
import com.google.gson.Gson;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.commons.utils.TableUtils;
import io.dataease.dto.datasource.DorisConfiguration;
import io.dataease.provider.DDLProviderImpl;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* @Author gin
@ -18,8 +22,8 @@ import java.util.List;
public class DorisDDLProvider extends DDLProviderImpl {
private static final String creatTableSql = "CREATE TABLE IF NOT EXISTS `TABLE_NAME`" +
"Column_Fields" +
"UNIQUE KEY(dataease_uuid)\n" +
"DISTRIBUTED BY HASH(dataease_uuid) BUCKETS BUCKETS_NUM\n" +
"UNIQUE KEY(`UNIQUE_KEY`)\n" +
"DISTRIBUTED BY HASH(`DISTRIBUTED_BY_HASH`) BUCKETS BUCKETS_NUM\n" +
"PROPERTIES(\"replication_num\" = \"ReplicationNum\");";
@Override
@ -38,22 +42,55 @@ public class DorisDDLProvider extends DDLProviderImpl {
}
@Override
public String replaceTable(String name){
return "ALTER TABLE DORIS_TABLE REPLACE WITH TABLE DORIS_TMP_TABLE PROPERTIES('swap' = 'false')"
.replace("DORIS_TABLE", name).replace("DORIS_TMP_TABLE", TableUtils.tmpName(name));
public String replaceTable(String name) {
return "ALTER TABLE DORIS_TABLE REPLACE WITH TABLE DORIS_TMP_TABLE PROPERTIES('swap' = 'false')"
.replace("DORIS_TABLE", name).replace("DORIS_TMP_TABLE", TableUtils.tmpName(name));
}
@Override
public String createTableSql(String tableName, List<DatasetTableField> datasetTableFields, Datasource engine, String version) {
public String createTableSql(DataTableInfoDTO dataTableInfoDTO, String tableName, List<DatasetTableField> datasetTableFields, Datasource engine, String version) {
DorisConfiguration dorisConfiguration = new Gson().fromJson(engine.getConfiguration(), DorisConfiguration.class);
String dorisTableColumnSql = createDorisTableColumnSql(datasetTableFields, version);
return creatTableSql.replace("TABLE_NAME", tableName).replace("Column_Fields", dorisTableColumnSql)
String sql = creatTableSql.replace("TABLE_NAME", tableName)
.replace("BUCKETS_NUM", dorisConfiguration.getBucketNum().toString())
.replace("ReplicationNum", dorisConfiguration.getReplicationNum().toString());
if (dataTableInfoDTO.isSetKey() && CollectionUtils.isNotEmpty(dataTableInfoDTO.getKeys())) {
List<String> keys = new ArrayList<>();
for (int i = 0; i < dataTableInfoDTO.getKeys().size(); i++) {
for (DatasetTableField datasetTableField : datasetTableFields) {
if (datasetTableField.getOriginName().equalsIgnoreCase(dataTableInfoDTO.getKeys().get(i))) {
keys.add(datasetTableField.getDataeaseName());
}
}
}
sql = sql.replace("`UNIQUE_KEY`", "`" + String.join("`, `", keys) + "`")
.replace("DISTRIBUTED_BY_HASH", keys.get(0)).replace("Column_Fields", createDorisTableColumnSql(datasetTableFields, version, keys));
} else {
if (!datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()).contains("dataease_uuid")) {
List<DatasetTableField> tempList = new ArrayList<>();
DatasetTableField datasetTableField = new DatasetTableField();
datasetTableField.setDeExtractType(0);
datasetTableField.setType("String");
datasetTableField.setDeType(0);
datasetTableField.setDataeaseName("dataease_uuid");
datasetTableField.setOriginName("dataease_uuid");
datasetTableField.setSize(50);
tempList.add(0, datasetTableField);
for (int i = 0; i < datasetTableFields.size(); i++) {
tempList.add(datasetTableFields.get(i));
}
sql = sql.replace("UNIQUE_KEY", "dataease_uuid").replace("DISTRIBUTED_BY_HASH", "dataease_uuid").replace("Column_Fields", createDorisTableColumnSql(tempList, version, null));
} else {
sql = sql.replace("UNIQUE_KEY", "dataease_uuid").replace("DISTRIBUTED_BY_HASH", "dataease_uuid").replace("Column_Fields", createDorisTableColumnSql(datasetTableFields, version, null));
}
}
return sql;
}
private String createDorisTableColumnSql(final List<DatasetTableField> datasetTableFields, String version) {
StringBuilder Column_Fields = new StringBuilder("dataease_uuid varchar(50), `");
private String createDorisTableColumnSql(final List<DatasetTableField> datasetTableFields, String version, List<String> keys) {
StringBuilder Column_Fields = new StringBuilder("`");
for (DatasetTableField datasetTableField : datasetTableFields) {
Column_Fields.append(datasetTableField.getDataeaseName()).append("` ");
Integer size = datasetTableField.getSize() * 3;
@ -62,26 +99,30 @@ public class DorisDDLProvider extends DDLProviderImpl {
}
switch (datasetTableField.getDeExtractType()) {
case 0:
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
if (size <= 65533 || (keys != null && keys.contains(datasetTableField.getDataeaseName()))) {
Column_Fields.append("VARCHAR(length)".replace("length", String.valueOf(size))).append(",`");
} else {
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
}
break;
case 1:
size = size < 50? 50 : size;
Column_Fields.append("STRING".replace("length", String.valueOf(size))).append(",`");
Column_Fields.append("DATETIME").append(",`");
break;
case 2:
Column_Fields.append("bigint").append(",`");
break;
case 3:
if(datasetTableField.getType().equalsIgnoreCase("DECIMAL") && datasetTableField.getAccuracy() != 0){
if(Integer.valueOf(version.split("5.7.")[1]) < 99){
Column_Fields.append("DECIMAL(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`");
}else {
Column_Fields.append("DecimalV3(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`");
}
if (datasetTableField.getType().equalsIgnoreCase("DECIMAL") && datasetTableField.getAccuracy() != 0) {
if (Integer.valueOf(version.split("5.7.")[1]) < 99) {
Integer p = datasetTableField.getAccuracy() > 9 ? 9 : datasetTableField.getAccuracy();
Column_Fields.append("DECIMAL(" + datasetTableField.getSize() + "," + p + ")").append(",`");
} else {
Column_Fields.append("DecimalV3(" + datasetTableField.getSize() + "," + datasetTableField.getAccuracy() + ")").append(",`");
}
}else {
Column_Fields.append("DOUBLE").append(",`");
}
} else {
Column_Fields.append("DECIMAL(27,8)").append(",`");
}
break;
case 4:
Column_Fields.append("TINYINT(length)".replace("length", String.valueOf(size))).append(",`");

47
core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -28,6 +28,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -777,12 +778,15 @@ public class DorisQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -823,21 +827,29 @@ public class DorisQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(DorisConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(DorisConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(DorisConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(DorisConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -849,6 +861,9 @@ public class DorisQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤
@ -1340,7 +1355,7 @@ public class DorisQueryProvider extends QueryProvider {
if (field.getDeType() == 1) {
String format = transDateFormat(request.getDateStyle(), request.getDatePattern());
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT);
if (field.getType().equalsIgnoreCase("YEAR") || StringUtils.equalsIgnoreCase(field.getDateFormat(), "%Y")) {
date = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + date + ",'-01-01')", "%Y-01-01");
@ -1351,6 +1366,16 @@ public class DorisQueryProvider extends QueryProvider {
whereName = String.format(MySQLConstants.DATE_FORMAT, date, format);
}
}
if (field.getDeExtractType() == 1) {
String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT);
if (field.getType().equalsIgnoreCase("YEAR") || StringUtils.equalsIgnoreCase(field.getDateFormat(), "%Y")) {
date = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + date + ",'-01-01')", "%Y-01-01");
whereName = String.format(MySQLConstants.DATE_FORMAT, date, format);
}else {
whereName = originName;
}
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
if (request.getOperator().equals("between")) {
whereName = originName;

3
core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlDDLProvider.java
View File

@ -1,5 +1,6 @@
package io.dataease.provider.engine.mysql;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.base.domain.Datasource;
import io.dataease.commons.utils.TableUtils;
@ -71,7 +72,7 @@ public class MysqlDDLProvider extends DDLProviderImpl {
}
@Override
public String createTableSql(String tableName, List<DatasetTableField> datasetTableFields, Datasource engine, String version) {
public String createTableSql(DataTableInfoDTO dataTableInfoDTO, String tableName, List<DatasetTableField> datasetTableFields, Datasource engine, String version) {
String dorisTableColumnSql = createDorisTableColumnSql(datasetTableFields);
return creatTableSql.replace("TABLE_NAME", tableName).replace("Column_Fields", dorisTableColumnSql);
}

41
core/backend/src/main/java/io/dataease/provider/engine/mysql/MysqlQueryProvider.java
View File

@ -28,6 +28,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -383,12 +384,15 @@ public class MysqlQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -431,22 +435,29 @@ public class MysqlQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(MysqlConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(MysqlConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(MysqlConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(MysqlConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -458,6 +469,9 @@ public class MysqlQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤
@ -1300,7 +1314,7 @@ public class MysqlQueryProvider extends QueryProvider {
if (field.getDeType() == 1) {
String format = transDateFormat(request.getDateStyle(), request.getDatePattern());
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT);
if (request.getOperator().equals("between")) {
whereName = date;
@ -1308,6 +1322,9 @@ public class MysqlQueryProvider extends QueryProvider {
whereName = String.format(MySQLConstants.DATE_FORMAT, date, format);
}
}
if (field.getDeExtractType() == 1) {
whereName = originName;
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
if (request.getOperator().equals("between")) {
whereName = originName;

35
core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
View File

@ -27,6 +27,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -771,12 +772,15 @@ public class CKQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -817,21 +821,29 @@ public class CKQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(CKConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(CKConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(CKConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(CKConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -843,6 +855,9 @@ public class CKQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤

35
core/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
View File

@ -29,6 +29,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -756,12 +757,15 @@ public class Db2QueryProvider extends QueryProvider {
.build();
setSchema(tableObj, ds);
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -802,21 +806,29 @@ public class Db2QueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(Db2Constants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(Db2Constants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(Db2Constants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(Db2Constants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -828,6 +840,9 @@ public class Db2QueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤

39
core/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
View File

@ -25,6 +25,7 @@ import io.dataease.plugins.datasource.entity.Dateformat;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -771,12 +772,15 @@ public class EsQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -827,21 +831,29 @@ public class EsQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(EsSqlLConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(EsSqlLConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(EsSqlLConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(EsSqlLConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -853,6 +865,9 @@ public class EsQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤
@ -1342,7 +1357,7 @@ public class EsQueryProvider extends QueryProvider {
whereName = String.format(EsSqlLConstants.DATETIME_FORMAT, cast, format);
}
if (field.getDeExtractType() == 1) {
whereName = String.format(EsSqlLConstants.DATETIME_FORMAT, originName, format);
whereName = originName;
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
@ -1605,7 +1620,7 @@ public class EsQueryProvider extends QueryProvider {
"{\"dateformat\": \"yyyy/MMdd\"},\n" +
"{\"dateformat\": \"yyyy-MM-dd\"},\n" +
"{\"dateformat\": \"yyyyMMdd HH:mm:ss\"},\n" +
"{\"dateformat\": \"yyyy/MMdd HH:mm:ss\"},\n" +
"{\"dateformat\": \"yyyy/MM/dd HH:mm:ss\"},\n" +
"{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" +
"]", Dateformat.class);
}

42
core/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
View File

@ -26,6 +26,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -720,12 +721,15 @@ public class HiveQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -766,21 +770,29 @@ public class HiveQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(HiveConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(HiveConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(HiveConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(HiveConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -792,6 +804,9 @@ public class HiveQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤
@ -1299,12 +1314,7 @@ public class HiveQueryProvider extends QueryProvider {
whereName = String.format(HiveConstants.FROM_UNIXTIME, cast, format);
}
if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
if (request.getOperator().equals("between")) {
whereName = originName;
} else {
whereName = String.format(HiveConstants.DATE_FORMAT, originName, format);
}
whereName = originName;
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {

41
core/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
View File

@ -26,6 +26,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -724,12 +725,15 @@ public class ImpalaQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -770,21 +774,29 @@ public class ImpalaQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(ImpalaConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(ImpalaConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(ImpalaConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(ImpalaConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -796,6 +808,9 @@ public class ImpalaQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
@ -1314,11 +1329,7 @@ public class ImpalaQueryProvider extends QueryProvider {
}
}
if (field.getDeExtractType() == DeTypeConstants.DE_TIME) {
if (request.getOperator().equals("between")) {
whereName = originName;
} else {
whereName = String.format(ImpalaConstants.DATE_FORMAT, originName, format);
}
whereName = originName;
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {

36
core/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
View File

@ -26,6 +26,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -696,12 +697,15 @@ public class MongoQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -742,22 +746,31 @@ public class MongoQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(MongoConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(MongoConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(MongoConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(MongoConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
if (StringUtils.isNotEmpty(x.getSort()) && Utils.joinSort(x.getSort())) {
xOrders.add(SQLObj.builder()
@ -767,6 +780,9 @@ public class MongoQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤

54
core/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@ -27,6 +27,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -69,6 +70,8 @@ public class MysqlQueryProvider extends QueryProvider {
case "TIME":
case "YEAR":
case "DATETIME":
case "DATEV2":
case "DATETIMEV2":
case "TIMESTAMP":
return 1;// 时间
case "INT":
@ -417,12 +420,15 @@ public class MysqlQueryProvider extends QueryProvider {
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
.build();
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -463,21 +469,29 @@ public class MysqlQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(MySQLConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(MySQLConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(MySQLConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(MySQLConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -489,6 +503,9 @@ public class MysqlQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤
@ -1330,7 +1347,7 @@ public class MysqlQueryProvider extends QueryProvider {
if (field.getDeType() == 1) {
String format = transDateFormat(request.getDateStyle(), request.getDatePattern());
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
String date;
if (field.getType().equalsIgnoreCase("YEAR") || StringUtils.equalsIgnoreCase(field.getDateFormat(), "%Y")) {
date = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originName + ",'-01-01')", StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MySQLConstants.DEFAULT_DATE_FORMAT);
@ -1350,6 +1367,21 @@ public class MysqlQueryProvider extends QueryProvider {
}
}
if (field.getDeExtractType() == 1) {
String date;
if (field.getType().equalsIgnoreCase("YEAR") || StringUtils.equalsIgnoreCase(field.getDateFormat(), "%Y")) {
date = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originName + ",'-01-01')", StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MySQLConstants.DEFAULT_DATE_FORMAT);
} else {
date = originName;
}
if (StringUtils.equalsIgnoreCase(request.getDateStyle(), "y_Q")) {
whereName = String.format(format,
String.format(MySQLConstants.DATE_FORMAT, originName, "%Y"),
String.format(MySQLConstants.QUARTER, String.format(MySQLConstants.DATE_FORMAT, originName, MySQLConstants.DEFAULT_DATE_FORMAT)));
} else {
whereName = date;
}
}
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
if (request.getOperator().equals("between")) {
whereName = originName;

41
core/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -30,6 +30,7 @@ import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import io.dataease.service.chart.ChartFilterTreeService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -826,12 +827,15 @@ public class OracleQueryProvider extends QueryProvider {
.build();
setSchema(tableObj, ds);
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -872,21 +876,29 @@ public class OracleQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i));
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(OracleConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(OracleConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(OracleConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(OracleConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -898,6 +910,9 @@ public class OracleQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
@ -1488,11 +1503,7 @@ public class OracleQueryProvider extends QueryProvider {
}
}
if (field.getDeExtractType() == 1) {
if (!request.getOperator().equals("between")) {
whereName = String.format(OracleConstants.TO_CHAR, originName, format);
} else {
whereName = originName;
}
whereName = originName;
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {

42
core/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -29,6 +29,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -755,12 +756,15 @@ public class PgQueryProvider extends QueryProvider {
.build();
setSchema(tableObj, ds);
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -801,21 +805,29 @@ public class PgQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(PgConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(PgConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(PgConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(PgConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -827,6 +839,9 @@ public class PgQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
// 处理视图中字段过滤
@ -1339,12 +1354,7 @@ public class PgQueryProvider extends QueryProvider {
}
}
if (field.getDeExtractType() == 1) {
if (request.getOperator().equals("between")) {
whereName = originName;
} else {
whereName = String.format(PgConstants.DATE_FORMAT, originName, format);
}
whereName = originName;
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {

41
core/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
View File

@ -27,6 +27,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -756,12 +757,15 @@ public class RedshiftQueryProvider extends QueryProvider {
.build();
setSchema(tableObj, ds);
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -802,21 +806,29 @@ public class RedshiftQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(PgConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(PgConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(PgConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(PgConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -828,6 +840,9 @@ public class RedshiftQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
@ -1325,11 +1340,7 @@ public class RedshiftQueryProvider extends QueryProvider {
}
}
if (field.getDeExtractType() == 1) {
if (request.getOperator().equals("between")) {
whereName = originName;
} else {
whereName = String.format(PgConstants.DATE_FORMAT, originName, format);
}
whereName = originName;
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {

84
core/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -28,6 +28,7 @@ import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.datasource.query.Utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -72,6 +73,7 @@ public class SqlserverQueryProvider extends QueryProvider {
case "DATETIME":
case "DATETIME2":
case "DATETIMEOFFSET":
case "SMALLDATETIME":
return DeTypeConstants.DE_TIME;// 时间
case "INT":
case "MEDIUMINT":
@ -83,6 +85,7 @@ public class SqlserverQueryProvider extends QueryProvider {
case "DOUBLE":
case "DECIMAL":
case "MONEY":
case "REAL":
case "NUMERIC":
return DeTypeConstants.DE_FLOAT;// 浮点
case "BIT":
@ -436,10 +439,10 @@ public class SqlserverQueryProvider extends QueryProvider {
@Override
public String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
return originTableInfo(table, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, true);
return originTableInfo(table, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, true, false);
}
public String originTableInfo(String table, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, boolean needOrder, boolean needResultCount) {
public String originTableInfo(String table, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, boolean needOrder, boolean needResultCount, boolean ignoreOrder) {
SQLObj tableObj = SQLObj.builder()
.tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
.tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@ -493,13 +496,15 @@ public class SqlserverQueryProvider extends QueryProvider {
groups.addAll(xFields);
// 外层再次套sql
List<SQLObj> orders = new ArrayList<>();
orders.addAll(xOrders);
if (needOrder && CollectionUtils.isEmpty(xOrders)) {
orders.add(SQLObj.builder()
.orderField(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, 0))
.orderAlias(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, 0))
.orderDirection("ASC")
.build());
if (!ignoreOrder) {
orders.addAll(xOrders);
if (needOrder && CollectionUtils.isEmpty(xOrders)) {
orders.add(SQLObj.builder()
.orderField(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, 0))
.orderAlias(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, 0))
.orderDirection("ASC")
.build());
}
}
STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
@ -525,18 +530,25 @@ public class SqlserverQueryProvider extends QueryProvider {
return st.render();
}
public String originSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, boolean needOrder) {
return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, null, view, needOrder, true);
public String originSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, boolean needOrder, boolean ignoreOrder) {
return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, null, view, needOrder, true, ignoreOrder);
}
@Override
public String getSQLWithPage(boolean isTable, String sql, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view, PageInfo pageInfo) {
boolean isPage = (pageInfo.getGoPage() != null && pageInfo.getPageSize() != null);
String limit = (isPage ? " OFFSET " + (pageInfo.getGoPage() - 1) * pageInfo.getPageSize() + " ROW FETCH NEXT " + pageInfo.getPageSize() + " ROW ONLY " : "");
if (isTable) {
return originTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage) + limit;
if (Integer.valueOf(ds.getVersion()) < 11) {
if (isTable) {
return getSQLTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view);
} else {
return getSQLAsTmpTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view);
}
} else {
return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage) + limit;
boolean isPage = (pageInfo.getGoPage() != null && pageInfo.getPageSize() != null);
String limit = (isPage ? " OFFSET " + (pageInfo.getGoPage() - 1) * pageInfo.getPageSize() + " ROW FETCH NEXT " + pageInfo.getPageSize() + " ROW ONLY " : "");
if (isTable) {
return originTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage, false) + limit;
} else {
return originTableInfo("(" + sqlFix(sql) + ")", xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, true, !isPage, false) + limit;
}
}
}
@ -835,12 +847,15 @@ public class SqlserverQueryProvider extends QueryProvider {
.build();
setSchema(tableObj, ds);
List<SQLObj> xFields = new ArrayList<>();
List<SQLObj> xFields2Tail = new ArrayList<>();
List<SQLObj> xOrders = new ArrayList<>();
List<SQLObj> yFields = new ArrayList<>(); // 要把两个时间字段放进y里面
List<String> yWheres = new ArrayList<>();
List<SQLObj> yOrders = new ArrayList<>();
boolean ifAggregate = BooleanUtils.isTrue(view.getAggregate());
if (CollectionUtils.isNotEmpty(xAxis)) {
for (int i = 0; i < xAxis.size(); i++) {
ChartViewFieldDTO x = xAxis.get(i);
@ -881,21 +896,29 @@ public class SqlserverQueryProvider extends QueryProvider {
}
String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
if (ifAggregate) {
if (i == baseXAxis.size()) {// 起止时间
String fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, "min", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, "max", originField);
} else if (i == baseXAxis.size() + 1) {
String fieldName = String.format(SqlServerSQLConstants.AGG_FIELD, "max", originField);
yFields.add(getXFields(x, fieldName, fieldAlias));
yFields.add(getXFields(x, fieldName, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
yWheres.add(getYWheres(x, originField, fieldAlias));
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
}
} else {
// 处理横轴字段
xFields.add(getXFields(x, originField, fieldAlias));
if (i == baseXAxis.size() || i == baseXAxis.size() + 1) {// 起止时间
xFields2Tail.add(getXFields(x, originField, fieldAlias));
} else {
xFields.add(getXFields(x, originField, fieldAlias));
}
}
// 处理横轴排序
@ -907,6 +930,9 @@ public class SqlserverQueryProvider extends QueryProvider {
.build());
}
}
if (!ifAggregate) { //把起止时间放到数组最后
xFields.addAll(xFields2Tail);
}
}
@ -1766,9 +1792,9 @@ public class SqlserverQueryProvider extends QueryProvider {
@Override
public String getResultCount(boolean isTable, String sql, List<ChartViewFieldDTO> xAxis, FilterTreeObj fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
if (isTable) {
return "SELECT COUNT(*) AS count from (" + originTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, false, true) + ") COUNT_TEMP";
return "SELECT COUNT(*) AS count from (" + originTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, false, true, true) + ") COUNT_TEMP";
} else {
return "SELECT COUNT(*) AS count from (" + originSQLAsTmpTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, false) + ") COUNT_TEMP";
return "SELECT COUNT(*) AS count from (" + originSQLAsTmpTableInfo(sql, xAxis, fieldCustomFilter, rowPermissionsTree, extFilterRequestList, ds, view, false, true) + ") COUNT_TEMP";
}
}
}

50
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -1,6 +1,5 @@
package io.dataease.service.chart;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
@ -19,7 +18,6 @@ import io.dataease.controller.response.DataSetDetail;
import io.dataease.dto.chart.*;
import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.ext.ExtChartGroupMapper;
import io.dataease.ext.ExtChartViewMapper;
import io.dataease.ext.ExtPanelGroupExtendDataMapper;
@ -36,6 +34,7 @@ import io.dataease.plugins.common.constants.datasource.SQLConstants;
import io.dataease.plugins.common.dto.chart.ChartFieldCompareDTO;
import io.dataease.plugins.common.dto.chart.ChartFieldCustomFilterDTO;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
@ -45,12 +44,12 @@ import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDT
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.datasource.entity.PageInfo;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.view.entity.*;
import io.dataease.plugins.view.entity.filter.PluginFilterTreeObj;
import io.dataease.plugins.view.service.ViewPluginService;
import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem;
import io.dataease.provider.ProviderFactory;
import io.dataease.provider.query.SQLUtils;
import io.dataease.service.chart.util.ChartDataBuild;
import io.dataease.service.dataset.*;
@ -66,6 +65,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import javax.annotation.Resource;
import java.lang.reflect.Type;
@ -294,7 +294,7 @@ public class ChartViewService {
if (ObjectUtils.isNotEmpty(datasetTable)) {
result.setDatasetMode(datasetTable.getMode());
Datasource datasource = datasourceService.get(datasetTable.getDataSourceId());
result.setDatasourceType(datasource != null ? datasource.getType() : null);
buildDsType(datasource, result);
}
return result;
} catch (Exception e) {
@ -322,7 +322,7 @@ public class ChartViewService {
if (ObjectUtils.isNotEmpty(datasetTable)) {
view.setDatasetMode(datasetTable.getMode());
Datasource datasource = datasourceService.get(datasetTable.getDataSourceId());
view.setDatasourceType(datasource != null ? datasource.getType() : null);
buildDsType(datasource, view);
}
// 如果是从仪表板获取视图数据，则仪表板的查询模式，查询结果的数量，覆盖视图对应的属性
if (CommonConstants.VIEW_RESULT_MODE.CUSTOM.equals(request.getResultMode())) {
@ -639,8 +639,6 @@ public class ChartViewService {
}
Type tokenType = new TypeToken<List<ChartViewFieldDTO>>() {
}.getType();
// Type filterTokenType = new TypeToken<List<ChartFieldCustomFilterDTO>>() {
// }.getType();
List<ChartViewFieldDTO> viewFields = gson.fromJson(view.getViewFields(), tokenType);
final Map<String, List<ChartViewFieldDTO>> extFieldsMap = new LinkedHashMap<>();
@ -709,7 +707,6 @@ public class ChartViewService {
//将没有权限的列删掉
List<String> dataeaseNames = columnPermissionFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList());
dataeaseNames.add("*");
// fieldCustomFilter = fieldCustomFilter.stream().filter(item -> chartViewFieldNameList.contains(item.getDataeaseName()) || (!desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList());
extStack = extStack.stream().filter(item -> chartViewFieldNameList.contains(item.getDataeaseName()) || (!desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList());
extBubble = extBubble.stream().filter(item -> chartViewFieldNameList.contains(item.getDataeaseName()) || (!desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList());
drill = drill.stream().filter(item -> chartViewFieldNameList.contains(item.getDataeaseName()) || (!desensitizationList.keySet().contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName()))).collect(Collectors.toList());
@ -717,9 +714,6 @@ public class ChartViewService {
//行权限
List<DataSetRowPermissionsTreeDTO> rowPermissionsTree = permissionsTreeService.getRowPermissionsTree(fields, table, chartExtRequest.getUser());
/*for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
ele.setField(dataSetTableFieldsService.get(ele.getId()));
}*/
chartFilterTreeService.searchFieldAndSet(fieldCustomFilter);
if (CollectionUtils.isEmpty(xAxis) && CollectionUtils.isEmpty(yAxis)) {
@ -1043,17 +1037,6 @@ public class ChartViewService {
assistFields = getAssistFields(dynamicAssistFields, yAxis, xAxis);
}
// 处理过滤条件中的单引号
/*fieldCustomFilter = fieldCustomFilter.stream().peek(ele -> {
if (CollectionUtils.isNotEmpty(ele.getEnumCheckField())) {
List<String> collect = ele.getEnumCheckField().stream().map(SQLUtils::transKeyword).collect(Collectors.toList());
ele.setEnumCheckField(collect);
}
if (CollectionUtils.isNotEmpty(ele.getFilter())) {
List<ChartCustomFilterItemDTO> collect = ele.getFilter().stream().peek(f -> f.setValue(SQLUtils.transKeyword(f.getValue()))).collect(Collectors.toList());
ele.setFilter(collect);
}
}).collect(Collectors.toList());*/
fieldCustomFilter = chartFilterTreeService.charReplace(fieldCustomFilter);
extFilterList = extFilterList.stream().peek(ele -> {
@ -1075,9 +1058,10 @@ public class ChartViewService {
});
xAxis.addAll(xAxisExtList);
}
fieldMap.put("xAxis", xAxis);
fieldMap.put("xAxisExt", xAxisExt);
fieldMap.put("extStack", extStack);
fieldMap.put("extBubble", extBubble);
fieldMap.put("xAxis", xAxis);
fieldMap.put("yAxis", yAxis);
PluginViewParam pluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, extFilterList, ds, table, view, rowPermissionsTree, chartExtRequest);
String sql = pluginViewSql(pluginViewParam, view);
@ -2366,4 +2350,24 @@ public class ChartViewService {
view.setCustomFilter(gson.toJson(tree));
}
}
public void buildDsType(Datasource datasource, ChartViewDTO result) {
if (datasource != null) {
if (StringUtils.equalsIgnoreCase(datasource.getType(), "sqlServer")) {
if (datasource.getVersion() == null) {
result.setDatasourceType(datasource.getType());
} else {
if (Integer.parseInt(datasource.getVersion()) < 11) {
result.setDatasourceType(datasource.getType() + "_all");
} else {
result.setDatasourceType(datasource.getType());
}
}
} else {
result.setDatasourceType(datasource.getType());
}
} else {
result.setDatasourceType(null);
}
}
}

13
core/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
View File

@ -1,13 +1,12 @@
package io.dataease.service.chart;
import cn.hutool.core.util.ReflectUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import io.dataease.commons.model.PluginViewSetImpl;
import io.dataease.commons.utils.TableUtils;
import io.dataease.controller.request.chart.ChartExtRequest;
import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
import io.dataease.plugins.common.base.domain.DatasetTableField;
import io.dataease.plugins.common.base.domain.Datasource;
@ -25,7 +24,7 @@ import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.view.entity.*;
import io.dataease.plugins.view.entity.filter.PluginFilterTreeObj;
import io.dataease.plugins.view.service.ViewPluginBaseService;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.dataset.DataSetTableUnionService;
import org.apache.commons.lang3.ObjectUtils;
@ -33,6 +32,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.util.ReflectionUtils;
import javax.annotation.Resource;
import java.lang.reflect.Method;
@ -232,7 +232,7 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
Method method = declaredMethods[i];
if (StringUtils.equals(method.getName(), methodName)) {
method.setAccessible(true);
return ReflectUtil.invoke(queryProvider, method, args);
return ReflectionUtils.invokeMethod(method, queryProvider, args);
}
}
return null;
@ -240,11 +240,10 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService {
private Object execProviderMethod(QueryProvider queryProvider, String methodName, Object... args) {
Method[] declaredMethods = queryProvider.getClass().getDeclaredMethods();
for (int i = 0; i < declaredMethods.length; i++) {
Method method = declaredMethods[i];
for (Method method : declaredMethods) {
if (StringUtils.equals(method.getName(), methodName)) {
method.setAccessible(true);
return ReflectUtil.invoke(queryProvider, method, args);
return ReflectionUtils.invokeMethod(method, queryProvider, args);
}
}
return null;

3
core/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java
View File

@ -1,16 +1,13 @@
package io.dataease.service.chart.build;
import cn.hutool.core.collection.CollectionUtil;
import io.dataease.dto.chart.FilterParamTO;
import io.dataease.service.chart.FilterBuildTemplate;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Service("numberRangeWidget")
public class NumberRangeBuild extends FilterBuildTemplate {

4
core/backend/src/main/java/io/dataease/service/chart/build/SelectBuild.java
View File

@ -1,6 +1,6 @@
package io.dataease.service.chart.build;
import cn.hutool.core.bean.BeanUtil;
import io.dataease.commons.utils.BeanUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.controller.dataset.DataSetTableFieldController;
import io.dataease.controller.request.dataset.MultFieldValuesRequest;
@ -74,7 +74,7 @@ public class SelectBuild extends FilterBuildTemplate {
MultFieldValuesRequest request = new MultFieldValuesRequest();
request.setFieldIds(Arrays.stream(attrs.get("fieldId").toString().split(",")).collect(Collectors.toList()));
if (ObjectUtils.isNotEmpty(attrs.get("sort"))) {
DeSortDTO sort = BeanUtil.copyProperties(attrs.get("sort"), DeSortDTO.class);
DeSortDTO sort = BeanUtils.copyBean(new DeSortDTO(), attrs.get("sort"));
request.setSort(sort);
}
List<Object> list = null;

7
core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
View File

@ -1,12 +1,12 @@
package io.dataease.service.chart.util;
import cn.hutool.core.util.ArrayUtil;
import io.dataease.controller.request.chart.ChartDrillRequest;
import io.dataease.dto.chart.*;
import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs;
import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
@ -1049,7 +1049,7 @@ public class ChartDataBuild {
Map<String, Object> map = transTableNormal(fields, null, data, desensitizationList);
List<Map<String, Object>> tableRow = (List<Map<String, Object>>) map.get("tableRow");
final int xEndIndex = detailIndex;
Map<String, List<String[]>> groupDataList = detailData.stream().collect(Collectors.groupingBy(item -> ArrayUtil.join(ArrayUtil.sub(item, 0, xEndIndex), "-de-", "(", ")")));
Map<String, List<String[]>> groupDataList = detailData.stream().collect(Collectors.groupingBy(item -> StringUtils.join(ArrayUtils.subarray(item, 0, xEndIndex), "-de-", "(", ")")));
tableRow.forEach(row -> {
String key = xAxis.stream().map(x -> String.format(format, row.get(x.getDataeaseName()).toString())).collect(Collectors.joining("-de-"));
@ -1087,6 +1087,7 @@ public class ChartDataBuild {
List<ChartViewFieldDTO> fields = new ArrayList<>();
List<ChartViewFieldDTO> yfields = new ArrayList<>();
if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis"))) fields.addAll(fieldMap.get("xAxis"));
if (CollectionUtils.isNotEmpty(fieldMap.get("xAxisExt"))) fields.addAll(fieldMap.get("xAxisExt"));
for (Map.Entry<String, List<ChartViewFieldDTO>> entry : fieldMap.entrySet()) {
if (StringUtils.equalsAny(entry.getKey(), keys)) {
@ -1130,7 +1131,7 @@ public class ChartDataBuild {
if (StringUtils.isEmpty(originStr) || originStr.length() <= columnPermissionItem.getDesensitizationRule().getM() + columnPermissionItem.getDesensitizationRule().getN() + 1) {
desensitizationStr = String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getM(), "X")) + "***" + String.join("", Collections.nCopies(columnPermissionItem.getDesensitizationRule().getN(), "X"));
} else {
desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM()) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN() - 1, originStr.length() - 1);
desensitizationStr = StringUtils.substring(originStr, 0, columnPermissionItem.getDesensitizationRule().getM()) + "***" + StringUtils.substring(originStr, originStr.length() - columnPermissionItem.getDesensitizationRule().getN() - 1, originStr.length());
}
break;
case RetainMToN:

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

File diff suppressed because it is too large Load Diff

10
core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskLogService.java
View File

@ -1,6 +1,5 @@
package io.dataease.service.dataset;
import cn.hutool.core.date.DateUtil;
import io.dataease.commons.constants.ParamConstants;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.ServletUtils;
@ -14,6 +13,7 @@ import io.dataease.plugins.common.base.domain.DatasetTableTaskLogExample;
import io.dataease.plugins.common.base.mapper.DatasetTableTaskLogMapper;
import io.dataease.plugins.common.base.mapper.DatasetTableTaskMapper;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.util.GlobalDateUtils;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@ -79,8 +79,12 @@ public class DataSetTableTaskLogService {
String[] row = new String[5];
row[0] = item.getName();
row[1] = item.getDatasetName();
row[2] = DateUtil.formatDateTime(new Date(item.getStartTime()));
row[3] = item.getEndTime() != null ? DateUtil.formatDateTime(new Date(item.getEndTime())) : "";
try {
row[2] = GlobalDateUtils.getTimeString(item.getStartTime());
row[3] = item.getEndTime() != null ? GlobalDateUtils.getTimeString(item.getEndTime()) : "";
} catch (Exception e) {
throw new RuntimeException(e);
}
row[4] = Translator.get("I18N_TASK_LOG_" + item.getStatus().toUpperCase());
return row;
}).collect(Collectors.toList());

168
core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -6,8 +6,8 @@ import io.dataease.commons.constants.*;
import io.dataease.commons.model.AuthURD;
import io.dataease.commons.utils.*;
import io.dataease.controller.request.datasource.ApiDefinition;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.dto.dataset.ExcelSheetData;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.dataset.ExcelSheetData;
import io.dataease.dto.datasource.*;
import io.dataease.ext.ExtChartViewMapper;
import io.dataease.listener.util.CacheUtils;
@ -21,8 +21,8 @@ import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.datasource.entity.JdbcConfiguration;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.provider.DDLProvider;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.DDLProvider;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.provider.datasource.JdbcProvider;
import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.engine.EngineService;
@ -191,8 +191,8 @@ public class ExtractDataService {
switch (updateType) {
case all_scope: // 全量更新
try {
createEngineTable(TableUtils.tableName(datasetTableId), datasetTableFields);
createEngineTable(TableUtils.tmpName(TableUtils.tableName(datasetTableId)), datasetTableFields);
createEngineTable(datasetTable.getInfo(), TableUtils.tableName(datasetTableId), datasetTableFields);
createEngineTable(datasetTable.getInfo(), TableUtils.tmpName(TableUtils.tableName(datasetTableId)), datasetTableFields);
Long execTime = System.currentTimeMillis();
if (!engineService.isSimpleMode()) {
generateTransFile("all_scope", datasetTable, datasource, datasetTableFields, null);
@ -205,7 +205,7 @@ public class ExtractDataService {
saveSuccessLog(datasetTableTaskLog, false);
updateTableStatus(datasetTableId, JobStatus.Completed, execTime);
if (ops.equalsIgnoreCase("替换")) {
List<DatasetTableField> oldFields = getDatasetTableFields(datasetTable.getId());
List<DatasetTableField> oldFields = getDatasetTableFields(datasetTable);
List<DatasetTableField> toAdd = new ArrayList<>();
List<DatasetTableField> toDelete = new ArrayList<>();
for (DatasetTableField oldField : oldFields) {
@ -235,6 +235,7 @@ public class ExtractDataService {
toDelete.forEach(datasetTableField -> dataSetTableFieldsService.delete(datasetTableField.getId()));
}
} catch (Exception e) {
e.printStackTrace();
saveErrorLog(datasetTableTaskLog, e, false);
updateTableStatus(datasetTableId, JobStatus.Error, null);
dropDorisTable(TableUtils.tmpName(TableUtils.tableName(datasetTableId)));
@ -311,15 +312,15 @@ public class ExtractDataService {
} else {
datasource.setType(datasetTable.getType());
}
List<DatasetTableField> datasetTableFields = getDatasetTableFields(datasetTable.getId());
List<DatasetTableField> datasetTableFields = getDatasetTableFields(datasetTable);
boolean msg = false;
JobStatus lastExecStatus = JobStatus.Completed;
Long execTime = null;
switch (updateType) {
case all_scope: // 全量更新
try {
createEngineTable(TableUtils.tableName(datasetTableId), datasetTableFields);
createEngineTable(TableUtils.tmpName(TableUtils.tableName(datasetTableId)), datasetTableFields);
createEngineTable(datasetTable.getInfo(), TableUtils.tableName(datasetTableId), datasetTableFields);
createEngineTable(datasetTable.getInfo(), TableUtils.tmpName(TableUtils.tableName(datasetTableId)), datasetTableFields);
execTime = System.currentTimeMillis();
extractData(datasetTable, datasource, datasetTableFields, "all_scope", null);
replaceTable(TableUtils.tableName(datasetTableId));
@ -421,8 +422,13 @@ public class ExtractDataService {
}
public List<DatasetTableField> getDatasetTableFields(String datasetTableId) {
List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTableId).build());
public List<DatasetTableField> getDatasetTableFields(DatasetTable datasetTable) {
List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.list(DatasetTableField.builder().tableId(datasetTable.getId()).build());
return sortDatasetTableFields(datasetTable, datasetTableFields);
}
private List<DatasetTableField> sortDatasetTableFields(DatasetTable datasetTable, List<DatasetTableField> datasetTableFields) {
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
datasetTableFields = datasetTableFields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
datasetTableFields.sort((o1, o2) -> {
if (o1.getColumnIndex() == null) {
@ -433,7 +439,20 @@ public class ExtractDataService {
}
return o1.getColumnIndex().compareTo(o2.getColumnIndex());
});
return datasetTableFields;
List<DatasetTableField> orderKeyDatasetTableFields = new ArrayList<>();
for (int i = 0; i < dataTableInfoDTO.getKeys().size(); i++) {
for (DatasetTableField datasetTableField : datasetTableFields) {
if (datasetTableField.getOriginName().equalsIgnoreCase(dataTableInfoDTO.getKeys().get(i))) {
orderKeyDatasetTableFields.add(datasetTableField);
}
}
}
for (DatasetTableField datasetTableField : datasetTableFields) {
if (!dataTableInfoDTO.getKeys().contains(datasetTableField.getOriginName())) {
orderKeyDatasetTableFields.add(datasetTableField);
}
}
return orderKeyDatasetTableFields;
}
private void extractData(DatasetTable datasetTable, Datasource datasource, List<DatasetTableField> datasetTableFields, String extractType, String selectSQL) throws Exception {
@ -461,9 +480,10 @@ public class ExtractDataService {
}
private void extractApiData(DatasetTable datasetTable, Datasource datasource, List<DatasetTableField> datasetTableFields, String extractType) throws Exception {
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
List<ApiDefinition> lists = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<ArrayList<ApiDefinition>>() {
}.getType());
lists = lists.stream().filter(item -> item.getName().equalsIgnoreCase(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable())).collect(Collectors.toList());
lists = lists.stream().filter(item -> item.getName().equalsIgnoreCase(dataTableInfoDTO.getTable())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(lists)) {
throw new Exception("未找到API数据表");
}
@ -483,8 +503,7 @@ public class ExtractDataService {
Datasource engine = engineService.getDeEngine();
DorisConfiguration dorisConfiguration = new Gson().fromJson(engine.getConfiguration(), DorisConfiguration.class);
String columns = datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.joining(",")) + ",dataease_uuid";
String columns = "dataease_uuid, " + datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.joining(","));
String dataFile = null;
String script = null;
String streamLoadScript = "";
@ -503,15 +522,16 @@ public class ExtractDataService {
script = String.format(streamLoadScript, dorisConfiguration.getUsername(), dorisConfiguration.getPassword(), System.currentTimeMillis(), separator, columns, "APPEND", dataFile, dorisConfiguration.getHost(), dorisConfiguration.getHttpPort(), dorisConfiguration.getDataBase(), TableUtils.tableName(datasetTable.getId()), dataFile);
break;
}
BufferedWriter bw = new BufferedWriter(new FileWriter(dataFile));
for (String[] strings : dataList) {
String content = "";
for (int i = 0; i < strings.length; i++) {
content = content + strings[i] + separator;
content = i != strings.length - 1 ? content + strings[i] + separator : content + strings[i];
}
boolean isSetKey = dataTableInfoDTO.isSetKey() && CollectionUtils.isNotEmpty(dataTableInfoDTO.getKeys());
if (!isSetKey) {
content = Md5Utils.md5(content) + separator + content;
}
content = content + Md5Utils.md5(content);
bw.write(content);
bw.newLine();
}
@ -547,8 +567,8 @@ public class ExtractDataService {
} catch (Exception e) {
throw e;
} finally {
File deleteFile = new File(root_path + datasetTable.getId() + ".sh");
FileUtils.forceDelete(deleteFile);
// File deleteFile = new File(root_path + datasetTable.getId() + ".sh");
// FileUtils.forceDelete(deleteFile);
}
}
@ -641,7 +661,8 @@ public class ExtractDataService {
dataSetTableTaskLogService.save(datasetTableTaskLog, hasTask);
}
public void createEngineTable(String tableName, List<DatasetTableField> datasetTableFields) throws Exception {
public void createEngineTable(String datasetTableInfo, String tableName, List<DatasetTableField> datasetTableFields) throws Exception {
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTableInfo, DataTableInfoDTO.class);
Datasource engine = engineService.getDeEngine();
JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
DatasourceRequest datasourceRequest = new DatasourceRequest();
@ -649,7 +670,7 @@ public class ExtractDataService {
datasourceRequest.setQuery("SELECT VERSION()");
String version = jdbcProvider.getData(datasourceRequest).get(0)[0];
DDLProvider ddlProvider = ProviderFactory.getDDLProvider(engine.getType());
datasourceRequest.setQuery(ddlProvider.createTableSql(tableName, datasetTableFields, engine, version));
datasourceRequest.setQuery(ddlProvider.createTableSql(dataTableInfoDTO, tableName, datasetTableFields, engine, version));
jdbcProvider.exec(datasourceRequest);
}
@ -873,7 +894,13 @@ public class ExtractDataService {
String script = null;
Datasource dorisDatasource = engineService.getDeEngine();
DorisConfiguration dorisConfiguration = new Gson().fromJson(dorisDatasource.getConfiguration(), DorisConfiguration.class);
String columns = columnFields + ",dataease_uuid";
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
String columns = columnFields;
if (!(dataTableInfoDTO.isSetKey() && CollectionUtils.isNotEmpty(dataTableInfoDTO.getKeys()))) {
columns = columnFields + ",dataease_uuid";
}
String streamLoadScript = "";
if (kettleFilesKeep) {
streamLoadScript = shellScript;
@ -961,6 +988,8 @@ public class ExtractDataService {
if (engineService.isSimpleMode()) {
return;
}
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
boolean isSetKey = dataTableInfoDTO.isSetKey() && CollectionUtils.isNotEmpty(dataTableInfoDTO.getKeys());
TransMeta transMeta = new TransMeta();
String outFile = null;
DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasource.getType());
@ -988,21 +1017,21 @@ public class ExtractDataService {
}
transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, mysqlConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.mysql, mysqlConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.mysql, mysqlConfiguration, isSetKey);
break;
case sqlServer:
SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfiguration.class);
dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfiguration.getHost().trim(), sqlServerConfiguration.getDataBase(), sqlServerConfiguration.getPort().toString(), sqlServerConfiguration.getUsername(), sqlServerConfiguration.getPassword());
transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, sqlServerConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer, sqlServerConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer, sqlServerConfiguration, isSetKey);
break;
case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class);
dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfiguration.getHost().trim(), pgConfiguration.getDataBase(), pgConfiguration.getPort().toString(), pgConfiguration.getUsername(), pgConfiguration.getPassword());
transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, pgConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration, isSetKey);
break;
case oracle:
OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class);
@ -1014,7 +1043,7 @@ public class ExtractDataService {
}
transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, oracleConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle, oracleConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle, oracleConfiguration, isSetKey);
break;
case ck:
CHConfiguration chConfiguration = new Gson().fromJson(datasource.getConfiguration(), CHConfiguration.class);
@ -1022,7 +1051,7 @@ public class ExtractDataService {
dataMeta.setDatabaseType("Clickhouse");
transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, chConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.ck, chConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.ck, chConfiguration, isSetKey);
break;
case db2:
Db2Configuration db2Configuration = new Gson().fromJson(datasource.getConfiguration(), Db2Configuration.class);
@ -1030,11 +1059,11 @@ public class ExtractDataService {
dataMeta.setDatabaseType("DB2");
transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, db2Configuration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration, isSetKey);
break;
case excel:
inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields);
udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null);
inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields, false);
udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null, false);
default:
break;
}
@ -1059,7 +1088,7 @@ public class ExtractDataService {
break;
}
outputStep = outputStep(outFile, datasetTableFields, datasource);
outputStep = outputStep(outFile, datasetTableFields, datasource, isSetKey);
for (StepMeta inputStep : inputSteps) {
TransHopMeta hi1 = new TransHopMeta(inputStep, udjcStep);
@ -1119,7 +1148,7 @@ public class ExtractDataService {
return inputSteps;
}
private List<StepMeta> excelInputStep(String Info, List<DatasetTableField> datasetTableFields) {
private List<StepMeta> excelInputStep(String Info, List<DatasetTableField> datasetTableFields, boolean isSetKey) {
List<StepMeta> inputSteps = new ArrayList<>();
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(Info, DataTableInfoDTO.class);
List<ExcelSheetData> excelSheetDataList = dataTableInfoDTO.getExcelSheetDataList();
@ -1130,14 +1159,14 @@ public class ExtractDataService {
for (ExcelSheetData excelSheetData : excelSheetDataList) {
StepMeta fromStep = null;
String suffix = excelSheetData.getPath().substring(excelSheetDataList.get(0).getPath().lastIndexOf(".") + 1);
Integer fileInputFields = datasetTableFields.size();
if (StringUtils.equalsIgnoreCase(suffix, "csv")) {
CsvInputMeta csvInputMeta = new CsvInputMeta();
csvInputMeta.setFilename(excelSheetData.getPath());
csvInputMeta.setHeaderPresent(true);
csvInputMeta.setBufferSize("10000");
csvInputMeta.setDelimiter(",");
TextFileInputField[] fields = new TextFileInputField[datasetTableFields.size()];
TextFileInputField[] fields = new TextFileInputField[fileInputFields];
for (int i = 0; i < datasetTableFields.size(); i++) {
TextFileInputField field = new TextFileInputField();
field.setName(datasetTableFields.get(i).getDataeaseName());
@ -1176,7 +1205,7 @@ public class ExtractDataService {
excelInputMeta.setFileRequired(filesRequired.toArray(new String[filesRequired.size()]));
excelInputMeta.setStartsWithHeader(true);
excelInputMeta.setIgnoreEmptyRows(true);
ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
ExcelInputField[] fields = new ExcelInputField[fileInputFields];
for (int i = 0; i < datasetTableFields.size(); i++) {
ExcelInputField field = new ExcelInputField();
field.setName(datasetTableFields.get(i).getDataeaseName());
@ -1199,30 +1228,32 @@ public class ExtractDataService {
return inputSteps;
}
private StepMeta outputStep(String dorisOutputTable, List<DatasetTableField> datasetTableFields, Datasource datasource) {
private StepMeta outputStep(String dorisOutputTable, List<DatasetTableField> datasetTableFields, Datasource datasource, boolean isSetKey) {
TextFileOutputMeta textFileOutputMeta = new TextFileOutputMeta();
textFileOutputMeta.setEncoding("UTF-8");
textFileOutputMeta.setHeaderEnabled(false);
textFileOutputMeta.setFilename(root_path + dorisOutputTable);
textFileOutputMeta.setSeparator(separator);
textFileOutputMeta.setExtension(extension);
Integer fieldSize = isSetKey ? datasetTableFields.size() : datasetTableFields.size() + 1;
if (datasource.getType().equalsIgnoreCase(DatasourceTypes.oracle.name())) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
TextFileField[] outputFields = new TextFileField[fieldSize];
for (int i = 0; i < datasetTableFields.size(); i++) {
TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getOriginName());
textFileField.setType("String");
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
if(!isSetKey){
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
}
textFileOutputMeta.setOutputFields(outputFields);
} else if (datasource.getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name()) || datasource.getType().equalsIgnoreCase(DatasourceTypes.pg.name()) || datasource.getType().equalsIgnoreCase(DatasourceTypes.mysql.name())) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
TextFileField[] outputFields = new TextFileField[fieldSize];
for (int i = 0; i < datasetTableFields.size(); i++) {
TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getDataeaseName());
@ -1235,14 +1266,15 @@ public class ExtractDataService {
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
if(!isSetKey){
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
}
textFileOutputMeta.setOutputFields(outputFields);
} else if (datasource.getType().equalsIgnoreCase(DatasourceTypes.excel.name())) {
TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
TextFileField[] outputFields = new TextFileField[fieldSize];
for (int i = 0; i < datasetTableFields.size(); i++) {
TextFileField textFileField = new TextFileField();
textFileField.setName(datasetTableFields.get(i).getDataeaseName());
@ -1255,11 +1287,12 @@ public class ExtractDataService {
outputFields[i] = textFileField;
}
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
if(!isSetKey){
TextFileField textFileField = new TextFileField();
textFileField.setName("dataease_uuid");
textFileField.setType("String");
outputFields[datasetTableFields.size()] = textFileField;
}
textFileOutputMeta.setOutputFields(outputFields);
} else {
textFileOutputMeta.setOutputFields(new TextFileField[0]);
@ -1271,7 +1304,7 @@ public class ExtractDataService {
return outputStep;
}
private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType, JdbcConfiguration jdbcConfiguration) {
private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType, JdbcConfiguration jdbcConfiguration, boolean isSetKey) {
StringBuilder handleBinaryTypeCode = new StringBuilder();
String excelCompletion = "";
@ -1280,15 +1313,20 @@ public class ExtractDataService {
handleBinaryTypeCode.append("\n").append(handleBinaryType.replace("FIELD", datasetTableField.getDataeaseName()));
}
}
UserDefinedJavaClassMeta userDefinedJavaClassMeta = new UserDefinedJavaClassMeta();
List<UserDefinedJavaClassMeta.FieldInfo> fields = new ArrayList<>();
UserDefinedJavaClassMeta.FieldInfo fieldInfo = new UserDefinedJavaClassMeta.FieldInfo("dataease_uuid", ValueMetaInterface.TYPE_STRING, -1, -1);
fields.add(fieldInfo);
if (!isSetKey) {
UserDefinedJavaClassMeta.FieldInfo fieldInfo = new UserDefinedJavaClassMeta.FieldInfo("dataease_uuid", ValueMetaInterface.TYPE_STRING, -1, -1);
fields.add(fieldInfo);
}
userDefinedJavaClassMeta.setFieldInfo(fields);
List<UserDefinedJavaClassDef> definitions = new ArrayList<>();
String tmp_code = code.replace("handleWraps", handleWraps).replace("handleBinaryType", handleBinaryTypeCode.toString());
if (isSetKey) {
tmp_code = tmp_code.replace("handleDataease_uuid", "");
} else {
tmp_code = tmp_code.replace("handleDataease_uuid", handleDataease_uuid);
}
String Column_Fields;
if (datasourceType.equals(DatasourceTypes.oracle) || datasourceType.equals(DatasourceTypes.db2)) {
@ -1323,7 +1361,7 @@ public class ExtractDataService {
String handleMysqlBIGINTUNSIGNEDStr = "";
if (datasourceType.equals(DatasourceTypes.mysql)) {
for (DatasetTableField datasetTableField : datasetTableFields) {
if(datasetTableField.getType().equalsIgnoreCase("BIGINT UNSIGNED")){
if (datasetTableField.getType().equalsIgnoreCase("BIGINT UNSIGNED")) {
handleMysqlBIGINTUNSIGNEDStr = handleMysqlBIGINTUNSIGNEDStr + handleMysqlBIGINTUNSIGNED.replace("BIGINTUNSIGNEDFIELD", datasetTableField.getDataeaseName()) + "; \n";
}
}
@ -1441,12 +1479,14 @@ public class ExtractDataService {
" get(Fields.Out, filed).setValue(r, tmp);\n" +
" } \n";
private final static String handleDataease_uuid = "get(Fields.Out, \"dataease_uuid\").setValue(r, md5)";
private final static String handleCharset = "\tif(tmp != null && Arrays.asList(\"varcharFields\".split(\",\")).contains(filed)){\n" +
" \t\t\ttry {\n" +
"\t\t\t\tget(Fields.Out, filed).setValue(r, new String(tmp.getBytes(\"Datasource_Charset\"), \"Target_Charset\"));\n" +
" \t\t}catch (Exception e){}\n" +
"\t\t}";
private final static String code = "import org.pentaho.di.core.row.ValueMetaInterface;\n" +
"import java.util.List;\n" +
"import java.io.File;\n" +
@ -1486,7 +1526,7 @@ public class ExtractDataService {
" }\n" +
"\n" +
" String md5 = md5(str);\n" +
" get(Fields.Out, \"dataease_uuid\").setValue(r, md5);\n" +
" handleDataease_uuid ;\n" +
"\n" +
" putRow(data.outputRowMeta, r);\n" +
"\n" +

17
core/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
View File

@ -1,14 +1,12 @@
package io.dataease.service.dataset.impl.direct;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import com.google.gson.Gson;
import io.dataease.commons.model.BaseTreeNode;
import io.dataease.commons.utils.BeanUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.TreeUtils;
import io.dataease.dto.dataset.DataSetTableUnionDTO;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.dto.dataset.DeSortDTO;
import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.DatasetTable;
@ -23,11 +21,12 @@ import io.dataease.plugins.common.request.permission.DataSetRowPermissionsTreeDT
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.plugins.datasource.query.QueryProvider;
import io.dataease.plugins.xpack.auth.dto.request.ColumnPermissionItem;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.service.dataset.*;
import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.engine.EngineService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -81,15 +80,14 @@ public class DirectFieldService implements DataSetFieldService {
@Override
public List<Object> chineseSort(List<Object> list, DeSortDTO sortDTO) throws Exception {
if (ObjectUtils.isEmpty(sortDTO) || CollectionUtil.isEmpty(list)) return list;
if (ObjectUtils.isEmpty(sortDTO) || CollectionUtils.isEmpty(list)) return list;
String sort = sortDTO.getSort();
if (!StringUtils.equals(sort, "chinese")) {
return list;
}
String id = sortDTO.getId();
String sortStr = StringUtils.equalsIgnoreCase("chineseDesc", id) ? "desc" : "asc";
return CollectionUtil.sort(list, (v1, v2) -> {
list.sort((v1, v2) -> {
Collator instance = Collator.getInstance(Locale.CHINESE);
if (ObjectUtils.isEmpty(v1) || ObjectUtils.isEmpty(v2)) return 0;
if (StringUtils.equals("desc", sortStr)) {
@ -97,6 +95,7 @@ public class DirectFieldService implements DataSetFieldService {
}
return instance.compare(v1, v2);
});
return list;
}
@ -225,7 +224,7 @@ public class DirectFieldService implements DataSetFieldService {
}
Set<String> pkSet = new HashSet<>();
if (CollectionUtils.isNotEmpty(rows) && existExtSortField && originSize > 0) {
rows = rows.stream().map(row -> ArrayUtil.sub(row, 0, originSize)).collect(Collectors.toList());
rows = rows.stream().map(row -> ArrayUtils.subarray(row, 0, originSize)).collect(Collectors.toList());
}
List<BaseTreeNode> treeNodes = rows.stream().map(row -> buildTreeNode(row, pkSet)).flatMap(Collection::stream).collect(Collectors.toList());
List tree = TreeUtils.mergeDuplicateTree(treeNodes, TreeUtils.DEFAULT_ROOT);

86
core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -21,7 +21,7 @@ import io.dataease.controller.request.datasource.ApiDefinition;
import io.dataease.controller.sys.response.BasicInfo;
import io.dataease.dto.DatasourceDTO;
import io.dataease.dto.TaskInstance;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.dto.datasource.DBTableDTO;
import io.dataease.dto.datasource.MysqlConfiguration;
import io.dataease.ext.ExtDataSourceMapper;
@ -42,8 +42,9 @@ import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.common.util.SpringContextUtil;
import io.dataease.plugins.datasource.entity.JdbcConfiguration;
import io.dataease.plugins.datasource.entity.Status;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.provider.datasource.ApiProvider;
import io.dataease.service.ScheduleService;
import io.dataease.service.dataset.DataSetGroupService;
@ -51,7 +52,6 @@ import io.dataease.service.message.DeMsgutil;
import io.dataease.service.sys.SysAuthService;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
@ -116,7 +116,9 @@ public class DatasourceService {
datasource.setUpdateTime(currentTimeMillis);
datasource.setCreateTime(currentTimeMillis);
datasource.setCreateBy(String.valueOf(AuthUtils.getUser().getUsername()));
checkAndUpdateDatasourceStatus(datasource);
Status status = checkDatasourceStatus(datasource);
datasource.setStatus(status.getStatus());
datasource.setVersion(status.getVersion());
datasourceMapper.insertSelective(datasource);
handleConnectionPool(datasource, "add");
sysAuthService.copyAuth(datasource.getId(), SysAuthConstants.AUTH_SOURCE_TYPE_DATASOURCE);
@ -278,7 +280,9 @@ public class DatasourceService {
public void updateDatasource(String id, Datasource datasource) {
DatasourceExample example = new DatasourceExample();
example.createCriteria().andIdEqualTo(id);
checkAndUpdateDatasourceStatus(datasource);
Status status = checkDatasourceStatus(datasource);
datasource.setStatus(status.getStatus());
datasource.setVersion(status.getVersion());
datasourceMapper.updateByExampleSelective(datasource, example);
handleConnectionPool(id);
@ -328,15 +332,15 @@ public class DatasourceService {
datasourceProvider.checkConfiguration(datasource);
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
String datasourceStatus = datasourceProvider.checkStatus(datasourceRequest);
Status datasourceStatus = datasourceProvider.checkDsStatus(datasourceRequest);
if (datasource.getType().equalsIgnoreCase("api")) {
int success = 0;
List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {
}.getType());
List<ApiDefinition> apiDefinitionListWithStatus = new ArrayList<>();
if (StringUtils.isNotEmpty(datasourceStatus)) {
JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus).getAsJsonObject();
if (StringUtils.isNotEmpty(datasourceStatus.getStatus())) {
JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus.getStatus()).getAsJsonObject();
for (ApiDefinition apiDefinition : apiDefinitionList) {
String status = apiItemStatuses.get(apiDefinition.getName()).getAsString();
apiDefinition.setStatus(status);
@ -349,7 +353,7 @@ public class DatasourceService {
datasourceDTO.setApiConfiguration(apiDefinitionListWithStatus);
if (success == apiDefinitionList.size()) {
datasource.setStatus(datasourceStatus);
datasource.setStatus(datasourceStatus.getStatus());
return ResultHolder.success(datasourceDTO);
}
if (success > 0 && success < apiDefinitionList.size()) {
@ -368,16 +372,16 @@ public class DatasourceService {
if (datasource == null) {
return ResultHolder.error("Can not find datasource: " + datasourceId);
}
String datasourceStatus = null;
Status datasourceStatus = new Status();
try {
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
datasourceStatus = datasourceProvider.checkStatus(datasourceRequest);
datasourceStatus = datasourceProvider.checkDsStatus(datasourceRequest);
if (datasource.getType().equalsIgnoreCase("api")) {
List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {
}.getType());
JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus).getAsJsonObject();
JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus.getStatus()).getAsJsonObject();
int success = 0;
for (ApiDefinition apiDefinition : apiDefinitionList) {
String status = apiItemStatuses.get(apiDefinition.getName()).getAsString();
@ -387,7 +391,7 @@ public class DatasourceService {
}
}
if (success == apiDefinitionList.size()) {
datasource.setStatus(datasourceStatus);
datasource.setStatus(datasourceStatus.getStatus());
return ResultHolder.success(datasource);
}
if (success > 0 && success < apiDefinitionList.size()) {
@ -399,14 +403,14 @@ public class DatasourceService {
return ResultHolder.success("Success");
} catch (Exception e) {
e.printStackTrace();
datasourceStatus = "Error";
datasourceStatus.setStatus("Error");
return ResultHolder.error(Translator.get("I18N_DS_INVALID") + ": " + e.getMessage());
} finally {
Datasource record = new Datasource();
record.setStatus(datasourceStatus);
record.setStatus(datasourceStatus.getStatus());
record.setVersion(datasourceStatus.getVersion());
DatasourceExample example = new DatasourceExample();
example.createCriteria().andIdEqualTo(datasource.getId());
System.out.println(new Gson().toJson(record));
datasourceMapper.updateByExampleSelective(record, example);
}
}
@ -427,15 +431,11 @@ public class DatasourceService {
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(ds);
if (!ds.getType().equalsIgnoreCase(DatasetType.API.name())) {
datasourceProvider.checkStatus(datasourceRequest);
datasourceProvider.checkDsStatus(datasourceRequest);
}
List<TableDesc> tables = datasourceProvider.getTables(datasourceRequest);
// 获取当前数据源下的db、api类型数据集
DatasetTableExample datasetTableExample = new DatasetTableExample();
datasetTableExample.createCriteria().andTypeIn(Arrays.asList(DatasetType.DB.name(), DatasetType.API.name())).andDataSourceIdEqualTo(ds.getId());
List<DatasetTable> datasetTables = datasetTableMapper.selectByExample(datasetTableExample);
// 构造table节点
List<DBTableDTO> list = new ArrayList<>();
for (TableDesc tableDesc : tables) {
DBTableDTO dbTableDTO = new DBTableDTO();
@ -444,22 +444,6 @@ public class DatasourceService {
dbTableDTO.setRemark(tableDesc.getRemark());
dbTableDTO.setEnableCheck(true);
dbTableDTO.setDatasetPath(null);
for (DatasetTable datasetTable : datasetTables) {
DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
if (StringUtils.equals(tableDesc.getName(), dataTableInfoDTO.getTable())) {
dbTableDTO.setEnableCheck(false);
List<DatasetGroup> parents = dataSetGroupService.getParents(datasetTable.getSceneId());
StringBuilder stringBuilder = new StringBuilder();
parents.forEach(ele -> {
if (ObjectUtils.isNotEmpty(ele)) {
stringBuilder.append(ele.getName()).append("/");
}
});
stringBuilder.append(datasetTable.getName());
dbTableDTO.setDatasetPath(stringBuilder.toString());
break;
}
}
list.add(dbTableDTO);
}
return list;
@ -479,6 +463,15 @@ public class DatasourceService {
List<Datasource> datasources = datasourceMapper.selectByExampleWithBLOBs(new DatasourceExample());
datasources.forEach(datasource -> {
commonThreadPool.addTask(() -> {
try {
DatasourceExample example = new DatasourceExample();
example.createCriteria().andIdEqualTo(datasource.getId());
Status status = checkDatasourceStatus(datasource);
Datasource record = new Datasource();
record.setVersion(status.getVersion());
record.setStatus(status.getStatus());
datasourceMapper.updateByExampleSelective(record, example);
}catch (Exception ignore){}
try {
handleConnectionPool(datasource, "add");
} catch (Exception e) {
@ -525,8 +518,7 @@ public class DatasourceService {
}
public ApiDefinition checkApiDatasource(ApiDefinition apiDefinition) throws Exception {
BasicInfo basicInfo = systemParameterService.basicInfo();
String response = ApiProvider.execHttpRequest(apiDefinition, StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10);
String response = ApiProvider.execHttpRequest(apiDefinition, apiDefinition.getApiQueryTimeout() == null || apiDefinition.getApiQueryTimeout() <= 0 ? 30 : apiDefinition.getApiQueryTimeout());
return ApiProvider.checkApiDefinition(apiDefinition, response);
}
@ -536,16 +528,17 @@ public class DatasourceService {
return datasourceMapper.selectByExampleWithBLOBs(example);
}
public void checkAndUpdateDatasourceStatus(Datasource datasource) {
public Status checkDatasourceStatus(Datasource datasource) {
Status status = new Status();
try {
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
String status = datasourceProvider.checkStatus(datasourceRequest);
datasource.setStatus(status);
status = datasourceProvider.checkDsStatus(datasourceRequest);
} catch (Exception e) {
datasource.setStatus("Error");
status.setStatus("Error");
}
return status;
}
private void checkAndUpdateDatasourceStatus(Datasource datasource, Boolean withMsg) {
@ -556,8 +549,9 @@ public class DatasourceService {
Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
DatasourceRequest datasourceRequest = new DatasourceRequest();
datasourceRequest.setDatasource(datasource);
String status = datasourceProvider.checkStatus(datasourceRequest);
record.setStatus(status);
Status status = datasourceProvider.checkDsStatus(datasourceRequest);
record.setStatus(status.getStatus());
record.setVersion(status.getVersion());
datasourceMapper.updateByExampleSelective(record, example);
} catch (Exception e) {
Datasource temp = datasourceMapper.selectByPrimaryKey(datasource.getId());

9
core/backend/src/main/java/io/dataease/service/datasource/DriverService.java
View File

@ -1,6 +1,5 @@
package io.dataease.service.datasource;
import cn.hutool.core.collection.CollectionUtil;
import com.google.gson.Gson;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.BeanUtils;
@ -16,7 +15,8 @@ import io.dataease.plugins.common.base.mapper.DeDriverMapper;
import io.dataease.plugins.datasource.entity.JdbcConfiguration;
import io.dataease.plugins.datasource.provider.DefaultJdbcProvider;
import io.dataease.plugins.datasource.provider.ExtendedJdbcClassLoader;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -27,7 +27,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.util.*;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
@ -81,7 +80,7 @@ public class DriverService {
}
DeDriverExample example = new DeDriverExample();
example.createCriteria().andNameEqualTo(deDriver.getName());
if(CollectionUtil.isNotEmpty(deDriverMapper.selectByExampleWithBLOBs(example))){
if(CollectionUtils.isNotEmpty(deDriverMapper.selectByExampleWithBLOBs(example))){
throw new RuntimeException(Translator.get("I18N_DRIVER_REPEAT_NAME"));
}
deDriver.setCreateTime(System.currentTimeMillis());
@ -147,7 +146,7 @@ public class DriverService {
DeDriverDetailsExample deDriverDetailsExample = new DeDriverDetailsExample();
deDriverDetailsExample.createCriteria().andDeDriverIdEqualTo(driverId).andFileNameEqualTo(filename);
if(CollectionUtil.isNotEmpty(deDriverDetailsMapper.selectByExample(deDriverDetailsExample))){
if(CollectionUtils.isNotEmpty(deDriverDetailsMapper.selectByExample(deDriverDetailsExample))){
throw new Exception("A file with the same name already exists：" + filename);
}

6
core/backend/src/main/java/io/dataease/service/engine/EngineService.java
View File

@ -5,8 +5,8 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import io.dataease.commons.utils.BeanUtils;
import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.plugins.common.util.HttpClientConfig;
import io.dataease.plugins.common.util.HttpClientUtil;
import io.dataease.controller.ResultHolder;
import io.dataease.dto.datasource.DorisConfiguration;
import io.dataease.dto.datasource.MysqlConfiguration;
@ -17,7 +17,7 @@ import io.dataease.plugins.common.base.domain.DeEngineExample;
import io.dataease.plugins.common.base.mapper.DeEngineMapper;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.datasource.provider.Provider;
import io.dataease.provider.ProviderFactory;
import io.dataease.plugins.datasource.provider.ProviderFactory;
import io.dataease.service.datasource.DatasourceService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

4
core/backend/src/main/java/io/dataease/service/kettle/KettleService.java
View File

@ -1,8 +1,8 @@
package io.dataease.service.kettle;
import com.google.gson.Gson;
import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.plugins.common.util.HttpClientConfig;
import io.dataease.plugins.common.util.HttpClientUtil;
import io.dataease.controller.ResultHolder;
import io.dataease.dto.KettleDTO;
import io.dataease.plugins.common.base.domain.DeEngine;

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

@ -280,8 +280,8 @@ public class PanelAppTemplateService {
public void createDorisTable(List<DatasetTable> datasetTablesInfo) throws Exception {
for (DatasetTable datasetTable : datasetTablesInfo) {
if (1 == datasetTable.getMode() && !(DatasetType.CUSTOM.name().equalsIgnoreCase(datasetTable.getType()) || DatasetType.UNION.name().equalsIgnoreCase(datasetTable.getType()))) {
List<DatasetTableField> fields = extractDataService.getDatasetTableFields(datasetTable.getId());
extractDataService.createEngineTable(TableUtils.tableName(datasetTable.getId()), fields);
List<DatasetTableField> fields = extractDataService.getDatasetTableFields(datasetTable);
extractDataService.createEngineTable(datasetTable.getInfo(), TableUtils.tableName(datasetTable.getId()), fields);
}
}
}

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

@ -1,6 +1,5 @@
package io.dataease.service.panel;
import cn.hutool.core.util.ArrayUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
@ -21,7 +20,7 @@ import io.dataease.dto.chart.ChartViewDTO;
import io.dataease.dto.dataset.DataSetGroupDTO;
import io.dataease.dto.dataset.DataSetTableDTO;
import io.dataease.dto.dataset.DataSetTaskDTO;
import io.dataease.dto.dataset.DataTableInfoDTO;
import io.dataease.plugins.common.dto.dataset.DataTableInfoDTO;
import io.dataease.dto.panel.PanelExport2App;
import io.dataease.dto.panel.PanelGroupDTO;
import io.dataease.dto.panel.PanelTemplateFileDTO;
@ -33,12 +32,14 @@ import io.dataease.plugins.common.base.domain.*;
import io.dataease.plugins.common.base.mapper.*;
import io.dataease.plugins.common.constants.DeTypeConstants;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.util.HttpClientUtil;
import io.dataease.service.chart.ChartViewService;
import io.dataease.service.dataset.DataSetGroupService;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.staticResource.StaticResourceService;
import io.dataease.service.sys.SysAuthService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
@ -46,10 +47,10 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.pentaho.di.core.util.UUIDUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
@ -143,6 +144,9 @@ public class PanelGroupService {
@Resource
private DatasourceMapper datasourceMapper;
@Value("${export.views.limit:100000}")
private Long limit;
public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
String userId = String.valueOf(AuthUtils.getUser().getUserId());
panelGroupRequest.setUserId(userId);
@ -685,7 +689,7 @@ public class PanelGroupService {
Boolean mergeHead = false;
ViewDetailField[] detailFields = request.getDetailFields();
if (ArrayUtil.isNotEmpty(detailFields)) {
if (ArrayUtils.isNotEmpty(detailFields)) {
cellStyle.setBorderTop(BorderStyle.THIN);
cellStyle.setBorderRight(BorderStyle.THIN);
cellStyle.setBorderBottom(BorderStyle.THIN);
@ -1162,8 +1166,8 @@ public class PanelGroupService {
try {
List<String> excelHeaderKeys = request.getExcelHeaderKeys();
ChartExtRequest componentFilterInfo = request.getComponentFilterInfo();
componentFilterInfo.setGoPage(1l);
componentFilterInfo.setPageSize(1000000l);
componentFilterInfo.setGoPage(1L);
componentFilterInfo.setPageSize(limit);
componentFilterInfo.setExcelExportFlag(true);
componentFilterInfo.setProxy(request.getProxy());
componentFilterInfo.setUser(request.getUserId());

44
core/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
View File

@ -4,7 +4,10 @@ import io.dataease.auth.config.RsaProperties;
import io.dataease.auth.util.JWTUtils;
import io.dataease.auth.util.RsaUtil;
import io.dataease.commons.constants.SysLogConstants;
import io.dataease.commons.utils.*;
import io.dataease.commons.utils.AuthUtils;
import io.dataease.commons.utils.CodingUtil;
import io.dataease.commons.utils.DeLogUtils;
import io.dataease.commons.utils.ServletUtils;
import io.dataease.controller.request.panel.link.EnablePwdRequest;
import io.dataease.controller.request.panel.link.LinkRequest;
import io.dataease.controller.request.panel.link.OverTimeRequest;
@ -127,6 +130,16 @@ public class PanelLinkService {
}
}
public String getMappingUuid(PanelLink link) {
String resourceId = link.getResourceId();
Long userId = link.getUserId();
PanelLinkMappingExample example = new PanelLinkMappingExample();
example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdEqualTo(userId);
List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
if (CollectionUtils.isNotEmpty(mappings)) return mappings.get(0).getUuid();
return null;
}
@Transactional
public GenerateDto currentGenerate(String resourceId) {
PanelLink one = findOne(resourceId, AuthUtils.getUser().getUserId());
@ -143,14 +156,17 @@ public class PanelLinkService {
PanelLinkMappingExample example = new PanelLinkMappingExample();
example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdEqualTo(AuthUtils.getUser().getUserId());
List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
PanelLinkMapping mapping = null;
if (CollectionUtils.isEmpty(mappings)) {
PanelLinkMapping mapping = new PanelLinkMapping();
mapping = new PanelLinkMapping();
mapping.setResourceId(resourceId);
mapping.setUserId(AuthUtils.getUser().getUserId());
mapping.setUuid(CodingUtil.shortUuid());
panelLinkMappingMapper.insert(mapping);
} else {
mapping = mappings.get(0);
}
return convertDto(one);
return convertDto(one, mapping.getUuid());
}
public void deleteByResourceId(String resourceId) {
@ -177,20 +193,24 @@ public class PanelLinkService {
return null;
}
private String buildLinkParam(PanelLink link) {
String linkParam = encrypt(link.getResourceId());
private String buildLinkParam(PanelLink link, String uuid) {
String resourceId = link.getResourceId();
if (StringUtils.isNotBlank(uuid)) {
resourceId += ("," + uuid);
}
String linkParam = encrypt(resourceId);
if (link.getUserId() != null) {
linkParam = linkParam + USERPARAM + encrypt(link.getUserId().toString());
}
return linkParam;
}
private GenerateDto convertDto(PanelLink link) {
private GenerateDto convertDto(PanelLink link, String uuid) {
GenerateDto result = new GenerateDto();
result.setValid(link.getValid());
result.setEnablePwd(link.getEnablePwd());
result.setPwd(link.getPwd());
result.setUri(BASEURL + buildLinkParam(link));
result.setUri(BASEURL + buildLinkParam(link, uuid));
result.setOverTime(link.getOverTime());
return result;
}
@ -237,8 +257,8 @@ public class PanelLinkService {
return pass;
}
public PanelGroupDTO resourceInfo(String resourceId,String userId) {
PanelGroupDTO result = extPanelGroupMapper.findOneWithPrivileges(resourceId,userId);
public PanelGroupDTO resourceInfo(String resourceId, String userId) {
PanelGroupDTO result = extPanelGroupMapper.findOneWithPrivileges(resourceId, userId);
result.setWatermarkInfo(panelWatermarkMapper.selectByPrimaryKey("system_default"));
return result;
}
@ -261,7 +281,7 @@ public class PanelLinkService {
if (StringUtils.isNotBlank(mapping.getUuid())) {
one.setResourceId("error-resource-id");
}
return convertDto(one).getUri();
return convertDto(one, mapping.getUuid()).getUri();
}
public String getUrlByUuid(String uuid) {
@ -271,12 +291,12 @@ public class PanelLinkService {
if (CollectionUtils.isEmpty(mappings)) {
PanelLink panelLink = new PanelLink();
panelLink.setResourceId("error-resource-id");
return BASEURL + buildLinkParam(panelLink);
return BASEURL + buildLinkParam(panelLink, null);
}
PanelLinkMapping mapping = mappings.get(0);
String resourceId = mapping.getResourceId();
Long userId = mapping.getUserId();
PanelLink one = findOne(resourceId, userId);
return convertDto(one).getUri();
return convertDto(one, uuid).getUri();
}
}

8
core/backend/src/main/java/io/dataease/service/staticResource/StaticResourceService.java
View File

@ -1,16 +1,16 @@
package io.dataease.service.staticResource;
import cn.hutool.core.codec.Base64Decoder;
import cn.hutool.core.collection.CollectionUtil;
import com.google.gson.Gson;
import io.dataease.commons.utils.FileUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.StaticResourceUtils;
import io.dataease.controller.request.resource.StaticResourceRequest;
import io.dataease.plugins.common.exception.DataEaseException;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.Base64Utils;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile;
@ -93,7 +93,7 @@ public class StaticResourceService {
} else {
if (StringUtils.isNotEmpty(content)) {
Files.createFile(uploadPath);
FileCopyUtils.copy(Base64Decoder.decode(content), Files.newOutputStream(uploadPath));
FileCopyUtils.copy(Base64Utils.decodeFromString(content), Files.newOutputStream(uploadPath));
}
}
} catch (Exception e) {
@ -103,7 +103,7 @@ public class StaticResourceService {
public Map<String, String> findResourceAsBase64(StaticResourceRequest resourceRequest) {
Map<String, String> result = new HashMap<>();
if (CollectionUtil.isNotEmpty(resourceRequest.getResourcePathList())) {
if (CollectionUtils.isNotEmpty(resourceRequest.getResourcePathList())) {
for (String path : resourceRequest.getResourcePathList()) {
String value = StaticResourceUtils.getImgFileToBase64(path.substring(path.lastIndexOf("/") + 1, path.length()));
result.put(path, value);

10
core/backend/src/main/java/io/dataease/service/sys/PluginService.java
View File

@ -1,13 +1,8 @@
package io.dataease.service.sys;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ZipUtil;
import com.google.gson.Gson;
import io.dataease.commons.constants.AuthConstants;
import io.dataease.commons.utils.CodingUtil;
import io.dataease.commons.utils.DeFileUtils;
import io.dataease.commons.utils.IPUtils;
import io.dataease.commons.utils.LogUtil;
import io.dataease.commons.utils.*;
import io.dataease.dto.MyPluginDTO;
import io.dataease.ext.ExtSysPluginMapper;
import io.dataease.i18n.Translator;
@ -16,6 +11,7 @@ import io.dataease.plugins.common.base.domain.MyPlugin;
import io.dataease.plugins.common.base.mapper.MyPluginMapper;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.request.KeywordRequest;
import io.dataease.plugins.common.util.FileUtil;
import io.dataease.plugins.config.LoadjarUtil;
import io.dataease.plugins.entity.PluginOperate;
import io.dataease.service.datasource.DatasourceService;
@ -84,7 +80,7 @@ public class PluginService {
//2.解压目标文件dest 得到plugin.json和jar
String folder = pluginDir + "folder/";
try {
ZipUtil.unzip(dest.getAbsolutePath(), folder);
ZipUtils.unZipIt(dest.getAbsolutePath(), folder);
} catch (Exception e) {
DeFileUtils.deleteFile(pluginDir + "temp/");
DeFileUtils.deleteFile(folder);

9
core/backend/src/main/java/io/dataease/service/sys/log/LogService.java
View File

@ -1,7 +1,6 @@
package io.dataease.service.sys.log;
import cn.hutool.core.date.DateUtil;
import com.google.gson.Gson;
import io.dataease.auth.api.dto.CurrentUserDto;
import io.dataease.commons.constants.ParamConstants;
@ -20,6 +19,7 @@ import io.dataease.plugins.common.base.domain.SysLogExample;
import io.dataease.plugins.common.base.domain.SysLogWithBLOBs;
import io.dataease.plugins.common.base.mapper.SysLogMapper;
import io.dataease.plugins.common.exception.DataEaseException;
import io.dataease.plugins.common.util.GlobalDateUtils;
import io.dataease.service.system.SystemParameterService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@ -265,7 +265,12 @@ public class LogService {
row[1] = logManager.detailInfo(item);
row[2] = item.getNickName();
row[3] = item.getIp();
row[4] = DateUtil.formatDateTime(new Date(item.getTime()));
// row[4] = DateUtil.formatDateTime(new Date(item.getTime()));
try {
row[4] = GlobalDateUtils.getTimeString(item.getTime());
} catch (Exception e) {
throw new RuntimeException(e);
}
return row;
}).collect(Collectors.toList());
String[] headArr = {"操作类型", "详情", "用户", "IP地址", "时间"};

7
core/backend/src/main/java/io/dataease/service/system/EmailService.java
View File

@ -1,8 +1,6 @@
package io.dataease.service.system;
import cn.hutool.core.util.ArrayUtil;
import io.dataease.commons.constants.ParamConstants;
import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.commons.utils.EncryptUtils;
import io.dataease.commons.utils.LogUtil;
@ -13,6 +11,7 @@ import io.dataease.plugins.common.base.domain.SystemParameterExample;
import io.dataease.plugins.common.base.mapper.SystemParameterMapper;
import io.dataease.plugins.common.exception.DataEaseException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.mail.javamail.JavaMailSenderImpl;
@ -85,7 +84,7 @@ public class EmailService {
public void sendPdfWithFiles(String to, String title, String content, byte[] bytes, List<File> files) {
if (ArrayUtil.isEmpty(bytes)) {
if (ArrayUtils.isEmpty(bytes)) {
send(to, title, content);
return;
}
@ -118,7 +117,7 @@ public class EmailService {
if (StringUtils.isBlank(to))
return;
if (ArrayUtil.isEmpty(bytes)) {
if (ArrayUtils.isEmpty(bytes)) {
send(to, title, content);
return;
}

4
core/backend/src/main/java/io/dataease/service/templateMarket/TemplateMarketService.java
View File

@ -2,8 +2,8 @@ package io.dataease.service.templateMarket;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.plugins.common.util.HttpClientConfig;
import io.dataease.plugins.common.util.HttpClientUtil;
import io.dataease.controller.request.templateMarket.TemplateMarketSearchRequest;
import io.dataease.controller.sys.response.BasicInfo;
import io.dataease.dto.panel.PanelTemplateFileDTO;

4
core/backend/src/main/java/io/dataease/service/wizard/ReptileService.java
View File

@ -1,7 +1,7 @@
package io.dataease.service.wizard;
import io.dataease.commons.utils.HttpClientConfig;
import io.dataease.commons.utils.HttpClientUtil;
import io.dataease.plugins.common.util.HttpClientConfig;
import io.dataease.plugins.common.util.HttpClientUtil;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;

4
core/backend/src/main/resources/application.properties
View File

@ -32,6 +32,9 @@ knife4j.setting.enableOpenApi=false
knife4j.setting.enableAfterScript=false
version=@project.version@
logging.file.path=/opt/dataease/logs/${spring.application.name}
logging.file.history=30
logging.file.size=50MB
# view
spring.resources.static-locations=classpath:/templates/,classpath:/static/
# flyway enable
@ -77,6 +80,7 @@ server.compression.min-response-size=1024
server.servlet.context-parameters.configurationStrategy=SYSTEM_PROPERTIES
server.servlet.session.cookie.http-only=true
server.servlet.session.tracking-modes=cookie
spring.jackson.parser.allow-numeric-leading-zeros=true

12
core/backend/src/main/resources/db/migration/V60__1.18.15.sql Normal file
View File

@ -0,0 +1,12 @@
ALTER TABLE `datasource`
ADD COLUMN `version` varchar(255) NULL COMMENT '版本' AFTER `status`;
ALTER TABLE `sys_auth`
MODIFY COLUMN `auth_details` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '授权明细' AFTER `auth_time`;
ALTER TABLE `sys_auth_detail`
MODIFY COLUMN `privilege_type` int(6) NULL DEFAULT NULL COMMENT '权限类型：1 使用/查看 3 导出/管理 5 仪表板管理 15 授权' AFTER `privilege_name`,
MODIFY COLUMN `privilege_value` int(6) NULL DEFAULT NULL COMMENT '权限值：1 可用 0 不可用' AFTER `privilege_type`;
ALTER TABLE `sys_task_email`
MODIFY COLUMN `groups` longtext NULL COMMENT '群聊' AFTER `view_data_range`;

2
core/backend/src/main/resources/db/migration/V61__1.18.15-chart-view-update.sql Normal file
View File

@ -0,0 +1,2 @@
alter table `chart_view`
add `_aggregate` TINYINT(1) default 0 null comment 'aggregate';

1
core/backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -94,6 +94,7 @@ i18n_sql_delete_not_matching=The data column of incremental delete SQL does not
i18n_cst_ds_tb_or_field_deleted=Custom dataset union data is deleted or field changed,can not display
i18n_no_all_delete_privilege_folder=This folder have sources which have no manage or view privilege,Can Not Be Deleted.
i18n_excel_field_repeat=Duplicate fields exist:
i18n_dont_contain_key=The current SQL doesn't include this key:
i18n_schema_is_empty=Database schema is empty
\u7AD9\u5185\u6D88\u606F=Messages Center
\u6240\u6709\u6D88\u606F=All Messages

1
core/backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -94,6 +94,7 @@ i18n_sql_delete_not_matching=\u589E\u91CF\u5220\u9664 SQL \u7684\u6570\u636E\u52
i18n_cst_ds_tb_or_field_deleted=\u81EA\u5B9A\u4E49\u6570\u636E\u96C6\u6240\u5173\u8054\u6570\u636E\u88AB\u5220\u9664\u6216\u5B57\u6BB5\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u6B63\u5E38\u663E\u793A
i18n_no_all_delete_privilege_folder=\u8BE5\u76EE\u5F55\u4E0B\u5B58\u5728\u6CA1\u6709\u7BA1\u7406\u6743\u9650\u6216\u67E5\u770B\u6743\u9650\u7684\u8D44\u6E90\uFF0C\u65E0\u6CD5\u5220\u9664
i18n_excel_field_repeat=\u5B58\u5728\u91CD\u590D\u5B57\u6BB5\uFF1A
i18n_dont_contain_key=\u5f53\u524d\u7684sql\u4e0d\u5305\u542b\u8fd9\u4e2a\u952e\uff1a
i18n_schema_is_empty=\u6570\u636E\u5E93 Schema \u4E3A\u7A7A
\u7AD9\u5185\u6D88\u606F=\u6D88\u606F\u4E2D\u5FC3
\u6240\u6709\u6D88\u606F=\u6240\u6709\u6D88\u606F

1
core/backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -94,6 +94,7 @@ i18n_sql_delete_not_matching=\u589E\u91CF\u522A\u9664 sql \u7684\u6578\u64DA\u52
i18n_cst_ds_tb_or_field_deleted=\u81EA\u5B9A\u7FA9\u6578\u64DA\u96C6\u6240\u95DC\u806F\u6578\u64DA\u88AB\u522A\u9664\u6216\u5B57\u6BB5\u767C\u751F\u8B8A\u5316\uFF0C\u7121\u6CD5\u6B63\u5E38\u986F\u793A
i18n_no_all_delete_privilege_folder=\u8A72\u76EE\u9304\u4E0B\u5B58\u5728\u6C92\u6709\u7BA1\u7406\u6B0A\u9650\u6216\u67E5\u770B\u6B0A\u9650\u7684\u8CC7\u6E90\uFF0C\u7121\u6CD5\u522A\u9664
i18n_excel_field_repeat=\u5B58\u5728\u91CD\u5FA9\u5B57\u6BB5\uFF1A
i18n_dont_contain_key=\u7576\u524d\u7684sql\u4e0d\u5305\u542b\u9019\u500b\u9375\uff1a
i18n_schema_is_empty=\u6578\u64DA\u5EAB Schema \u70BA\u7A7A
\u7AD9\u5185\u6D88\u606F=\u6D88\u606F\u4E2D\u5FC3
\u6240\u6709\u6D88\u606F=\u6240\u6709\u6D88\u606F

16
core/backend/src/main/resources/logback.xml
View File

@ -19,10 +19,10 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/debug.%d{yyyyMMdd}-%i.log
</FileNamePattern>
<maxHistory>30</maxHistory>
<maxHistory>${logging.file.history}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
<maxFileSize>${logging.file.size}</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
@ -40,10 +40,10 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/info.%d{yyyyMMdd}-%i.log
</FileNamePattern>
<maxHistory>30</maxHistory>
<maxHistory>${logging.file.history}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
<maxFileSize>${logging.file.size}</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
@ -64,10 +64,10 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/error.%d{yyyyMMdd}-%i.log
</FileNamePattern>
<maxHistory>30</maxHistory>
<maxHistory>${logging.file.history}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
<maxFileSize>${logging.file.size}</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
@ -87,10 +87,10 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${logging.file.path}/history/warn.%d{yyyyMMdd}-%i.log
</FileNamePattern>
<maxHistory>30</maxHistory>
<maxHistory>${logging.file.history}</maxHistory>
<TimeBasedFileNamingAndTriggeringPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>50MB</maxFileSize>
<maxFileSize>${logging.file.size}</maxFileSize>
</TimeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>

2
core/frontend/package.json
View File

@ -1,6 +1,6 @@
{
"name": "dataease",
"version": "1.18.14",
"version": "1.18.15",
"description": "dataease front",
"private": true,
"scripts": {

4
core/frontend/src/api/chart/chart.js
View File

@ -28,7 +28,7 @@ export function getChartTree(data) {
})
}
export function chartCopy(id, panelId) {
export async function chartCopy(id, panelId) {
return request({
url: '/chart/view/chartCopy/' + id + '/' + panelId,
method: 'post',
@ -36,7 +36,7 @@ export function chartCopy(id, panelId) {
})
}
export function chartBatchCopy(params, panelId) {
export async function chartBatchCopy(params, panelId) {
return request({
url: '/chart/view/chartBatchCopy/' + panelId,
method: 'post',

39
core/frontend/src/components/canvas/components/TextAttr.vue
View File

@ -81,7 +81,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="iconfont icon-font_size"
class="iconfont iconfont-custom icon-font_size"
/>
</el-tooltip>
@ -105,7 +105,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="iconfont icon-font"
class="iconfont iconfont-custom icon-font"
/>
</el-tooltip>
@ -129,7 +129,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-font-weight-bold"
class="icon iconfont iconfont-custom icon-font-weight-bold"
/>
</el-tooltip>
@ -154,7 +154,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-letter_spacing"
class="icon iconfont iconfont-custom icon-letter_spacing"
/>
</el-tooltip>
@ -178,7 +178,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-margin"
class="icon iconfont iconfont-custom icon-margin"
/>
</el-tooltip>
@ -202,7 +202,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-touming"
class="icon iconfont iconfont-custom icon-touming"
/>
</el-tooltip>
@ -227,7 +227,7 @@
>
<i
style="float: left;margin-top: 3px;margin-left: 2px;"
class="icon iconfont icon-fangxing-"
class="icon iconfont iconfont-custom icon-fangxing-"
/>
</el-tooltip>
@ -253,7 +253,7 @@
<div style="width: 16px;height: 18px">
<el-tooltip :content="$t('panel.color')">
<i
class="icon iconfont icon-zimua"
class="icon iconfont iconfont-custom icon-zimua"
@click="goColor"
/>
</el-tooltip>
@ -275,7 +275,7 @@
<div style="width: 16px;height: 18px">
<el-tooltip :content="$t('panel.border_color')">
<i
class="iconfont icon-huabi"
class="iconfont iconfont-custom icon-huabi"
@click="goBoardColor"
/>
</el-tooltip>
@ -298,7 +298,7 @@
<div style="width: 16px;height: 18px">
<el-tooltip :content="$t('panel.background_color')">
<i
class="iconfont icon-beijingse1"
class="iconfont iconfont-custom icon-beijingse1"
@click="goBackgroundColor"
/>
</el-tooltip>
@ -466,34 +466,34 @@ export default {
initFontSize: 12,
initActiveFontSize: 18,
miniFontSize: 12,
maxFontSize: 256,
maxFontSize: 48,
textAlignOptions: [
{
icon: 'iconfont icon-juzuo',
icon: 'iconfont iconfont-custom icon-juzuo',
tooltip: this.$t('panel.text_align_left'),
label: 'left'
},
{
icon: 'iconfont icon-align-center',
icon: 'iconfont iconfont-custom icon-align-center',
tooltip: this.$t('panel.text_align_center'),
label: 'center'
},
{
icon: 'iconfont icon-juyou',
icon: 'iconfont iconfont-custom icon-juyou',
tooltip: this.$t('panel.text_align_right'),
label: 'right'
}
],
lineStyle: [{
icon: 'iconfont icon-solid_line',
icon: 'iconfont iconfont-custom icon-solid_line',
value: 'solid',
label: '实线'
}, {
icon: 'iconfont icon-xuxian',
icon: 'iconfont iconfont-custom icon-xuxian',
value: 'dashed',
label: '虚线'
}, {
icon: 'iconfont icon-dianxian',
icon: 'iconfont iconfont-custom icon-dianxian',
value: 'dotted',
label: '点线'
}],
@ -802,4 +802,9 @@ export default {
-moz-appearance: textfield !important;
}
div {
line-height: 24px;
font-size: 16px;
}
</style>

56
core/frontend/src/components/canvas/components/editor/CanvasOptBar.vue
View File

@ -9,7 +9,7 @@
v-if="isPublicLink"
ref="widget-div"
class="function-div"
:class="functionClass"
:class="[{['function-back-div']: backToTopBtn},functionClass]"
>
<el-button-group size="mini">
<el-button
@ -30,6 +30,7 @@
class="icon iconfont icon-quxiaoliandong"
/>{{ $t('panel.remove_all_linkage') }}</el-button>
<el-button
v-if="isPcTerminal"
size="mini"
@click="exportPDF"
>
@ -38,6 +39,7 @@
icon-class="link-down"
/>{{ $t('panel.down') }}</span></el-button>
<el-button
v-if="isPcTerminal"
id="fullscreenElement"
size="mini"
@click="toggleFullscreen"
@ -48,16 +50,33 @@
/>{{ fullscreenState?$t('panel.fullscreen_exit'): $t('panel.fullscreen_preview') }}</span></el-button>
</el-button-group>
</div>
<div
v-else-if="existLinkage"
v-else-if="existLinkage || backToTopBtn"
class="bar-main-right"
>
<el-button
v-if="existLinkage"
size="mini"
type="warning"
@click="clearAllLinkage"
><i class="icon iconfont icon-quxiaoliandong" />{{ $t('panel.remove_all_linkage') }}</el-button>
<el-button
v-if="backToTopBtn"
size="mini"
type="warning"
@click="backToTop"
><i class="icon iconfont icon-back-top" />{{ $t('panel.back_to_top') }}</el-button>
</div>
<div
v-show="isPublicLink && backToTopBtn"
class="link-public"
>
<el-button
size="mini"
type="warning"
@click="backToTop"
><i class="icon iconfont icon-back-top" />{{ $t('panel.back_to_top') }}</el-button>
</div>
</div>
</template>
@ -72,6 +91,14 @@ export default {
canvasStyleData: {
type: Object,
default: null
},
backToTopBtn: {
type: Boolean,
default: false
},
terminal: {
type: String,
default: 'pc'
}
},
data() {
@ -81,6 +108,9 @@ export default {
}
},
computed: {
isPcTerminal() {
return this.terminal === 'pc'
},
functionClass() {
let result = 'function-light'
if (this.canvasStyleData?.panel?.themeColor === 'dark') {
@ -104,7 +134,7 @@ export default {
return this.$route.query.fromLink === 'true'
},
containerClass() {
return this.isPublicLink ? 'trans-pc' : 'bar-main'
return this.isPublicLink && this.isPcTerminal ? 'trans-pc' : 'bar-main'
},
...mapState([
'componentData'
@ -154,7 +184,10 @@ export default {
window.location.reload()
return false
} else {
this.$router.back(-1)
const parentUrl = localStorage.getItem('beforeJumpUrl')
localStorage.removeItem('beforeJumpUrl')
window.location.href = parentUrl
window.location.reload()
}
},
exportPDF() {
@ -168,6 +201,9 @@ export default {
const val = this.$refs['widget-div'].style.display
this.$refs['widget-div'].style.display = val ? '' : 'block'
},
backToTop() {
this.$emit('back-to-top')
}
}
}
@ -263,4 +299,14 @@ export default {
}
}
.link-public {
top: -49px;
right: 8px;
opacity: 0.8;
position: absolute;
}
.function-back-div {
right: 100px!important;
}
</style>

4
core/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
View File

@ -149,6 +149,10 @@ export default {
isRelation: {
type: Boolean,
default: false
},
userId: {
type: String,
require: false
}
},
data() {

11
core/frontend/src/components/canvas/components/editor/LinkageField.vue
View File

@ -184,10 +184,15 @@ export default {
// 初始化映射关系 如果当前是相同的数据集且没有关联关系，则自动补充映射关系
checkSameDataSet(this.curLinkageView.propValue.viewId, this.element.propValue.viewId).then(res => {
const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.curLinkageView.propValue.viewId])
const curCheckAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
let curCheckAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
if (chartDetails.type === 'bar-time-range') {
curCheckAllAxisStr = chartDetails.xaxis + chartDetails.yaxis + chartDetails.yaxisExt
}
const targetChartDetails = JSON.parse(this.panelViewDetailsInfo[this.element.propValue.viewId])
const targetCheckAllAxisStr = targetChartDetails.xaxis + targetChartDetails.xaxisExt + targetChartDetails.yaxis + targetChartDetails.yaxisExt
let targetCheckAllAxisStr = targetChartDetails.xaxis + targetChartDetails.xaxisExt + targetChartDetails.yaxis + targetChartDetails.yaxisExt
if (targetChartDetails.type === 'bar-time-range') {
targetCheckAllAxisStr = targetChartDetails.xaxis + targetChartDetails.yaxis + targetChartDetails.yaxisExt
}
if (res.data === 'YES' && this.linkageInfo.linkageFields.length === 0) {
this.sourceLinkageInfo.targetViewFields.forEach(item => {
if (curCheckAllAxisStr.includes(item.id) && targetCheckAllAxisStr.includes(item.id)) {

103
core/frontend/src/components/canvas/components/editor/Preview.vue
View File

@ -1,6 +1,7 @@
<template>
<div
:id="previewMainDomId"
:ref="previewOutRefId"
class="bg"
:style="customStyle"
@scroll="canvasScroll"
@ -8,8 +9,11 @@
<canvas-opt-bar
v-if="canvasId==='canvas-main'"
ref="canvas-opt-bar"
:terminal="terminal"
:canvas-style-data="canvasStyleData"
:back-to-top-btn="backToTopBtnShow"
@link-export-pdf="downloadAsPDF"
@back-to-top="backToTop"
/>
<div
:id="previewDomId"
@ -112,15 +116,39 @@
v-if="chartDetailsVisible"
style="position: absolute;right: 70px;top:15px"
>
<el-button
v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && showChartInfo.type !== 'symbol-map'"
class="el-icon-picture-outline"
size="mini"
:disabled="imageDownloading"
@click="exportViewImg"
>
{{ $t('chart.export_img') }}
</el-button>
<span v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && showChartInfo.type !== 'symbol-map'">
<span style="font-size: 12px">
导出分辨率
</span>
<el-select
v-model="pixel"
style="width: 120px; margin-right: 8px; margin-top: -1px"
:popper-append-to-body="false"
size="mini"
>
<el-option-group
v-for="group in pixelOptions"
:key="group.label"
:label="group.label"
>
<el-option
v-for="item in group.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-option-group>
</el-select>
<el-button
class="el-icon-picture-outline"
size="mini"
:disabled="imageDownloading"
@click="exportViewImg"
>
{{ $t('chart.export_img') }}
</el-button>
</span>
<el-button
v-if="showChartInfoType==='details'&& hasDataPermission('export',panelInfo.privileges)"
size="mini"
@ -136,6 +164,7 @@
<user-view-dialog
v-if="chartDetailsVisible"
ref="userViewDialog-canvas-main"
:user-id="userId"
:chart="showChartInfo"
:chart-table="showChartTableInfo"
:canvas-style-data="canvasStyleData"
@ -239,6 +268,7 @@ export default {
},
data() {
return {
backToTopBtnShow: false,
imageDownloading: false,
chartDetailsVisible: false,
canvasMain: null,
@ -251,6 +281,7 @@ export default {
previewMainDomId: 'preview-main-' + this.canvasId,
previewDomId: 'preview-' + this.canvasId,
previewRefId: 'preview-ref-' + this.canvasId,
previewOutRefId: 'preview-out-ref-' + this.canvasId,
previewTempDomId: 'preview-temp-' + this.canvasId,
previewTempRefId: 'preview-temp-ref-' + this.canvasId,
isShowPreview: false,
@ -287,7 +318,44 @@ export default {
pdfTemplateSelectedIndex: 0,
pdfTemplateContent: '',
templateInfo: {},
pdfTemplateAll: []
pdfTemplateAll: [],
pixelOptions: [
{
label: 'Windows(16:9)',
options: [
{
value: '1920 * 1080',
label: '1920 * 1080'
},
{
value: '1600 * 900',
label: '1600 * 900'
},
{
value: '1280 * 720',
label: '1280 * 720'
}
]
},
{
label: 'MacOS(16:10)',
options: [
{
value: '2560 * 1600',
label: '2560 * 1600'
},
{
value: '1920 * 1200',
label: '1920 * 1200'
},
{
value: '1680 * 1050',
label: '1680 * 1050'
}
]
}
],
pixel: '1280 * 720'
}
},
computed: {
@ -441,6 +509,13 @@ export default {
}
})
}
},
screenShotStatues: {
handler(newVal, oldVla) {
if (this.screenShotStatues) {
this.initWatermark('preview-temp-canvas-main')
}
}
}
},
created() {
@ -758,7 +833,7 @@ export default {
},
exportViewImg() {
this.imageDownloading = true
this.$refs['userViewDialog-canvas-main'].exportViewImg(() => {
this.$refs['userViewDialog-canvas-main'].exportViewImg(this.pixel, () => {
this.imageDownloading = false
})
},
@ -777,6 +852,9 @@ export default {
this.$store.commit('openMobileLayout')
},
canvasScroll() {
// 当滚动距离超过 100px 时显示返回顶部按钮，否则隐藏按钮
this.backToTopBtnShow = this.$refs[this.previewOutRefId].scrollTop > 200
console.log('top=' + this.$refs[this.previewOutRefId].scrollTop + ';this.backToTopBtnShow=' + this.backToTopBtnShow)
bus.$emit('onScroll')
},
initListen() {
@ -806,6 +884,9 @@ export default {
}
}, 1500)
},
backToTop() {
this.$refs[this.previewOutRefId].scrollTop = 0
},
downloadAsPDF() {
this.dataLoading = true
this.$emit('change-load-status', true)

21
core/frontend/src/components/canvas/customComponent/DeRichText.vue
View File

@ -164,7 +164,28 @@ export default {
this.editShow = false
this.$nextTick(() => {
this.editShow = true
this.editCursor()
})
},
editCursor() {
setTimeout(() => {
const myDiv = document.getElementById(this.tinymceId)
// 让光标聚焦到文本末尾
const range = document.createRange()
const sel = window.getSelection()
if (myDiv.childNodes) {
range.setStart(myDiv.childNodes[myDiv.childNodes.length - 1]
.childNodes[myDiv.childNodes[myDiv.childNodes.length - 1].childNodes.length - 1], 1)
range.collapse(false)
sel.removeAllRanges()
sel.addRange(range)
}
// 对于一些浏览器，可能需要设置光标到最后的另一种方式
if (myDiv.focus) {
myDiv.focus()
}
}, 100)
}
}
}

22
core/frontend/src/components/canvas/customComponent/DeRichTextView.vue
View File

@ -239,8 +239,30 @@ export default {
this.editShow = false
this.$nextTick(() => {
this.editShow = true
this.editCursor()
})
},
editCursor() {
setTimeout(() => {
const myDiv = document.getElementById(this.tinymceId)
// 让光标聚焦到文本末尾
const range = document.createRange()
const sel = window.getSelection()
if (myDiv.childNodes) {
range.setStart(myDiv.childNodes[myDiv.childNodes.length - 1]
.childNodes[myDiv.childNodes[myDiv.childNodes.length - 1].childNodes.length - 1],
myDiv.childNodes[myDiv.childNodes.length - 1].childNodes[myDiv.childNodes[myDiv.childNodes.length - 1].childNodes.length - 1].length)
range.collapse(false)
sel.removeAllRanges()
sel.addRange(range)
}
// 对于一些浏览器，可能需要设置光标到最后的另一种方式
if (myDiv.focus) {
myDiv.focus()
}
}, 100)
},
chartResize() {
// ignore
}

93
core/frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -154,15 +154,39 @@
v-if="chartDetailsVisible"
style="position: absolute;right: 70px;top:15px"
>
<el-button
v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && !equalsAny(showChartInfo.type, 'symbol-map', 'flow-map')"
class="el-icon-picture-outline"
size="mini"
:disabled="imageDownloading"
@click="exportViewImg"
>
{{ $t('chart.export_img') }}
</el-button>
<span v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && !equalsAny(showChartInfo.type, 'symbol-map', 'flow-map')">
<span style="font-size: 12px">
导出分辨率
</span>
<el-select
v-model="pixel"
style="width: 120px; margin-right: 8px; margin-top: -1px"
:popper-append-to-body="false"
size="mini"
>
<el-option-group
v-for="group in pixelOptions"
:key="group.label"
:label="group.label"
>
<el-option
v-for="item in group.options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-option-group>
</el-select>
<el-button
class="el-icon-picture-outline"
size="mini"
:disabled="imageDownloading"
@click="exportViewImg"
>
{{ $t('chart.export_img') }}
</el-button>
</span>
<el-button
v-if="showChartInfoType==='details' && hasDataPermission('export',panelInfo.privileges)"
size="mini"
@ -182,6 +206,7 @@
:chart-table="showChartTableInfo"
:canvas-style-data="canvasStyleData"
:open-type="showChartInfoType"
:user-id="userId"
/>
</el-dialog>
@ -318,6 +343,10 @@ export default {
type: String,
require: false,
default: 'preview'
},
userId: {
type: String,
require: false
}
},
data() {
@ -367,7 +396,44 @@ export default {
show: 0
},
view: {},
cancelTime: null
cancelTime: null,
pixelOptions: [
{
label: 'Windows(16:9)',
options: [
{
value: '1920 * 1080',
label: '1920 * 1080'
},
{
value: '1600 * 900',
label: '1600 * 900'
},
{
value: '1280 * 720',
label: '1280 * 720'
}
]
},
{
label: 'MacOS(16:10)',
options: [
{
value: '2560 * 1600',
label: '2560 * 1600'
},
{
value: '1920 * 1200',
label: '1920 * 1200'
},
{
value: '1680 * 1050',
label: '1680 * 1050'
}
]
}
],
pixel: '1280 * 720'
}
},
@ -685,7 +751,7 @@ export default {
},
exportViewImg() {
this.imageDownloading = true
this.$refs['userViewDialog'].exportViewImg(() => {
this.$refs['userViewDialog'].exportViewImg(this.pixel, () => {
this.imageDownloading = false
})
},
@ -786,10 +852,9 @@ export default {
param.viewId && param.viewId === this.element.propValue.viewId && this.getDataEdit(param)
},
clearPanelLinkage(param) {
console.log('clear linkage')
if (param.viewId === 'all' || param.viewId === this.element.propValue.viewId) {
try {
// do nothing
this.$refs[this.element.propValue.id]?.clearLinkage?.()
} catch (e) {
console.error('reDrawView-error：', this.element.propValue.id)
}
@ -1110,7 +1175,7 @@ export default {
}
})
}
if (!jumpInfo) {
if (!jumpInfo && !this.chart.type.includes('table')) {
for (let i = param.dimensionList.length - 1; i >= 0; i--) {
dimension = param.dimensionList[i]
sourceInfo = param.viewId + '#' + dimension.id

76
core/frontend/src/components/canvas/customComponent/UserViewDialog.vue
View File

@ -5,7 +5,11 @@
>
<de-main-container
v-show="showChartCanvas"
class=""
v-loading="exportLoading"
style="overflow: hidden"
:element-loading-text="$t('panel.data_loading')"
element-loading-spinner="el-icon-loading"
element-loading-background="rgba(220,220,220,1)"
>
<div
id="chartCanvas"
@ -18,6 +22,7 @@
>
<plugin-com
v-if="chart.isPlugin"
:ref="element.propValue.id"
:component-name="chart.type + '-view'"
:obj="{chart: mapChart || chart}"
:chart="mapChart || chart"
@ -27,32 +32,38 @@
/>
<chart-component
v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'echarts'"
:ref="element.propValue.id"
:theme-style="element.commonBackground"
class="chart-class"
:chart="mapChart || chart"
/>
<chart-component-g2
v-else-if="!chart.type.includes('text') && chart.type !== 'label' && !chart.type.includes('table') && renderComponent() === 'antv'"
:ref="element.propValue.id"
class="chart-class show-in-dialog"
:chart="chart"
/>
<chart-component-s2
v-else-if="chart.type.includes('table') && renderComponent() === 'antv'"
:ref="element.propValue.id"
class="chart-class"
:chart="chart"
/>
<label-normal
v-else-if="chart.type.includes('text')"
:ref="element.propValue.id"
:chart="chart"
class="table-class"
/>
<label-normal-text
v-else-if="chart.type === 'label'"
:ref="element.propValue.id"
:chart="chart"
class="table-class"
/>
<table-normal
v-else-if="chart.type.includes('table') && renderComponent() === 'echarts'"
:ref="element.propValue.id"
:chart="chart"
class="table-class"
/>
@ -85,6 +96,8 @@ import LabelNormalText from '@/views/chart/components/normal/LabelNormalText'
import html2canvas from 'html2canvasde'
import { hexColorToRGBA } from '@/views/chart/chart/util'
import { deepCopy, exportExcelDownload, exportImg, imgUrlTrans } from '@/components/canvas/utils/utils'
import { activeWatermark } from '@/components/canvas/tools/watermark'
import { proxyUserLoginInfo, userLoginInfo } from '@/api/systemInfo/userLogin'
export default {
name: 'UserViewDialog',
@ -111,6 +124,10 @@ export default {
openType: {
type: String,
default: 'details'
},
userId: {
type: String,
require: false
}
},
@ -119,7 +136,10 @@ export default {
refId: null,
element: {},
lastMapChart: null,
linkLoading: false
linkLoading: false,
exporting: false,
exportLoading: false,
pixel: '1280 * 720'
}
},
computed: {
@ -137,6 +157,13 @@ export default {
},
customStyle() {
let style = {}
if (this.exporting) {
const bashStyle = this.pixel.split(' * ')
style = {
width: bashStyle[0] + 'px!important',
height: bashStyle[1] + 'px!important'
}
}
if (this.canvasStyleData.openCommonStyle) {
if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
style = {
@ -237,8 +264,22 @@ export default {
this.element = deepCopy(this.curComponent)
},
mounted() {
this.initWatermark()
},
methods: {
initWatermark(waterDomId = 'chartCanvas') {
if (this.panelInfo.watermarkInfo) {
if (this.userInfo) {
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, 'canvas-main', this.panelInfo.watermarkOpen, 'de-watermark-view')
} else {
const method = this.userId ? proxyUserLoginInfo : userLoginInfo
method().then(res => {
this.userInfo = res.data
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, 'canvas-main', this.panelInfo.watermarkOpen, 'de-watermark-view')
})
}
}
},
exportExcel(callBack) {
const _this = this
if (this.isOnlyDetails) {
@ -254,8 +295,24 @@ export default {
}
}
},
exportViewImg(callback) {
exportImg(this.chart.name, callback)
exportViewImg(pixel, callback) {
this.pixel = pixel
this.exportLoading = true
this.$nextTick(() => {
this.exporting = true
this.resizeChart()
setTimeout(() => {
this.initWatermark()
exportImg(this.chart.name, (params) => {
this.exporting = false
this.resizeChart()
setTimeout(() => {
this.exportLoading = false
}, 500)
callback(params)
})
}, 500)
})
},
setLastMapChart(data) {
this.lastMapChart = JSON.parse(JSON.stringify(data))
@ -267,6 +324,13 @@ export default {
renderComponent() {
return this.chart.render
},
resizeChart() {
if (this.$refs[this.element.propValue.id]) {
this.chart.isPlugin
? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
: this.$refs[this.element.propValue.id].chartResize()
}
}
}
}
@ -300,6 +364,10 @@ export default {
height: 100%;
background-size: 100% 100% !important;
}
.canvas-class-exporting {
width: 1980px!important;
height: 860px!important;
}
.abs-container {
position: absolute;

20
core/frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue
View File

@ -6,6 +6,7 @@
class="full-div"
>
<div
id="chartCanvas"
class="canvas-class"
:style="commonStyle"
>
@ -70,6 +71,8 @@ import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
import PluginCom from '@/views/system/plugin/PluginCom'
import { deepCopy, imgUrlTrans } from '@/components/canvas/utils/utils'
import { hexColorToRGBA } from '@/views/chart/chart/util'
import {activeWatermark} from "@/components/canvas/tools/watermark";
import {proxyUserLoginInfo, userLoginInfo} from "@/api/systemInfo/userLogin";
export default {
name: 'UserViewMobileDialog',
components: { ChartComponentS2, LabelNormalText, DeContainer, DeMainContainer, ChartComponentG2, ChartComponent, TableNormal, LabelNormal, PluginCom },
@ -81,6 +84,10 @@ export default {
chartTable: {
type: Object,
default: null
},
userId: {
type: String,
require: false
}
},
@ -180,6 +187,19 @@ export default {
this.element = deepCopy(this.curComponent)
},
methods: {
initWatermark(waterDomId = 'chartCanvas') {
if (this.panelInfo.watermarkInfo) {
if (this.userInfo) {
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, 'canvas-main', this.panelInfo.watermarkOpen, 'de-watermark-view')
} else {
const method = this.userId ? proxyUserLoginInfo : userLoginInfo
method().then(res => {
this.userInfo = res.data
activeWatermark(this.panelInfo.watermarkInfo.settingContent, this.userInfo, waterDomId, 'canvas-main', this.panelInfo.watermarkOpen, 'de-watermark-view')
})
}
}
},
renderComponent() {
return this.chart.render

4
core/frontend/src/components/canvas/customComponent/component-list.js
View File

@ -383,8 +383,8 @@ const list = [
mobileStyle: BASE_MOBILE_STYLE,
hyperlinks: HYPERLINKS,
style: {
width: 200,
height: 200,
width: 400,
height: 400,
borderStyle: 'solid',
borderWidth: 0,
borderColor: '#000000',

35
core/frontend/src/components/canvas/store/copy.js
View File

@ -91,6 +91,7 @@ export default {
component['canvasId'] = 'canvas-main'
component['canvasPid'] = '0'
state.copyData = {
dataFrom: 'multiplexing',
data: component,
index: index
}
@ -107,10 +108,17 @@ export default {
state.isCut = false
},
paste(state, needAdaptor) {
async paste(state, needAdaptor) {
if (!state.copyData) {
return
}
let targetComponentData
if (state.copyData.dataFrom === 'multiplexing') {
targetComponentData = state.previewComponentData
} else {
targetComponentData = state.componentData
}
const data = state.copyData.data
// 仪表板复制的组件默认不在移动端部署中mobileSelected = false
data.mobileSelected = false
@ -118,7 +126,6 @@ export default {
data.style.top = Number(data.style.top) + 20
data.style.left = Number(data.style.left) + 20
}
data.id = generateID()
// 如果是用户视图 测先进行底层复制
if (data.type === 'view') {
chartCopy(data.propValue.viewId, state.panel.panelInfo.id).then(res => {
@ -137,6 +144,7 @@ export default {
store.commit('addComponent', { component: newView })
})
} else if (data.type === 'de-tabs') {
const newTabComponents = []
const sourceAndTargetIds = {}
const newCop = deepCopy(data)
newCop.id = uuid.v1()
@ -149,14 +157,35 @@ export default {
if (item.content.filters && item.content.filters.length) {
item.content.filters = []
}
} else if (item.content && item.content.type === 'canvas') {
const oldTabCanvasId = data.id + '-' + item.name
const newTabCanvasId = newCop.id + '-' + item.name
targetComponentData.forEach(component => {
if (component.canvasId === oldTabCanvasId) {
const newTabCop = deepCopy(component)
newTabCop.id = uuid.v1()
newTabCop.canvasId = newTabCanvasId
if (component.component === 'user-view') {
newTabCop.propValue.viewId = uuid.v1()
sourceAndTargetIds[component.propValue.viewId] = newTabCop.propValue.viewId
}
if (needAdaptor && store.state.multiplexingStyleAdapt) {
adaptCurThemeCommonStyle(newTabCop, 'copy')
}
newTabComponents.push(newTabCop)
}
})
}
})
chartBatchCopy({ 'sourceAndTargetIds': sourceAndTargetIds }, state.panel.panelInfo.id).then((rsp) => {
await chartBatchCopy({ 'sourceAndTargetIds': sourceAndTargetIds }, state.panel.panelInfo.id).then((rsp) => {
if (needAdaptor && store.state.multiplexingStyleAdapt) {
adaptCurThemeCommonStyle(newCop, 'copy')
}
store.commit('addComponent', { component: newCop })
})
if (newTabComponents) {
store.commit('addBatchComponent', newTabComponents)
}
} else {
const newCop = deepCopy(data)
newCop.id = uuid.v1()

10
core/frontend/src/components/canvas/tools/watermark.js
View File

@ -1,6 +1,6 @@
// 动态创建水印元素的封装函数
export function watermark(settings, domId) {
export function watermark(settings, domId, watermarkDomId = 'de-watermark-server') {
const watermarkDom = document.getElementById(domId)
// 默认设置
const defaultSettings = {
@ -85,7 +85,7 @@ export function watermark(settings, domId) {
oTemp.appendChild(mask_div)
}
}
oTemp.setAttribute('id', 'de-watermark-server')
oTemp.setAttribute('id', watermarkDomId)
watermarkDom.appendChild(oTemp)
}
@ -109,9 +109,9 @@ export function getNow() {
return time
}
export function activeWatermark(watermarkForm, userLoginInfo, domId, canvasId, watermarkOpen) {
export function activeWatermark(watermarkForm, userLoginInfo, domId, canvasId, watermarkOpen, watermarkDomId = 'de-watermark-server') {
// 清理历史水印
const historyWatermarkDom = document.getElementById('de-watermark-server')
const historyWatermarkDom = document.getElementById(watermarkDomId)
if (historyWatermarkDom) {
historyWatermarkDom.remove()
}
@ -148,7 +148,7 @@ export function activeWatermark(watermarkForm, userLoginInfo, domId, canvasId, w
watermark_y_space: watermarkForm.watermark_y_space,
watermark_fontsize: watermarkForm.watermark_fontsize + 'px'
}
watermark(settings, domId)
watermark(settings, domId, watermarkDomId)
}
export default { watermark, getNow, activeWatermark }

8
core/frontend/src/components/canvas/utils/utils.js
View File

@ -85,6 +85,7 @@ export function panelInit(componentData, componentStyle) {
}
export function panelDataPrepare(componentData, componentStyle, callback) {
store.commit('initPanelViewDetailsInfo')
// style初始化
componentStyle.autoSizeAdaptor = (componentStyle.autoSizeAdaptor === undefined ? true : componentStyle.autoSizeAdaptor)
componentStyle.refreshTime = (componentStyle.refreshTime || 5)
@ -226,6 +227,11 @@ export function checkViewTitle(opt, id, tile) {
export function exportImg(imgName, callback) {
const canvasID = document.getElementById('chartCanvas')
const a = document.createElement('a')
// 保存原始的设备像素比值
const originalDPR = window.devicePixelRatio
// 将设备像素比设置为1
window.devicePixelRatio = 1
html2canvas(canvasID).then(canvas => {
const dom = document.body.appendChild(canvas)
dom.style.display = 'none'
@ -238,8 +244,10 @@ export function exportImg(imgName, callback) {
a.click()
URL.revokeObjectURL(blob)
document.body.removeChild(a)
window.devicePixelRatio = originalDPR
callback()
}).catch(() => {
window.devicePixelRatio = originalDPR
callback()
})
}

4
core/frontend/src/components/dataeaseTabs/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-tabs
ref="tabsConstom"
:class="['de-tabs',...tabClassName]"
:class="['de-tabs-component',...tabClassName]"
:style="tabStyle"
v-bind="$attrs"
v-on="$listeners"
@ -60,7 +60,7 @@ export default {
}
</script>
<style lang="scss">
@import "../../styles/de-tabs";
@import "../../styles/de-tabs-component";
</style>

15
core/frontend/src/components/widget/deWidget/DeSelect.vue
View File

@ -554,6 +554,7 @@ export default {
if (this.isCustomSortWidget && this.element.options.attrs?.sort?.sort === 'custom') {
tempData = mergeCustomSortOption(this.element.options.attrs.sort.list, tempData)
}
this.filterInvalidValue(tempData)
return tempData.map(item => {
return {
id: item,
@ -561,6 +562,20 @@ export default {
}
})
},
filterInvalidValue(data) {
if (this.value === null) {
return
}
if (!data.length) {
this.value = null
return
}
if (this.element.options.attrs.multiple) {
this.value = this.value.filter(item => data.includes(item))
} else {
this.value = data.includes(this.value) ? this.value : null
}
},
setOptionWidth(event) {
this.onFocus = true
// 下拉框弹出时，设置弹框的宽度

6
core/frontend/src/components/widget/deWidget/DeTabs.vue
View File

@ -74,7 +74,7 @@
/>
<div
v-if="item.content && item.content.type==='canvas' && (!isEdit || mobileLayoutStatus)"
style="width: 100%;height:100%"
style="width: 100%;height:100%;font-size: initial"
>
<Preview
:ref="'canvasTabRef-'+item.name"
@ -131,7 +131,7 @@
v-model="textarea"
type="textarea"
:rows="2"
maxlength="10"
maxlength="20"
show-word-limit
:placeholder="$t('dataset.input_content')"
/>
@ -512,7 +512,7 @@ export default {
this.$nextTick(() => {
if (this.element.options.tabList.length > 1) {
const containerDom = document.getElementById('tab-' + this.element.options.tabList[this.element.options.tabList.length - 1].name)
this.tabsAreaScroll = containerDom.parentNode.scrollWidth > containerDom.parentNode.parentNode.scrollWidth
this.tabsAreaScroll = containerDom.parentNode.scrollWidth >= containerDom.parentNode.parentNode.scrollWidth
} else {
this.tabsAreaScroll = false
}

1
core/frontend/src/components/widget/serviceImpl/NumberSelectGridServiceImpl.js
View File

@ -13,6 +13,7 @@ const dialogPanel = {
multiple: false,
placeholder: 'denumbergridselect.placeholder',
viewIds: [],
parameters: [],
data: [],
key: 'id',
label: 'text',

18
core/frontend/src/lang/en.js
View File

@ -382,6 +382,7 @@ export default {
thumbnail: 'thumbnail',
confirm_delete: 'Confirm delete',
delete_this_dashboard: 'Are you sure to delete this dashboard?',
cancel_this_dashboard: 'Are you sure to cancel this default dashboard?',
delete_this_folder: 'Are you sure to delete this folder?',
confirm_stop: 'Confirm stop',
stop_success: 'Stop success',
@ -840,6 +841,7 @@ export default {
empty_msg: 'If empty then default value is 30 days',
front_error: 'Valid range [0 - 300]', // 修改了提示信息
msg_error: 'Valid range [1 - 365]',
log_live_time_error: 'Valid range [1 - 4000]',
limit_times_error: 'Valid range [1 - 100]',
relieve_times_error: 'Valid range [1 - 100]',
SMTP_port: 'SMTP Port',
@ -1111,6 +1113,7 @@ export default {
asc: 'Ascending Order',
desc: 'Descending Order',
sort: 'Sort',
default: 'Default',
filter: 'Filter',
is_set: 'Is Set',
none: 'None',
@ -1287,6 +1290,7 @@ export default {
map_range: 'Map range',
select_map_range: 'Please select map range',
area: 'Area',
aggregate: 'Aggregate',
placeholder_field: 'Drag Field To Here',
axis_label_rotate: 'Label Rotate',
chart_scatter_bubble: 'Bubble',
@ -1499,6 +1503,8 @@ export default {
gauge_size_field_delete: 'Dynamic field changed，please edit again',
chart_group: 'Sub Type',
chart_bar_time: 'Range',
chart_bar_time2: 'Time Range',
chart_bar_time_tip: 'Only active when the range type is time',
chart_bar_group: 'Bar Group',
chart_bar_group_stack: 'Group Stack Bar',
field_dynamic: 'Dynamic',
@ -1871,7 +1877,11 @@ export default {
tip6: 'Use the functions supported by the database type corresponding to the dataset. The syntax is the same as that of the corresponding database',
tip7: 'For example, date format: MySQL uses DATE_ FORMAT(date,format)； Oracle uses TO_ DATE(X,[,fmt])',
tip8: 'Non direct connection mode data set, use Doris database functions, refer to Doris official website'
}
},
set_key: 'Set Primary Key',
change_to_key: 'Set as primary key',
selecet_key: 'Select primary key',
no_set_key: 'No primary key set'
},
driver: {
driver: 'Driver',
@ -2051,6 +2061,7 @@ export default {
back_parent: 'Back to previous'
},
panel: {
app_export_tips: 'In the current dashboard, [{0}] belongs to a template view and cannot be exported. Please set up the dataset first!',
required_tips: 'Cannot be empty!',
filter_no_select: 'Filter components do not need to be selected',
first_item: 'First item',
@ -2084,7 +2095,7 @@ export default {
component_color: 'Component color',
chart_title: 'Chart title',
filter_component: 'Filter component',
enable_refresh_view: 'Enable refresh',
enable_refresh_view: 'Data refresh',
enable_view_loading: 'View loading prompt',
image_size_tips: 'Please do not exceed 15M in the picture',
image_add_tips: 'Only pictures can be inserted',
@ -2191,7 +2202,7 @@ export default {
when_share: 'When share',
share_to: 'Share to',
share_to_some: 'Share [{some}] to',
org: 'Orgnization',
org: 'Organization',
role: 'Role',
user: 'User',
datalist: 'Chart List',
@ -2336,6 +2347,7 @@ export default {
switch_picture: 'Switch Picture',
select_field: 'Select View Field',
remove_all_linkage: 'Remove All Linkage',
back_to_top: 'Back To Top',
exit_un_march_linkage_field: 'Exit Un March Linkage Field',
details: 'Details',
setting: 'Setting',

16
core/frontend/src/lang/tw.js
View File

@ -382,6 +382,7 @@ export default {
thumbnail: '縮略圖',
confirm_delete: '確認刪除',
delete_this_dashboard: '確認删除該儀錶板嗎?',
cancel_this_dashboard: '確認取消該默认儀錶板嗎?',
delete_this_folder: '確認删除該目錄嗎?',
confirm_stop: '確認停止',
stop_success: '停止成功',
@ -839,6 +840,7 @@ export default {
empty_msg: '為空則默認取值30天',
front_error: '請填寫0-300正整數', // 修改了提示信息
msg_error: '請填寫1-365正整數',
log_live_time_error: '請填寫1-4000正整數',
limit_times_error: '請填寫1-100正整數',
relieve_times_error: '請填寫1-100正整數',
SMTP_port: 'SMTP端口',
@ -1111,6 +1113,7 @@ export default {
asc: '升序',
desc: '降序',
sort: '排序',
default: '默認',
filter: '過濾',
is_set: '已設定',
none: '無',
@ -1285,6 +1288,7 @@ export default {
select_map_range: '請選擇地圖範圍',
area: '地區',
stack_item: '堆疊項',
aggregate: '聚合',
placeholder_field: '拖動字段至此處',
axis_label_rotate: '標簽角度',
chart_scatter_bubble: '氣泡圖',
@ -1496,6 +1500,8 @@ export default {
gauge_size_field_delete: '動態值中字段發生變更，請重新編輯',
chart_group: '子類別',
chart_bar_time: '區間范圍',
chart_bar_time2: '時間區間范圍',
chart_bar_time_tip: '僅針對時間區間生效',
chart_bar_group: '分組柱狀圖',
chart_bar_group_stack: '分組堆疊柱狀圖',
field_dynamic: '動態值',
@ -1863,7 +1869,11 @@ export default {
tip6: '使用數據集對應數據庫類型所支持的函數，語法同對應數據庫',
tip7: '如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt])',
tip8: '非直連模式數據集，使用Doris數據庫函數，可參考Doris官網'
}
},
set_key: '設定主鍵',
change_to_key: '設定為主鍵',
selecet_key: '選擇主鍵',
no_set_key: '未設定主鍵'
},
driver: {
driver: '驅動',
@ -2043,6 +2053,7 @@ export default {
back_parent: '返回上一級'
},
panel: {
app_export_tips: '當前儀表板中[{0}]屬於模板視圖，無法導出，請先設置數據集！',
required_tips: '必填項不能爲空！',
filter_no_select: '過濾組件無需選擇',
first_item: '首項',
@ -2076,7 +2087,7 @@ export default {
component_color: '組件配色',
chart_title: '圖表標題',
filter_component: '過濾組件',
enable_refresh_view: '開啟刷新',
enable_refresh_view: '数据刷新',
enable_view_loading: '視圖加載提示',
image_size_tips: '圖片請不要大於15M',
image_add_tips: '只能插入圖片',
@ -2328,6 +2339,7 @@ export default {
switch_picture: '更換圖片',
select_field: '選擇視圖字段',
remove_all_linkage: '清除所有聯動',
back_to_top: '返回頂部',
exit_un_march_linkage_field: '存在未匹配聯動關繫的字段',
details: '詳情',
setting: '設置',

18
core/frontend/src/lang/zh.js
View File

@ -381,6 +381,7 @@ export default {
thumbnail: '缩略图',
confirm_delete: '确认删除',
delete_this_dashboard: '确认删除该仪表板吗?',
cancel_this_dashboard: '确认取消该默认仪表板吗?',
delete_this_folder: '确认删除该目录吗?',
confirm_stop: '确认停止',
stop_success: '停止成功',
@ -934,7 +935,8 @@ export default {
edit_classification: '编辑分类',
classification_name: '分类名称',
by_event_details: '通过事件详情搜索',
password_input_error: '原始密码输入错误'
password_input_error: '原始密码输入错误',
log_live_time_error: '请填写1-4000整数'
},
chart: {
empty_hide: '隐藏空值',
@ -1110,6 +1112,7 @@ export default {
asc: '升序',
desc: '降序',
sort: '排序',
default: '默认',
filter: '过滤',
is_set: '已设置',
none: '无',
@ -1285,6 +1288,7 @@ export default {
select_map_range: '请选择地图范围',
area: '地区',
stack_item: '堆叠项',
aggregate: '聚合',
placeholder_field: '拖动字段至此处',
axis_label_rotate: '标签角度',
chart_scatter_bubble: '气泡图',
@ -1496,6 +1500,8 @@ export default {
gauge_size_field_delete: '动态值中字段发生变更，请重新编辑',
chart_group: '子类别',
chart_bar_time: '区间范围',
chart_bar_time2: '时间区间范围',
chart_bar_time_tip: '仅针对时间区间生效',
chart_bar_group: '分组柱状图',
chart_bar_group_stack: '分组堆叠柱状图',
field_dynamic: '动态值',
@ -1863,7 +1869,11 @@ export default {
tip6: '使用数据集对应数据库类型所支持的函数，语法同对应数据库',
tip7: '如日期格式化：MySQL使用DATE_FORMAT(date,format)；Oracle使用TO_DATE(X,[,fmt])',
tip8: '非直连模式数据集，使用Doris数据库函数，可参考Doris官网'
}
},
set_key: '设置主键',
change_to_key: '设置为主键',
selecet_key: '选择主键',
no_set_key: '未设置主键'
},
driver: {
driver: '驱动',
@ -2046,6 +2056,7 @@ export default {
back_parent: '返回上一级'
},
panel: {
app_export_tips: '当前仪表板中[{0}]属于模版视图，无法导出，请先设置数据集！',
required_tips: '必填项不能为空！',
filter_no_select: '过滤组件无需选择',
first_item: '首项',
@ -2079,7 +2090,7 @@ export default {
component_color: '组件配色',
chart_title: '图表标题',
filter_component: '过滤组件',
enable_refresh_view: '开启刷新',
enable_refresh_view: '数据刷新',
enable_view_loading: '视图加载提示',
image_size_tips: '图片请不要大于15M',
image_add_tips: '只能插入图片',
@ -2331,6 +2342,7 @@ export default {
switch_picture: '更换图片',
select_field: '选择视图字段',
remove_all_linkage: '清除所有联动',
back_to_top: '返回顶部',
exit_un_march_linkage_field: '存在未匹配联动关系的字段',
details: '详情',
setting: '设置',

Some files were not shown because too many files have changed in this diff Show More