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

Merge pull request #10484 from dataease/pr@dev-v2_export_data

Browse Source 
Pr@dev v2 export data
This commit is contained in:
taojinlong 2024-06-25 10:57:07 +08:00 committed by GitHub
commit 22253df9ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,7 +561,7 @@ public class SqlparserUtils {
if (sqlVariableDetails.getOperator().equals("in")) {
return "'" + String.join("','", sqlVariableDetails.getValue()) + "'";
} else if (sqlVariableDetails.getOperator().equals("between")) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(sqlVariableDetails.getType().size() > 1 ? (String) sqlVariableDetails.getType().get(1).replace("DD", "dd") : "YYYY");
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(sqlVariableDetails.getType().size() > 1 ? (String) sqlVariableDetails.getType().get(1).replace("DD", "dd").replace("YYYY", "yyyy") : "yyyy");
if (StringUtils.endsWith(sqlVariableDetails.getId(), START_END_SEPARATOR)) {
return simpleDateFormat.format(new Date(Long.parseLong((String) sqlVariableDetails.getValue().get(1))));
} else {

2
core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
View File

@ -393,7 +393,7 @@ public class CalciteProvider {
configuration = JsonUtil.parseObject(datasourceDTO.getConfiguration(), Impala.class);
if (StringUtils.isNotEmpty(configuration.getUrlType()) && configuration.getUrlType().equalsIgnoreCase("jdbcUrl")) {
if (configuration.getJdbcUrl().contains("password=")) {
String[] params = configuration.getJdbcUrl().split(";")[1].split("&");
String[] params = configuration.getJdbcUrl().split(";");
String pd = "";
for (int i = 0; i < params.length; i++) {
if (params[i].contains("password=")) {