From 1c1edbdce1edb391e24427608c9c24a57200a843 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 16 Jun 2025 16:49:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=94=A8JavascriptU?= =?UTF-8?q?til=E7=B1=BB=E6=9B=BF=E6=8D=A2RunScriptUtil=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1444983029071872]用JavascriptUtil类替换RunScriptUtil类 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444983029071872 --- .../stephandler/component/ConditionProcessComponent.java | 2 +- .../neatlogic/module/process/thread/ProcessTaskSlaThread.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index ded7d5b0c..37a7a0a87 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -167,7 +167,7 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { /* 将参数名称、表达式、值的value翻译成对应text，目前条件步骤生成活动时用到**/ translate(conditionConfigVo, currentProcessTaskStepVo.getProcessTaskId(), formTag); // ((false || true) || (true && false) || (true || false)) - canRun = RunScriptUtil.runScript(script); + canRun = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); ruleObj.put("result", canRun); } catch (Exception e) { logger.error(e.getMessage(), e); diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index d918a56b9..1d193908a 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -35,8 +35,8 @@ import neatlogic.framework.scheduler.core.SchedulerManager; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.scheduler.exception.ScheduleHandlerNotFoundException; import neatlogic.framework.transaction.util.TransactionUtil; -import neatlogic.framework.util.RunScriptUtil; import neatlogic.framework.util.WorkTimeUtil; +import neatlogic.framework.util.javascript.JavascriptUtil; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSlaMapper; import neatlogic.module.process.schedule.plugin.ProcessTaskSlaNotifyJob; @@ -157,7 +157,7 @@ public class ProcessTaskSlaThread extends NeatLogicThread { ConditionConfigVo conditionConfigVo = new ConditionConfigVo(policyObj); String script = conditionConfigVo.buildScript(); // ((false || true) || (true && false) || (true || false)) - isHit = RunScriptUtil.runScript(script); + isHit = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); } catch (Exception e) { logger.error(e.getMessage(), e); } finally { -- Gitee From e43bc2237089e3718ae436c797f5effd7deb3998 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 16 Jun 2025 17:14:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=94=A8JavascriptU?= =?UTF-8?q?til=E7=B1=BB=E6=9B=BF=E6=8D=A2RunScriptUtil=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1444983029071872]用JavascriptUtil类替换RunScriptUtil类 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1444983029071872 --- .../stephandler/component/ConditionProcessComponent.java | 3 ++- .../neatlogic/module/process/thread/ProcessTaskSlaThread.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index 37a7a0a87..e88b1ed6d 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -167,7 +167,8 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { /* 将参数名称、表达式、值的value翻译成对应text，目前条件步骤生成活动时用到**/ translate(conditionConfigVo, currentProcessTaskStepVo.getProcessTaskId(), formTag); // ((false || true) || (true && false) || (true || false)) - canRun = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); + Object returnValue = JavascriptUtil.runScript(new JSONObject(), "return " + script); + canRun = Boolean.parseBoolean(returnValue != null ? returnValue.toString() : "false"); ruleObj.put("result", canRun); } catch (Exception e) { logger.error(e.getMessage(), e); diff --git a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java index 1d193908a..9cca47d39 100644 --- a/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java +++ b/src/main/java/neatlogic/module/process/thread/ProcessTaskSlaThread.java @@ -157,7 +157,8 @@ public class ProcessTaskSlaThread extends NeatLogicThread { ConditionConfigVo conditionConfigVo = new ConditionConfigVo(policyObj); String script = conditionConfigVo.buildScript(); // ((false || true) || (true && false) || (true || false)) - isHit = Boolean.parseBoolean(JavascriptUtil.runScript(new JSONObject(), "return " + script).toString()); + Object returnValue = JavascriptUtil.runScript(new JSONObject(), "return " + script); + isHit = Boolean.parseBoolean(returnValue != null ? returnValue.toString() : "false"); } catch (Exception e) { logger.error(e.getMessage(), e); } finally { -- Gitee