diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java index 39b4ecb00..f3df21df9 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ESDStrategyConfigPane.java @@ -133,7 +133,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane { ob = StrategyConfigHelper.createStrategyConfig(true, false, true); } this.strategyConfig = ob; - this.updateInterval.setText(ob.getUpdateInterval() <= 0 ? "0" : String.format("%.0f", ob.getUpdateInterval() / (double) CacheConstants.MILLIS_OF_MINUTE)); + this.updateInterval.setText(ob.getUpdateInterval() <= 0 ? "0" : String.valueOf(ob.getUpdateInterval() / (double) CacheConstants.MILLIS_OF_MINUTE)); this.schemaTime.setText(StringUtils.join(",", ob.getUpdateSchema().toArray(new String[0]))); this.shouldEvolve.setSelected(ob.shouldEvolve()); this.selectBySchema.setSelected(ob.isScheduleBySchema()); @@ -185,7 +185,6 @@ public class ESDStrategyConfigPane extends BasicBeanPane { this.schemaTimeCheckTips.setVisible(true); throw new IllegalArgumentException("[ESD]Update schema time interval is to short."); } - } else { Collections.addAll(schemaTimes, text.split(",")); } @@ -200,8 +199,15 @@ public class ESDStrategyConfigPane extends BasicBeanPane { String interval = this.updateInterval.getText(); if (checkUpdateInterval(interval)) { long intervalMillis = StringUtils.isEmpty(interval) ? 0 : (long) (Double.parseDouble(interval) * CacheConstants.MILLIS_OF_MINUTE); - config.setUpdateInterval(intervalMillis); + if (intervalMillis >= CacheConstants.MILLIS_OF_MINUTE) { + config.setUpdateInterval(intervalMillis); + } else { + this.updateIntervalCheckTips.setText(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Interval_Too_Short")); + this.updateIntervalCheckTips.setVisible(true); + throw new IllegalArgumentException("[ESD]Update schema time interval is to short."); + } } else { + this.updateIntervalCheckTips.setText(InterProviderFactory.getDesignI18nProvider().i18nText("Fine-Design_ESD_Error_Time_Format")); this.updateIntervalCheckTips.setVisible(true); throw new IllegalArgumentException("[ESD]Error update interval format."); } @@ -220,7 +226,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane { private boolean checkUpdateInterval(String intervalValue) { try { - return !StringUtils.isEmpty(intervalValue) && !(Integer.parseInt(intervalValue) <= 0); + return !StringUtils.isEmpty(intervalValue) && !(Double.parseDouble(intervalValue) <= 0); } catch (NumberFormatException e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } @@ -228,6 +234,7 @@ public class ESDStrategyConfigPane extends BasicBeanPane { return false; } + private boolean checkCornTimeInterval (String cronText) { // 判断后两次更新时间间隔,如果小于1分钟就返回false try {