diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/DataSyncProperties.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/DataSyncProperties.java index f911f9c..bf21848 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/DataSyncProperties.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/properties/DataSyncProperties.java @@ -12,10 +12,6 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "data-sync") public class DataSyncProperties { - /** - * 最小间隔(分钟) - */ - private Integer minMinute; /** * 同时最大执行数据表数量 */ diff --git a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java index 0b140f1..694d0c9 100644 --- a/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java +++ b/jeecg-module-sync/src/main/java/org/jeecg/taskConfig/job/SyncDataJob.java @@ -147,11 +147,13 @@ public class SyncDataJob implements Job { pstmt.setString(2, syncStrategy.getTableName().toUpperCase()); pstmt.setString(3, syncStrategy.getColumnName().toUpperCase()); - ResultSet rs = pstmt.executeQuery(); - if (rs.next()) { - String dataType = rs.getString("data_type").toUpperCase(); - return dataType.contains("DATE") || dataType.contains("TIME"); + try(ResultSet rs = pstmt.executeQuery()){ + if (rs.next()) { + String dataType = rs.getString("data_type").toUpperCase(); + return dataType.contains("DATE") || dataType.contains("TIME"); + } } + } return false; } @@ -205,8 +207,7 @@ public class SyncDataJob implements Job { int maximumPoolSize = Runtime.getRuntime().availableProcessors(); int maxExecSize = Math.min(dataSyncProperties.getMaxExecNum(), maximumPoolSize); String threadNamePrefix = "data_sync"; - int queueCapacity = maxExecSize * 2; CustomThreadFactory threadFactory = new CustomThreadFactory(threadNamePrefix); - threadPoolExecutor = new ThreadPoolExecutor(maxExecSize,maximumPoolSize,5, TimeUnit.SECONDS,new LinkedBlockingQueue<>(queueCapacity),threadFactory); + threadPoolExecutor = new ThreadPoolExecutor(maxExecSize,(maxExecSize*2),maxExecSize, TimeUnit.SECONDS,new LinkedBlockingQueue<>(),threadFactory); } } \ No newline at end of file