diff --git a/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java b/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java index 9edd353..d354ab0 100644 --- a/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java +++ b/cloud-task-remote/src/main/java/com/muyu/remote/feign/RuleFeign.java @@ -1,14 +1,19 @@ package com.muyu.remote.feign; import com.muyu.common.core.domain.Result; +import com.muyu.common.domain.DataValue; import com.muyu.remote.feign.Factory.RuleFactory; import com.muyu.rule.common.domain.RuleEngineVersion; +import io.swagger.v3.oas.annotations.Operation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; @FeignClient(value = "cloud-etl-rule",fallbackFactory= RuleFactory.class) public interface RuleFeign { @PostMapping("/version/findVersionById/{id}") public Result findVersionById(@PathVariable("id") Long id); + @PostMapping("/version/testEngine/{className}") + public Result testEngine(@PathVariable("className") String className,@RequestBody DataValue dataValue); } diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java index d22506d..f8bd06a 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java @@ -398,6 +398,7 @@ public class TaskInfoServiceImpl extends ServiceImpl i log.info(finalCurrentFuture); Callable task = () -> { DataValue[][] prevResult = finalCurrentFuture.get(); + log.info(data.getClassName()); if (data.getRuleId().equals("3")) { BasicEngine basicEngine = engineDataSetMap.get(data.getClassName()); basicEngine.set(prevResult); @@ -407,9 +408,7 @@ public class TaskInfoServiceImpl extends ServiceImpl i if (data.getRuleId().equals("1")) { for (DataValue[] values : prevResult) { for (DataValue value : values) { - BasicEngine dataValueBasicEngine = engineMap.get(data.getClassName()); - dataValueBasicEngine.set(value); - dataValueBasicEngine.execution(); + ruleFeign.testEngine(data.getClassName(),value); } }