From b75a4d4b3afb0fa2f0c0493bb9374190355d34fb Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Wed, 4 Mar 2026 08:52:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E5=88=86?= =?UTF-8?q?=E6=9E=90=E9=A1=B9=E5=BA=93=EF=BC=8C=E9=80=9A=E8=BF=87=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=B1=BB=E5=9E=8B=E8=8A=82=E7=82=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=88=86=E6=9E=90=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FlowServiceImpl.java | 4 +-- .../SimuluationTaskPoolController.java | 4 +-- .../service/ISimulationTaskPoolService.java | 2 +- .../impl/SimulationTaskPoolServiceImpl.java | 26 ++++++++++++++----- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java index 6ad70239..ab1fd8b9 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java @@ -155,10 +155,10 @@ public class FlowServiceImpl extends BaseService implements IFlowService { { response = SdmResponse.failed("添加流程模版草稿失败"); } - else + /*else { bindFLowTemplateAndTask(flowTemplate.templateCode,flowTemplate.simulationPoolInfoList); - } + }*/ return response; } diff --git a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java index 1fa7b302..7c9f77f1 100644 --- a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java +++ b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java @@ -113,9 +113,9 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC @GetMapping(value = "/getTaskPoolLoadcases") @ResponseBody - SdmResponse getTaskPoolLoadcases(@RequestParam("poolName") String poolName,@RequestParam("version")String version) + SdmResponse getTaskPoolLoadcases(@RequestParam("poolName") String poolName,@RequestParam("version")String version,@RequestParam(name = "nodeType",required = false)String nodeType,@RequestParam(name = "nodeName",required = false)String nodeName) { - return service.getSimulationPoolTasks(poolName,version); + return service.getSimulationPoolTasks(poolName,version,nodeType,nodeName); } @GetMapping(value = "/getTaskPoolTaskMap") diff --git a/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java b/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java index 64f9e837..6b9f1bee 100644 --- a/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java +++ b/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java @@ -36,7 +36,7 @@ public interface ISimulationTaskPoolService { SdmResponse> getTaskPoolPerformanceWithVersion(String poolName, String version); - SdmResponse getSimulationPoolTasks(String poolName,String version); + SdmResponse getSimulationPoolTasks(String poolName,String version,String nodeLevel,String nodeName); SdmResponse> getSimulationTasksByPoolId(long poolId); diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index af436e62..5c0d2cc1 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -1939,10 +1939,12 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param nodeObject * @return */ - private List getTaskPoolNodeItem(JSONObject nodeObject) + private List getTaskPoolNodeItem(JSONObject nodeObject,String nodeType,String nodeName) { List tasks = new ArrayList<>(); JSONArray children = nodeObject.getJSONArray("children"); + String currentNodeType = nodeObject.getString("nodeType"); + String currentNodeName = nodeObject.getString("nodeName"); if(children != null) { for(int index=0; index childNodeTasks = getTaskPoolNodeItem(childObj); + List childNodeTasks = getTaskPoolNodeItem(childObj,nodeType,nodeName); tasks.addAll(childNodeTasks); } else if(childType.equals("task")) { + //如果节点类型有过滤限制，节点类型不匹配直接返回 + if(nodeType != null && !nodeType.isEmpty() && !nodeType.equals(currentNodeType)) + { + return tasks; + } + //如果节点名称有过滤限制，节点名称不匹配直接返回 + if(nodeName != null && !nodeName.isEmpty() && !nodeName.equals(currentNodeName)) + { + return tasks; + } + + ObjectMapper objectMapper = new ObjectMapper(); try { TaskPoolItem poolItem = objectMapper.readValue(childObj.toJSONString(),TaskPoolItem.class); @@ -1974,7 +1988,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul @Override public SdmResponse getSimulationPoolTasksByUuids(String poolName,String version,List uuids) { - SdmResponse taskResponse = getSimulationPoolTasks(poolName,version); + SdmResponse taskResponse = getSimulationPoolTasks(poolName,version,"",""); if(!taskResponse.isSuccess()) return taskResponse; SdmResponse response = SdmResponse.success(); @@ -2007,7 +2021,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } else { - SdmResponse taskResponse = getSimulationPoolTasks(poolVersion.poolName,poolVersion.poolVersion); + SdmResponse taskResponse = getSimulationPoolTasks(poolVersion.poolName,poolVersion.poolVersion,"",""); if(taskResponse.isSuccess()) { List tasks = (List)taskResponse.getData(); @@ -2029,7 +2043,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } @Override - public SdmResponse getSimulationPoolTasks(String poolName,String version) + public SdmResponse getSimulationPoolTasks(String poolName,String version,String nodeType,String nodeName) { SdmResponse response = SdmResponse.success(); JSONObject poolJson = null; @@ -2067,7 +2081,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul for(int index=0; index nodeTasks = getTaskPoolNodeItem(nodeObj); + List nodeTasks = getTaskPoolNodeItem(nodeObj,nodeType,nodeName); tasks.addAll(nodeTasks); } }