diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index fa7cdcf96f..e16cfc3aa8 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -74,9 +74,9 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey); Date nTimeByCron = getNTimeByCron(cron, startTime); - if (startTime.before(new Date())) { - triggerBuilder.startAt(nTimeByCron); - } +// if (startTime.before(new Date())) { + triggerBuilder.startAt(nTimeByCron); +// } if (endTime != null) { if (endTime.before(nTimeByCron)) { @@ -157,9 +157,9 @@ public class ScheduleManager { triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组 Date nTimeByCron = getNTimeByCron(cron, startTime); - if (startTime.before(new Date())) { - triggerBuilder.startAt(nTimeByCron); - } +// if (startTime.before(new Date())) { + triggerBuilder.startAt(nTimeByCron); +// } if (endTime != null) { if (endTime.before(nTimeByCron)) { diff --git a/backend/src/main/java/io/dataease/service/AboutService.java b/backend/src/main/java/io/dataease/service/AboutService.java index 9568c4f6b9..5041719751 100644 --- a/backend/src/main/java/io/dataease/service/AboutService.java +++ b/backend/src/main/java/io/dataease/service/AboutService.java @@ -4,6 +4,7 @@ import io.dataease.commons.constants.AuthConstants; import io.dataease.commons.license.DefaultLicenseService; import io.dataease.commons.license.F2CLicenseResponse; import io.dataease.commons.utils.CommonBeanFactory; +import io.dataease.commons.utils.DateUtils; import io.dataease.commons.utils.LogUtil; import io.dataease.listener.util.CacheUtils; import org.apache.commons.io.FileUtils; @@ -27,11 +28,17 @@ public class AboutService { F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.updateLicense(product, licenseKey); Optional.ofNullable(f2CLicenseResponse).ifPresent(resp -> { if (resp.getStatus() == F2CLicenseResponse.Status.valid){ - CacheUtils.updateLicCache(new Date(f2CLicenseResponse.getLicense().getExpired())); - - CacheUtils.removeAll(AuthConstants.USER_CACHE_NAME); - CacheUtils.removeAll(AuthConstants.USER_ROLE_CACHE_NAME); - CacheUtils.removeAll(AuthConstants.USER_PERMISSION_CACHE_NAME); + String dateStr = f2CLicenseResponse.getLicense().getExpired(); + LogUtil.info("update valid lic, expired date is {}", dateStr); + try { + Date date = DateUtils.getDate(dateStr); + CacheUtils.updateLicCache(date); + CacheUtils.removeAll(AuthConstants.USER_CACHE_NAME); + CacheUtils.removeAll(AuthConstants.USER_ROLE_CACHE_NAME); + CacheUtils.removeAll(AuthConstants.USER_PERMISSION_CACHE_NAME); + } catch (Exception e) { + LogUtil.error(e); + } } }); return f2CLicenseResponse; diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index a802d81b00..141366f4e6 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -199,17 +199,18 @@ public class ExtractDataService { extractData(datasetTable, "all_scope"); replaceTable(DorisTableUtils.dorisName(datasetTableId)); saveSucessLog(datasetTableTaskLog); + deleteFile("all_scope", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed); }catch (Exception e){ saveErrorLog(datasetTableId, taskId, e); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error); dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); + deleteFile("all_scope", datasetTableId); }finally { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); dataSetTableTaskService.update(datasetTableTask); } - deleteFile("all_scope", datasetTableId); } break; @@ -258,18 +259,20 @@ public class ExtractDataService { extractData(datasetTable, "incremental_delete"); } saveSucessLog(datasetTableTaskLog); + deleteFile("incremental_add", datasetTableId); + deleteFile("incremental_delete", datasetTableId); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed); } }catch (Exception e){ saveErrorLog(datasetTableId, taskId, e); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error); + deleteFile("incremental_add", datasetTableId); + deleteFile("incremental_delete", datasetTableId); }finally { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); dataSetTableTaskService.update(datasetTableTask); } - deleteFile("incremental_add", datasetTableId); - deleteFile("incremental_delete", datasetTableId); } break; } diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue index 269f68eee1..57853a8e67 100644 --- a/frontend/src/components/widget/DeWidget/DeSelect.vue +++ b/frontend/src/components/widget/DeWidget/DeSelect.vue @@ -48,13 +48,14 @@ export default { watch: { 'options.attrs.multiple': function(value) { const sourceValue = this.options.value + const sourceValid = !!sourceValue && Object.keys(sourceValue).length > 0 if (value) { - !sourceValue && (this.options.value = []) - sourceValue && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(',')) + !sourceValid && (this.options.value = []) + sourceValid && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(',')) !this.inDraw && (this.options.value = []) } else { - !sourceValue && (this.options.value = null) - sourceValue && Array.isArray(sourceValue) && (this.options.value = sourceValue[0]) + !sourceValid && (this.options.value = null) + sourceValid && Array.isArray(sourceValue) && (this.options.value = sourceValue[0]) !this.inDraw && (this.options.value = null) } } @@ -68,7 +69,7 @@ export default { // this.$nextTick(() => { // this.options && this.options.value && this.changeValue(this.options.value) // }) - this.options && this.options.value && this.changeValue(this.options.value) + this.options && this.options.value && Object.keys(this.options.value).length > 0 && this.changeValue(this.options.value) }, methods: { changeValue(value) { diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue index e859786e02..3d5d0a0496 100644 --- a/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -6,13 +6,13 @@ id="label-content" :style="content_class" > -
- - {{ chart.data.series[0].name }} +
+ {{ item.data[0] }}
-- {{ item.data[0] }} +
+ + {{ chart.data.series[0].name }}