From 93d380673ebe3992d5178bcbb9d9f9592e308a72 Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 16 Jun 2021 10:38:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(fix):=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/DataSetTableService.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index c0355a9e63..4014d37c96 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -274,9 +274,8 @@ public class DataSetTableService { e.printStackTrace(); } try { -// datasourceRequest.setQuery(qp.createQueryCountSQL(table)); -// dataSetPreviewPage.setTotal(Integer.valueOf(datasourceProvider.getData(datasourceRequest).get(0)[0])); - dataSetPreviewPage.setTotal(Integer.parseInt(dataSetTableRequest.getRow())); + datasourceRequest.setQuery(qp.createQuerySQL(table, fields) + " LIMIT 0," + dataSetTableRequest.getRow()); + dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); } @@ -298,9 +297,8 @@ public class DataSetTableService { e.printStackTrace(); } try { -// datasourceRequest.setQuery(qp.createQueryCountSQLAsTmp(sql)); -// dataSetPreviewPage.setTotal(Integer.valueOf(datasourceProvider.getData(datasourceRequest).get(0)[0])); - dataSetPreviewPage.setTotal(Integer.parseInt(dataSetTableRequest.getRow())); + datasourceRequest.setQuery(qp.createQuerySQLAsTmp(sql, fields) + " LIMIT 0," + dataSetTableRequest.getRow()); + dataSetPreviewPage.setTotal(datasourceProvider.getData(datasourceRequest).size()); } catch (Exception e) { e.printStackTrace(); } From 4dff1f4d9661353cd5a8543e922d459b66324b2d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 16 Jun 2021 11:09:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D'=E4=B8=8D?= =?UTF-8?q?=E5=8C=85=E5=90=AB'=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/base/mapper/ext/query/GridExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java b/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java index f241e39e1d..46482b7f48 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java @@ -136,7 +136,7 @@ public class GridExample { addCriterion(field+" like ", "%"+value+"%", field); break; case "not like": - addCriterion(field+" not like ", value, field); + addCriterion(field+" not like ", "%"+value+"%", field); break; case "in": List invalues = (List)value; From b622ee8ae78630db1a3cac2159cc89915f1ec78a Mon Sep 17 00:00:00 2001 From: junjie Date: Wed, 16 Jun 2021 14:09:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(fix):=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/job/sechedule/ScheduleManager.java | 12 ++++++++---- .../java/io/dataease/listener/AppStartListener.java | 8 +++++++- .../java/io/dataease/service/ScheduleService.java | 4 ++++ 3 files changed, 19 insertions(+), 5 deletions(-) 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 e16cfc3aa8..7c29437eca 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -2,13 +2,13 @@ package io.dataease.job.sechedule; import io.dataease.commons.utils.LogUtil; import org.quartz.*; -import org.quartz.impl.triggers.CronTriggerImpl; import org.springframework.stereotype.Component; import javax.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Component public class ScheduleManager { @@ -84,6 +84,8 @@ public class ScheduleManager { } else { triggerBuilder.endAt(endTime); } + } else { + triggerBuilder.endAt(null); } triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron)); @@ -167,6 +169,8 @@ public class ScheduleManager { } else { triggerBuilder.endAt(endTime); } + } else { + triggerBuilder.endAt(null); } triggerBuilder.withSchedule(CronScheduleBuilder.cronSchedule(cron));// 触发器时间设定 diff --git a/backend/src/main/java/io/dataease/listener/AppStartListener.java b/backend/src/main/java/io/dataease/listener/AppStartListener.java index a2224eaaea..1aa50873bf 100644 --- a/backend/src/main/java/io/dataease/listener/AppStartListener.java +++ b/backend/src/main/java/io/dataease/listener/AppStartListener.java @@ -26,7 +26,13 @@ public class AppStartListener implements ApplicationListener list = dataSetTableTaskService.list(new DatasetTableTask()); for (DatasetTableTask task : list) { try { - scheduleService.addSchedule(task); + if (task.getEndTime() != null && task.getEndTime() > 0) { + if (task.getEndTime() > System.currentTimeMillis()) { + scheduleService.addSchedule(task); + } + } else { + scheduleService.addSchedule(task); + } } catch (Exception e) { e.printStackTrace(); } diff --git a/backend/src/main/java/io/dataease/service/ScheduleService.java b/backend/src/main/java/io/dataease/service/ScheduleService.java index 9efef3d772..af00535edf 100644 --- a/backend/src/main/java/io/dataease/service/ScheduleService.java +++ b/backend/src/main/java/io/dataease/service/ScheduleService.java @@ -37,6 +37,10 @@ public class ScheduleService { // if (endTime.before(new Date())) { // return; // } + if (endTime.before(new Date())) { + deleteSchedule(datasetTableTask); + return; + } } scheduleManager.addOrUpdateCronJob(new JobKey(datasetTableTask.getId(), datasetTableTask.getTableId()), From 8a39eeee9ca657ca75b73a347332452703176f3a Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 16 Jun 2021 14:42:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20Doris=20table=20KEY=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=9AUNIQUE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 351a7a4870..9a1a083cfd 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -112,7 +112,7 @@ public class ExtractDataService { private String passwd; private static String creatTableSql = "CREATE TABLE IF NOT EXISTS `TABLE_NAME`" + "Column_Fields" + - "DUPLICATE KEY(dataease_uuid)\n" + + "UNIQUE KEY(dataease_uuid)\n" + "DISTRIBUTED BY HASH(dataease_uuid) BUCKETS 10\n" + "PROPERTIES(\"replication_num\" = \"1\");";