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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
wangjiahao 2021-06-11 16:53:40 +08:00
commit a31b783ab0
5 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java
View File

@ -74,9 +74,9 @@ public class ScheduleManager {
triggerBuilder.withIdentity(triggerKey); triggerBuilder.withIdentity(triggerKey);
Date nTimeByCron = getNTimeByCron(cron, startTime); Date nTimeByCron = getNTimeByCron(cron, startTime);
if (startTime.before(new Date())) { // if (startTime.before(new Date())) {
triggerBuilder.startAt(nTimeByCron); triggerBuilder.startAt(nTimeByCron);
} // }
if (endTime != null) { if (endTime != null) {
if (endTime.before(nTimeByCron)) { if (endTime.before(nTimeByCron)) {
@ -157,9 +157,9 @@ public class ScheduleManager {
triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组 triggerBuilder.withIdentity(triggerKey);// 触发器名,触发器组
Date nTimeByCron = getNTimeByCron(cron, startTime); Date nTimeByCron = getNTimeByCron(cron, startTime);
if (startTime.before(new Date())) { // if (startTime.before(new Date())) {
triggerBuilder.startAt(nTimeByCron); triggerBuilder.startAt(nTimeByCron);
} // }
if (endTime != null) { if (endTime != null) {
if (endTime.before(nTimeByCron)) { if (endTime.before(nTimeByCron)) {

17
backend/src/main/java/io/dataease/service/AboutService.java
View File

@ -4,6 +4,7 @@ import io.dataease.commons.constants.AuthConstants;
import io.dataease.commons.license.DefaultLicenseService; import io.dataease.commons.license.DefaultLicenseService;
import io.dataease.commons.license.F2CLicenseResponse; import io.dataease.commons.license.F2CLicenseResponse;
import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.commons.utils.CommonBeanFactory;
import io.dataease.commons.utils.DateUtils;
import io.dataease.commons.utils.LogUtil; import io.dataease.commons.utils.LogUtil;
import io.dataease.listener.util.CacheUtils; import io.dataease.listener.util.CacheUtils;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
@ -27,11 +28,17 @@ public class AboutService {
F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.updateLicense(product, licenseKey); F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.updateLicense(product, licenseKey);
Optional.ofNullable(f2CLicenseResponse).ifPresent(resp -> { Optional.ofNullable(f2CLicenseResponse).ifPresent(resp -> {
if (resp.getStatus() == F2CLicenseResponse.Status.valid){ if (resp.getStatus() == F2CLicenseResponse.Status.valid){
CacheUtils.updateLicCache(new Date(f2CLicenseResponse.getLicense().getExpired())); String dateStr = f2CLicenseResponse.getLicense().getExpired();
LogUtil.info("update valid lic, expired date is {}", dateStr);
CacheUtils.removeAll(AuthConstants.USER_CACHE_NAME); try {
CacheUtils.removeAll(AuthConstants.USER_ROLE_CACHE_NAME); Date date = DateUtils.getDate(dateStr);
CacheUtils.removeAll(AuthConstants.USER_PERMISSION_CACHE_NAME); 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; return f2CLicenseResponse;

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

@ -199,17 +199,18 @@ public class ExtractDataService {
extractData(datasetTable, "all_scope"); extractData(datasetTable, "all_scope");
replaceTable(DorisTableUtils.dorisName(datasetTableId)); replaceTable(DorisTableUtils.dorisName(datasetTableId));
saveSucessLog(datasetTableTaskLog); saveSucessLog(datasetTableTaskLog);
deleteFile("all_scope", datasetTableId);
updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed);
}catch (Exception e){ }catch (Exception e){
saveErrorLog(datasetTableId, taskId, e); saveErrorLog(datasetTableId, taskId, e);
updateTableStatus(datasetTableId, datasetTable, JobStatus.Error); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error);
dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId))); dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
deleteFile("all_scope", datasetTableId);
}finally { }finally {
if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString());
dataSetTableTaskService.update(datasetTableTask); dataSetTableTaskService.update(datasetTableTask);
} }
deleteFile("all_scope", datasetTableId);
} }
break; break;
@ -258,18 +259,20 @@ public class ExtractDataService {
extractData(datasetTable, "incremental_delete"); extractData(datasetTable, "incremental_delete");
} }
saveSucessLog(datasetTableTaskLog); saveSucessLog(datasetTableTaskLog);
deleteFile("incremental_add", datasetTableId);
deleteFile("incremental_delete", datasetTableId);
updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed); updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed);
} }
}catch (Exception e){ }catch (Exception e){
saveErrorLog(datasetTableId, taskId, e); saveErrorLog(datasetTableId, taskId, e);
updateTableStatus(datasetTableId, datasetTable, JobStatus.Error); updateTableStatus(datasetTableId, datasetTable, JobStatus.Error);
deleteFile("incremental_add", datasetTableId);
deleteFile("incremental_delete", datasetTableId);
}finally { }finally {
if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { if (datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString()); datasetTableTask.setRate(ScheduleType.SIMPLE_COMPLETE.toString());
dataSetTableTaskService.update(datasetTableTask); dataSetTableTaskService.update(datasetTableTask);
} }
deleteFile("incremental_add", datasetTableId);
deleteFile("incremental_delete", datasetTableId);
} }
break; break;
} }

11
frontend/src/components/widget/DeWidget/DeSelect.vue
View File

@ -48,13 +48,14 @@ export default {
watch: { watch: {
'options.attrs.multiple': function(value) { 'options.attrs.multiple': function(value) {
const sourceValue = this.options.value const sourceValue = this.options.value
const sourceValid = !!sourceValue && Object.keys(sourceValue).length > 0
if (value) { if (value) {
!sourceValue && (this.options.value = []) !sourceValid && (this.options.value = [])
sourceValue && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(',')) sourceValid && !Array.isArray(sourceValue) && (this.options.value = sourceValue.split(','))
!this.inDraw && (this.options.value = []) !this.inDraw && (this.options.value = [])
} else { } else {
!sourceValue && (this.options.value = null) !sourceValid && (this.options.value = null)
sourceValue && Array.isArray(sourceValue) && (this.options.value = sourceValue[0]) sourceValid && Array.isArray(sourceValue) && (this.options.value = sourceValue[0])
!this.inDraw && (this.options.value = null) !this.inDraw && (this.options.value = null)
} }
} }
@ -68,7 +69,7 @@ export default {
// this.$nextTick(() => { // 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 && this.changeValue(this.options.value) this.options && this.options.value && Object.keys(this.options.value).length > 0 && this.changeValue(this.options.value)
}, },
methods: { methods: {
changeValue(value) { changeValue(value) {

10
frontend/src/views/chart/components/normal/LabelNormal.vue
View File

@ -6,13 +6,13 @@
id="label-content" id="label-content"
:style="content_class" :style="content_class"
> >
<p v-if="dimensionShow" :style="label_class"> <p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
<!-- {{ chart.data.x[0] }}--> {{ item.data[0] }}
{{ chart.data.series[0].name }}
</p> </p>
<span v-if="quotaShow" :style="label_space"> <span v-if="quotaShow" :style="label_space">
<p v-for="item in chart.data.series" :key="item.name" :style="label_content_class"> <p v-if="dimensionShow" :style="label_class">
{{ item.data[0] }} <!-- {{ chart.data.x[0] }}-->
{{ chart.data.series[0].name }}
</p> </p>
</span> </span>
</div> </div>