From 31b34d52d973f14991cd540ec93f51c63128e267 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Wed, 18 Sep 2024 17:59:13 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-132833=20=E3=80=90fr-fbp=E5=9B=9E?= =?UTF-8?q?=E5=BD=92=E3=80=91=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86=E3=80=91?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=95=B0=E6=8D=AE=E9=9B=86=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E7=BC=93=E5=AD=98=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=90=8E?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E8=BF=98=E6=98=AF=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datapane/preview/TableDataBeanHelper.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java index ad3f9ad14e..a5309a8ce0 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java @@ -16,8 +16,10 @@ import com.fr.decision.webservice.bean.dataset.ParameterExternal; import com.fr.decision.webservice.bean.dataset.SQLDataSetBean; import com.fr.decision.webservice.bean.dataset.ServerDataSetBean; import com.fr.decision.webservice.bean.dataset.StoreProcedureBean; +import com.fr.decision.webservice.bean.dataset.StrategyConfigBean; import com.fr.decision.webservice.v10.datasource.dataset.processor.impl.SQLDataSetProcessor; import com.fr.decision.webservice.v10.datasource.dataset.processor.impl.StoreProcedureProcessor; +import com.fr.esd.core.strategy.config.StrategyConfig; import com.fr.general.GeneralUtils; import com.fr.general.sql.SqlUtils; import com.fr.json.JSONObject; @@ -29,6 +31,7 @@ import com.fr.stable.StringUtils; import com.fr.workspace.server.repository.connection.ConnectionRepository; import com.fr.workspace.server.repository.tabledata.DataEncryptionHelper; import com.fr.workspace.server.repository.tabledata.TableDataRepository; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashMap; @@ -163,6 +166,22 @@ public class TableDataBeanHelper { parameterBeans.add(new ParameterBean(parameter.getValue().getClass().getSimpleName(), parameter.getName(), GeneralUtils.objectToString(parameter.getValue()))); } bean.setParameters(parameterBeans); + StrategyConfig config = dataSet.getStrategyConfig(); + if (config != null) { + StrategyConfigBean strategyConfigBean = new StrategyConfigBean(); + strategyConfigBean.setUseGlobal(config.isUseGlobal()); + strategyConfigBean.setShouldMonitor(config.shouldMonitor()); + strategyConfigBean.setShouldEvolve(config.shouldEvolve()); + strategyConfigBean.setScheduleBySchema(config.isScheduleBySchema()); + strategyConfigBean.setTimeToLive(config.getTimeToLive()); + strategyConfigBean.setTimeToIdle(config.getTimeToIdle()); + strategyConfigBean.setUpdateInterval(config.getUpdateInterval()); + strategyConfigBean.setTerminalTime(config.getTerminalTime()); + strategyConfigBean.setUpdateSchema(config.getUpdateSchema()); + strategyConfigBean.setActiveInitiation(config.isActiveInitiation()); + strategyConfigBean.setShare(config.enabled()); + bean.setStrategyConfig(strategyConfigBean); + } return JSONObject.mapFrom(bean); } @@ -190,6 +209,27 @@ public class TableDataBeanHelper { tableData.setShare(oldDataSet.isShare()); tableData.setDataQueryProcessor(oldDataSet.getDataQueryProcessor()); } + StrategyConfig config = getStrategyConfig(bean.getStrategyConfig()); + tableData.setStrategyConfig(config); return tableData; } + + private static StrategyConfig getStrategyConfig(StrategyConfigBean bean) { + if (bean == null) { + return new StrategyConfig(); + } + StrategyConfig config = new StrategyConfig(); + config.setEnable(bean.isShare()); + config.setUseGlobal(bean.isUseGlobal()); + config.setShouldMonitor(bean.isShouldMonitor()); + config.setShouldEvolve(bean.isShouldEvolve()); + config.setScheduleBySchema(bean.isScheduleBySchema()); + config.setTimeToLive(bean.getTimeToLive()); + config.setTimeToIdle(bean.getTimeToIdle()); + config.setUpdateInterval(bean.getUpdateInterval()); + config.setTerminalTime(bean.getTerminalTime()); + config.setUpdateSchema(bean.getUpdateSchema()); + config.setActiveInitiation(bean.isActiveInitiation()); + return config; + } }