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

Merge pull request #7236 from dataease/pr@dev-v2@fixDatasource

Browse Source 
Pr@dev v2@fix datasource
This commit is contained in:
taojinlong 2023-12-20 17:01:33 +08:00 committed by GitHub
commit b71f60563d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/core-backend/src/main/java/io/dataease/chart/utils/ChartDataBuild.java
View File

@ -1105,14 +1105,13 @@ public class ChartDataBuild {
desensitizationStr = "*** ***"; desensitizationStr = "*** ***";
break; break;
} }
if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() >= columnPermissionItem.getDesensitizationRule().getN()) { if (columnPermissionItem.getDesensitizationRule().getM() == 1) {
desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***"; desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***";
break; break;
} else {
desensitizationStr = "***" + StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, columnPermissionItem.getDesensitizationRule().getN()) + "***";
break;
} }
if (originStr.length() >= columnPermissionItem.getDesensitizationRule().getM() && originStr.length() < columnPermissionItem.getDesensitizationRule().getN()) {
desensitizationStr = StringUtils.substring(originStr, columnPermissionItem.getDesensitizationRule().getM() - 1, originStr.length());
}
break;
default: default:
break; break;

3
core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
View File

@ -302,6 +302,9 @@ public class ExcelUtils {
sdf.parse(value); sdf.parse(value);
return "DATETIME"; return "DATETIME";
} catch (Exception e1) { } catch (Exception e1) {
if(value.length()> 19){
return "TEXT";
}
try { try {
Double d = Double.valueOf(value); Double d = Double.valueOf(value);
double eps = 1e-10; double eps = 1e-10;

2
core/core-backend/src/main/java/io/dataease/job/sechedule/DeScheduleJob.java
View File

@ -18,7 +18,7 @@ public abstract class DeScheduleJob implements Job {
this.expression = jobDataMap.getString("expression"); this.expression = jobDataMap.getString("expression");
this.taskId = jobDataMap.getLong("taskId"); this.taskId = jobDataMap.getLong("taskId");
this.updateType = jobDataMap.getString("updateType"); this.updateType = jobDataMap.getString("updateType");
LogUtil.info(jobKey.getGroup() + " Running: " + datasetTableId); LogUtil.info(jobKey.getName() + " Running: " + datasetTableId);
LogUtil.info("CronExpression: " + expression); LogUtil.info("CronExpression: " + expression);
businessExecute(context); businessExecute(context);
} }

3
core/core-frontend/src/views/visualized/data/datasource/form/CreatDsGroup.vue
View File

@ -257,6 +257,9 @@ const saveDataset = () => {
if (cmd.value === 'move' && !checkPid(params.pid)) { if (cmd.value === 'move' && !checkPid(params.pid)) {
return return
} }
if (loading.value) {
return
}
loading.value = true loading.value = true
if (request) { if (request) {
let options = { let options = {

4
core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
View File

@ -125,7 +125,7 @@ const initForm = type => {
startTime: '', startTime: '',
endTime: '', endTime: '',
endLimit: '0', endLimit: '0',
cron: '0 0 0/1 * * ? *' cron: '0 0/1 * * * ? *'
} }
} }
if (type === 'oracle') { if (type === 'oracle') {
@ -362,7 +362,7 @@ const onRateChange = () => {
form.value.syncSetting.cron = '' form.value.syncSetting.cron = ''
} }
if (form.value.syncSetting.syncRate === 'SIMPLE_CRON') { if (form.value.syncSetting.syncRate === 'SIMPLE_CRON') {
form.value.syncSetting.cron = '0 0 0/1 * * ? *' form.value.syncSetting.cron = '0 0/1 * * * ? *'
form.value.syncSetting.simpleCronType = 'minute' form.value.syncSetting.simpleCronType = 'minute'
} }
if (form.value.syncSetting.syncRate === 'CRON') { if (form.value.syncSetting.syncRate === 'CRON') {