From b097bce2a6a3d50e6dbcb7bfec10cbd48c82160c Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 18 Oct 2024 16:00:45 +0800 Subject: [PATCH] update --- erm.frontend/package.json | 2 +- gradle.properties | 2 +- io.sc.engine.mv.frontend/package.json | 2 +- io.sc.engine.rule.client.spring/build.gradle | 1 - .../spring/service/impl/LocalLoaderImpl.java | 23 +- .../EngineSpringApplicationContextUtil.java | 3 +- .../impl/support/processor/NumberRange.java | 71 +---- .../code/impl/support/processor/Option.java | 56 +--- .../impl/support/processor/ScoreCardItem.java | 64 ++++ .../engine/rule/core/enums/ProcessorType.java | 25 +- .../sc/engine/rule/core/enums/ValueType.java | 20 ++ .../core/po/model/ParameterProcessor.java | 39 +-- .../ScoreCardParameterProcessor.java | 25 ++ .../rule/core/po/resource/Resource.java | 14 +- .../core/po/resource/ScoreCardResource.java | 29 -- .../NumberRangeScoreCardIndicatorVar.java | 29 -- .../po/scorecard/NumberRangeScoreCardVar.java | 29 -- .../OptionScoreCardIndicatorVar.java | 29 -- .../core/po/scorecard/OptionScoreCardVar.java | 29 -- .../scorecard/ScoreCardIndicatorValueVar.java | 21 -- .../po/scorecard/ScoreCardIndicatorVar.java | 36 --- .../rule/core/po/scorecard/ScoreCardVar.java | 53 ---- .../sc/engine/rule/core/i18n/enums.properties | 46 +-- .../rule/core/i18n/enums_tw_CN.properties | 48 +-- .../rule/core/i18n/enums_zh_CN.properties | 48 +-- io.sc.engine.rule.frontend/package.json | 2 +- .../src/i18n/messages.json | 5 +- .../src/i18n/messages_tw_CN.json | 5 +- .../src/i18n/messages_zh_CN.json | 5 +- .../src/utils/ValueTypeUtil.ts | 30 ++ .../src/views/dictionary/dictionary.vue | 29 +- .../src/views/lib/IndicatorGrid.vue | 17 +- .../src/views/lib/ProcessorGrid.vue | 122 ++++---- .../src/views/resources/Resources.vue | 14 - .../resources/designer/DecisionTreeDialog.vue | 2 +- .../designer/ExecutionFlowDialog.vue | 2 +- .../views/resources/designer/Parameter.vue | 144 ++++----- .../views/resources/designer/Processor.vue | 242 ++------------- .../src/views/shared/AutoCompletionManager.ts | 6 +- .../shared/ObjectPropertiesMatcherDialog.vue | 32 +- .../src/views/shared/Processor.ts | 80 +++++ .../src/views/shared/ProcessorManager.ts | 154 ++++++++++ .../src/views/shared/processors/Arithmetic.ts | 36 +-- .../views/shared/processors/ConditionRange.ts | 75 ++--- .../views/shared/processors/DecisionTable.ts | 278 +++++++++++++----- .../shared/processors/DecisionTable2c.ts | 59 ++-- .../views/shared/processors/DecisionTree.ts | 17 +- .../views/shared/processors/ExecutionFlow.ts | 17 +- .../views/shared/processors/GroovyScript.ts | 38 +-- .../views/shared/processors/MathFormula.ts | 38 +-- .../views/shared/processors/NumberRange.ts | 255 ++++++++-------- .../shared/processors/ObjectProperties.ts | 87 ++---- .../views/shared/processors/OptionValue.ts | 20 +- .../src/views/shared/processors/Pmml.ts | 22 +- .../src/views/shared/processors/Rule.ts | 17 +- .../src/views/shared/processors/ScoreCard.ts | 230 +++++++++++++++ .../src/views/shared/processors/SingleRule.ts | 18 +- .../src/views/shared/processors/Sql.ts | 59 ++-- .../src/views/shared/processors/Ternary.ts | 44 ++- .../src/views/shared/processors/WhenThen.ts | 40 +-- .../src/views/shared/processors/index.ts | 3 +- .../ParameterAndValueTypeServiceImpl.java | 8 +- .../handler/IndicatorEntityEventHandler.java | 70 +---- .../handler/LibEntityEventHandler.java | 50 +--- .../ScoreCardVarEntityEventHandler.java | 96 ------ .../lib/service/impl/LibServiceImpl.java | 21 -- .../service/impl/MigrationServiceImpl.java | 24 +- .../server/migration/support/AllInOne.java | 14 +- .../ParameterProcessorEntityConverter.java | 246 ++++++++-------- .../entity/ParameterProcessorEntity.java | 19 +- .../ScoreCardParameterProcessorEntity.java | 97 ++++++ .../ScoreCardParameterProcessorVo.java | 26 ++ .../converter/ResourceEntityConverter.java | 26 +- .../resource/entity/ResourceEntity.java | 3 +- .../entity/ScoreCardResourceEntity.java | 120 -------- .../repository/ResourceRepository.java | 17 +- .../service/impl/ResourceServiceImpl.java | 2 +- .../controller/ScoreCardVarWebController.java | 16 - .../ScoreCardVarEntityConverter.java | 171 ----------- ...umberRangeScoreCardIndicatorVarEntity.java | 66 ----- .../entity/NumberRangeScoreCardVarEntity.java | 66 ----- .../OptionScoreCardIndicatorVarEntity.java | 66 ----- .../entity/OptionScoreCardVarEntity.java | 69 ----- .../ScoreCardIndicatorValueVarEntity.java | 50 ---- .../entity/ScoreCardIndicatorVarEntity.java | 77 ----- .../scorecard/entity/ScoreCardVarEntity.java | 155 ---------- .../ScoreCardVarAlreadyExistsException.java | 28 -- ...dVarCodeAndIndicatorCodeSameException.java | 28 -- .../repository/ScoreCardVarRepository.java | 26 -- .../service/ScoreCardVarService.java | 17 -- .../service/impl/ScoreCardVarServiceImpl.java | 151 ---------- .../ScoreCardVarEntityChangedEvent.java | 11 - .../NumberRangeScoreCardIndicatorVarVo.java | 26 -- .../vo/NumberRangeScoreCardVarVo.java | 23 -- .../vo/OptionScoreCardIndicatorVarVo.java | 24 -- .../scorecard/vo/OptionScoreCardVarVo.java | 24 -- .../vo/ScoreCardIndicatorValueVarVo.java | 13 - .../scorecard/vo/ScoreCardIndicatorVarVo.java | 41 --- .../server/scorecard/vo/ScoreCardVarVo.java | 64 ---- .../ScoreCardTestCaseParameterBuilder.java | 136 --------- .../service/impl/TestCaseServiceImpl.java | 8 - .../META-INF/platform/plugins/security.json | 5 +- .../i18n/dictionary/messages.properties | 4 +- .../i18n/dictionary/messages_tw_CN.properties | 4 +- .../i18n/dictionary/messages_zh_CN.properties | 4 +- ...20515__Rule Engine Database Schema DDL.xml | 118 +++----- io.sc.engine.st.frontend/package.json | 2 +- io.sc.platform.core.frontend/package.json | 2 +- .../src/platform/components/grid/css/grid.css | 2 +- .../src/platform/index.ts | 5 + .../src/platform/plugin/router.ts | 2 +- .../utils-components/MarkupTableUtil.ts | 90 ++++++ .../src/platform/utils-components/index.ts | 1 + .../src/views/testcase/math/MathEditor.vue | 20 +- .../template-project/package.json | 4 +- .../src/views/testcase/math/MathEditor.vue | 20 +- .../io/sc/platform/core/i18n/words.properties | 4 +- .../platform/core/i18n/words_tw_CN.properties | 4 +- .../platform/core/i18n/words_zh_CN.properties | 4 +- io.sc.platform.developer.doc/package.json | 2 +- .../package.json | 2 +- io.sc.platform.lcdp.frontend/package.json | 2 +- .../package.json | 2 +- io.sc.platform.mvc.frontend/package.json | 2 +- .../package.json | 2 +- ...tUsernamePasswordAuthenticationFilter.java | 1 - io.sc.platform.system.frontend/package.json | 2 +- io.sc.standard.frontend/package.json | 2 +- io.sc.website/package.json | 2 +- 129 files changed, 2025 insertions(+), 3472 deletions(-) create mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/ScoreCardItem.java create mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/model/processor/ScoreCardParameterProcessor.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/resource/ScoreCardResource.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/NumberRangeScoreCardIndicatorVar.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/NumberRangeScoreCardVar.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/OptionScoreCardIndicatorVar.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/OptionScoreCardVar.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/ScoreCardIndicatorValueVar.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/ScoreCardIndicatorVar.java delete mode 100644 io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/po/scorecard/ScoreCardVar.java create mode 100644 io.sc.engine.rule.frontend/src/utils/ValueTypeUtil.ts create mode 100644 io.sc.engine.rule.frontend/src/views/shared/Processor.ts create mode 100644 io.sc.engine.rule.frontend/src/views/shared/ProcessorManager.ts create mode 100644 io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/jpa/listener/handler/ScoreCardVarEntityEventHandler.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/entity/processor/ScoreCardParameterProcessorEntity.java create mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/model/vo/processor/ScoreCardParameterProcessorVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/resource/entity/ScoreCardResourceEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/controller/ScoreCardVarWebController.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/converter/ScoreCardVarEntityConverter.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/NumberRangeScoreCardIndicatorVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/NumberRangeScoreCardVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/OptionScoreCardIndicatorVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/OptionScoreCardVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/ScoreCardIndicatorValueVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/ScoreCardIndicatorVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/entity/ScoreCardVarEntity.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/exception/ScoreCardVarAlreadyExistsException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/exception/ScoreCardVarCodeAndIndicatorCodeSameException.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/repository/ScoreCardVarRepository.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/service/ScoreCardVarService.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/service/impl/ScoreCardVarServiceImpl.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/service/support/ScoreCardVarEntityChangedEvent.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/NumberRangeScoreCardIndicatorVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/NumberRangeScoreCardVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/OptionScoreCardIndicatorVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/OptionScoreCardVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/ScoreCardIndicatorValueVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/ScoreCardIndicatorVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/scorecard/vo/ScoreCardVarVo.java delete mode 100644 io.sc.engine.rule.server/src/main/java/io/sc/engine/rule/server/testcase/bean/ScoreCardTestCaseParameterBuilder.java create mode 100644 io.sc.platform.core.frontend/src/platform/utils-components/MarkupTableUtil.ts create mode 100644 io.sc.platform.core.frontend/src/platform/utils-components/index.ts diff --git a/erm.frontend/package.json b/erm.frontend/package.json index ad62c274..aebf7334 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.414", + "platform-core": "8.1.416", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/gradle.properties b/gradle.properties index de581262..860bed2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.50 platform_plugin_version=8.1.50 -platform_core_frontend_version=8.1.414 +platform_core_frontend_version=8.1.416 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index c3277e83..8ac39ddb 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.2", "pinia": "2.2.2", "pinia-undo": "0.2.4", - "platform-core": "8.1.414", + "platform-core": "8.1.416", "quasar": "2.17.0", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/io.sc.engine.rule.client.spring/build.gradle b/io.sc.engine.rule.client.spring/build.gradle index 0d995a81..0fb50233 100644 --- a/io.sc.engine.rule.client.spring/build.gradle +++ b/io.sc.engine.rule.client.spring/build.gradle @@ -2,7 +2,6 @@ dependencies { api( project(":io.sc.engine.rule.core"), project(":io.sc.engine.rule.client"), - project(":io.sc.platform.mvc"), ) } diff --git a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java index 09a4ec0a..5c56b213 100644 --- a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java +++ b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/service/impl/LocalLoaderImpl.java @@ -1,19 +1,20 @@ package io.sc.engine.rule.client.spring.service.impl; +import io.sc.engine.rule.client.spring.service.LocalLoader; +import io.sc.engine.rule.core.classes.ResourceAbstract; +import io.sc.engine.rule.core.code.impl.support.ResourceWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; + import java.lang.reflect.Method; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Service; -import io.sc.engine.rule.client.spring.service.LocalLoader; -import io.sc.engine.rule.core.classes.ResourceAbstract; -import io.sc.engine.rule.core.code.impl.support.ResourceWrapper; - @Service("io.sc.engine.rule.client.spring.service.impl.LocalLoaderImpl") public class LocalLoaderImpl implements LocalLoader{ + private static final String RESOURCE_SERVICE_BEAN_NAME ="io.sc.engine.rule.server.resource.service.impl.ResourceServiceImpl"; @Autowired private ApplicationContext applicationContext; private Map cache =new ConcurrentHashMap(); @@ -24,7 +25,7 @@ public class LocalLoaderImpl implements LocalLoader{ @Override public ResourceWrapper getResourceById(String resourceId) throws Exception { - Object bean =applicationContext.getBean("reResourceService"); + Object bean =applicationContext.getBean(RESOURCE_SERVICE_BEAN_NAME); if(bean!=null) { Method method =bean.getClass().getMethod("getDefineById", String.class); ResourceWrapper result =(ResourceWrapper)method.invoke(bean, resourceId); @@ -36,7 +37,7 @@ public class LocalLoaderImpl implements LocalLoader{ @Override public ResourceWrapper getResourceByCode(String resourceCode, Integer version) throws Exception { if(version==null) {//未指定版本时，不缓存，加载最新的 - Object bean =applicationContext.getBean("reResourceService"); + Object bean =applicationContext.getBean(RESOURCE_SERVICE_BEAN_NAME); if(bean!=null) { Method method =bean.getClass().getMethod("getDefineByCode", String.class,Integer.class); return (ResourceWrapper)method.invoke(bean, resourceCode,version); @@ -48,7 +49,7 @@ public class LocalLoaderImpl implements LocalLoader{ if(wrapper!=null) { return wrapper; }else { - Object bean =applicationContext.getBean("reResourceService"); + Object bean =applicationContext.getBean(RESOURCE_SERVICE_BEAN_NAME); if(bean!=null) { Method method =bean.getClass().getMethod("getDefineByCode", String.class,Integer.class); wrapper =(ResourceWrapper)method.invoke(bean, resourceCode,version); @@ -71,7 +72,7 @@ public class LocalLoaderImpl implements LocalLoader{ @Override @SuppressWarnings("unchecked") public List getAllReleasableResourceAbstract() throws Exception { - Object bean =applicationContext.getBean("reResourceService"); + Object bean =applicationContext.getBean(RESOURCE_SERVICE_BEAN_NAME); if(bean!=null) { Method method =bean.getClass().getMethod("getAllReleasableResourceAbstract"); if(method!=null) { diff --git a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/util/EngineSpringApplicationContextUtil.java b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/util/EngineSpringApplicationContextUtil.java index 8a090429..2fdd0ff9 100644 --- a/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/util/EngineSpringApplicationContextUtil.java +++ b/io.sc.engine.rule.client.spring/src/main/java/io/sc/engine/rule/client/spring/util/EngineSpringApplicationContextUtil.java @@ -11,6 +11,7 @@ import org.springframework.context.ApplicationContext; * 决策引擎中用于支持 spring 应用上下文辅助类 */ public class EngineSpringApplicationContextUtil { + private static final String DATASOURCE_SERVICE_BEAN_NAME ="io.sc.platform.jdbc.service.impl.DatasourceServiceImpl"; private static ApplicationContext applicationContext; //静态属性，用于在脚本中直接通过静态类获取 spring 应用上下文 /** @@ -44,7 +45,7 @@ public class EngineSpringApplicationContextUtil { * @throws Exception 违例 */ public static DataSource getDataSource(String name) throws Exception { - Object datasourceService =applicationContext.getBean("frDatasourceService"); + Object datasourceService =applicationContext.getBean(DATASOURCE_SERVICE_BEAN_NAME); Method method =datasourceService.getClass().getMethod("getDatasource", String.class); return (DataSource)method.invoke(datasourceService,name); } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/NumberRange.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/NumberRange.java index bdd98f59..b5193528 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/NumberRange.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/NumberRange.java @@ -1,22 +1,18 @@ package io.sc.engine.rule.core.code.impl.support.processor; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.core.type.TypeReference; import io.sc.engine.rule.core.po.lib.Indicator; import io.sc.engine.rule.core.po.lib.processor.NumberRangeIndicatorProcessor; import io.sc.engine.rule.core.po.model.Parameter; import io.sc.engine.rule.core.po.model.processor.NumberRangeParameterProcessor; -import io.sc.engine.rule.core.po.scorecard.NumberRangeScoreCardIndicatorVar; -import io.sc.engine.rule.core.po.scorecard.NumberRangeScoreCardVar; -import io.sc.engine.rule.core.po.scorecard.ScoreCardVar; import io.sc.engine.rule.core.util.CodeReplacer; import io.sc.engine.rule.core.util.ExpressionReplacer; import io.sc.engine.rule.core.util.JacksonObjectMapper; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.core.type.TypeReference; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; @JsonIgnoreProperties(ignoreUnknown=true) public class NumberRange { @@ -157,62 +153,7 @@ public class NumberRange { } return null; } - - public static String generateGroovyCode(ScoreCardVar scoreCardVar) throws Exception{ - try { - List _numberRanges =null; - if(scoreCardVar instanceof NumberRangeScoreCardVar) { - _numberRanges =parse(((NumberRangeScoreCardVar)scoreCardVar).getNumberRange()); - }else if(scoreCardVar instanceof NumberRangeScoreCardIndicatorVar) { - _numberRanges =parse(((NumberRangeScoreCardIndicatorVar)scoreCardVar).getNumberRange()); - }else { - return null; - } - - String parameterName =scoreCardVar.getCode(); - String var ="${" + parameterName + "}"; - String valueType ="java.math.BigDecimal"; - if(_numberRanges!=null && _numberRanges.size()>0) { - StringBuilder sb =new StringBuilder(); - int size =_numberRanges.size(); - for(int i=0;i=").append(numberRange.min); - }else { - sb.append(ExpressionReplacer.groovy(var, null)).append(">").append(numberRange.min); - } - } - if(numberRange.min!=null && numberRange.max!=null) { - sb.append(" && "); - } - if(numberRange.max!=null) { - if(numberRange.maxIncluded!=null && numberRange.maxIncluded) { - sb.append(ExpressionReplacer.groovy(var, null)).append("<=").append(numberRange.max); - }else { - sb.append(ExpressionReplacer.groovy(var, null)).append("<").append(numberRange.max); - } - } - sb.append(")").append("{").append("\n"); - sb.append("\t\t\t").append(ExpressionReplacer.ARGUMENT_NAME).append(".R_").append(parameterName).append(" =").append(ExpressionReplacer.groovy(numberRange.value, valueType)).append(";\n"); - sb.append("\t\t}"); - } - return sb.toString(); - } - }catch(Exception e) { - throw new RuntimeException("There was a Error when generate " + scoreCardVar.getName()+ "'s NumberRange groovy source code.", e); - } - return null; - } - + public Boolean getMinIncluded() { return minIncluded; } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/Option.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/Option.java index 0b81a019..adb06871 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/Option.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/impl/support/processor/Option.java @@ -1,15 +1,10 @@ package io.sc.engine.rule.core.code.impl.support.processor; -import java.util.List; - -import io.sc.engine.rule.core.po.scorecard.OptionScoreCardIndicatorVar; -import io.sc.engine.rule.core.po.scorecard.OptionScoreCardVar; -import io.sc.engine.rule.core.po.scorecard.ScoreCardVar; -import io.sc.engine.rule.core.util.ExpressionReplacer; -import io.sc.engine.rule.core.util.JacksonObjectMapper; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.core.type.TypeReference; +import io.sc.engine.rule.core.util.JacksonObjectMapper; + +import java.util.List; @JsonIgnoreProperties(ignoreUnknown=true) public class Option { @@ -26,51 +21,6 @@ public class Option { return null; } - public static String generateGroovyCode(ScoreCardVar scoreCardVar) throws Exception{ - try { - List