From 864c8b1f0af95b2ab0fe2903739eb172eed5f039 Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Mon, 22 Dec 2025 08:58:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E5=8F=8A=E5=88=86=E6=9E=90=E9=A1=B9=E5=BA=93=E6=95=85?= =?UTF-8?q?=E9=9A=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capability/controller/FlowController.java | 2 +- .../sdm/capability/service/IFlowService.java | 7 +- .../service/impl/FlowServiceImpl.java | 19 ++++- .../SimuluationTaskPoolController.java | 4 +- .../service/ISimulationTaskPoolService.java | 2 + .../impl/SimulationTaskPoolServiceImpl.java | 72 +++++++++++++++++++ 6 files changed, 97 insertions(+), 9 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/controller/FlowController.java b/capability/src/main/java/com/sdm/capability/controller/FlowController.java index 501205d8..143ea0e9 100644 --- a/capability/src/main/java/com/sdm/capability/controller/FlowController.java +++ b/capability/src/main/java/com/sdm/capability/controller/FlowController.java @@ -78,7 +78,7 @@ public class FlowController implements ISimulationFlowFeignClient { @SysLog("查询流程模版") @PostMapping("/queryFlowTemplate") public SdmResponse queryFlowTemplate(@RequestBody @Validated GetFlowTemplateReq req) { - return IFlowService.getReleaseFlowTemplateByCondition(req.templateType,req.templateName,req.approveType,req.beginTime,req.endTime,req.creator,req.current,req.size,req.type,req.templateStatus); + return IFlowService.getReleaseFlowTemplateByCondition(req.templateType,req.templateName,req.approveType,req.createTime,req.creator,req.current,req.size,req.type,req.templateStatus); } /** diff --git a/capability/src/main/java/com/sdm/capability/service/IFlowService.java b/capability/src/main/java/com/sdm/capability/service/IFlowService.java index 26ca1622..aeb41516 100644 --- a/capability/src/main/java/com/sdm/capability/service/IFlowService.java +++ b/capability/src/main/java/com/sdm/capability/service/IFlowService.java @@ -5,6 +5,8 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.system.LaunchApproveReq; import org.springframework.stereotype.Service; +import java.util.List; + @Service public interface IFlowService { @@ -49,12 +51,11 @@ public interface IFlowService { * @param templateType * @param templateName * @param approveType - * @param beginTime - * @param endTime + * @param createTime * @param creator * @return */ - SdmResponse getReleaseFlowTemplateByCondition(String templateType,String templateName,int approveType,String beginTime,String endTime,long creator,int current,int size,int type,int templateStatus); + SdmResponse getReleaseFlowTemplateByCondition(String templateType, String templateName, int approveType, List createTime, long creator, int current, int size, int type, int templateStatus); /** 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 c6c18e06..2c91a96e 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 @@ -153,6 +153,10 @@ public class FlowServiceImpl extends BaseService implements IFlowService { { response = SdmResponse.failed("添加流程模版草稿失败"); } + /*else + { + bindFLowTemplateAndTask(flowTemplate.templateCode,flowTemplate.simulationPoolInfoList); + }*/ return response; } @@ -268,7 +272,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService { } @Override - public SdmResponse getReleaseFlowTemplateByCondition(String templateType,String templateName,int approveType,String beginTime,String endTime,long creator,int current,int size,int type,int templateStatus) { + public SdmResponse getReleaseFlowTemplateByCondition(String templateType,String templateName,int approveType,List createTime,long creator,int current,int size,int type,int templateStatus) { SdmResponse response = SdmResponse.success(); long tenantId = ThreadLocalContext.getTenantId(); String condition = "true"; @@ -279,7 +283,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService { if(templateName != null && !templateName.isEmpty()) { - condition += " AND templateName='"+templateName+"' "; + condition += " AND templateName LIKE '%"+templateName+"%' "; } if(templateStatus >= 0) @@ -304,7 +308,16 @@ public class FlowServiceImpl extends BaseService implements IFlowService { condition += " AND creator="+userId; } - + String beginTime = ""; + String endTime = ""; + if(!createTime.isEmpty()) + { + beginTime = createTime.get(0); + if(createTime.size() > 1) + { + endTime = createTime.get(1); + } + } String timeCondition = Tools.timeRange("createTime",beginTime,endTime); if(!timeCondition.isEmpty()) { 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 d069704e..8999c20b 100644 --- a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java +++ b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java @@ -63,9 +63,9 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC @GetMapping(value = "/getTaskPoolPerformance") @ResponseBody - SdmResponse getSimulationTaskToolPerformance(@RequestParam String poolName) + SdmResponse getSimulationTaskToolPerformance(@RequestParam String poolName,@RequestParam String version) { - return service.getSimulationPoolPerformance(poolName); + return service.getSimulationPoolPerformanceByVersion(poolName,version); } @GetMapping(value = "/getTaskPoolVersions") 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 542e1eef..b1dada31 100644 --- a/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java +++ b/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java @@ -31,6 +31,8 @@ public interface ISimulationTaskPoolService { SdmResponse getSimulationPoolPerformance(String poolName); + SdmResponse getSimulationPoolPerformanceByVersion(String poolName,String version); + SdmResponse getSimulationPoolTasks(String poolName,String version); 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 91381ac1..30ab42b4 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 @@ -712,6 +712,77 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul return response; } + /** + * 遍历节点下所有的性能指标 + * @param node + * @param performances + */ + private void traverseNodePerformance(JSONObject node,List performances) + { + JSONArray children = node.getJSONArray("children"); + if(children == null) + return; + for(int index=0; index performances = new ArrayList<>(); + try { + JSONObject taskTreeObject = JSONObject.parseObject(poolContents); + JSONArray nodeArray = taskTreeObject.getJSONArray("nodes"); + if(nodeArray != null) + { + for(int i = 0; i < nodeArray.size(); i++) + { + JSONObject nodeObject = nodeArray.getJSONObject(i); + traverseNodePerformance(nodeObject,performances); + } + } + + }catch (Exception e) { + e.printStackTrace(); + } + response.setData(performances); + return response; + } + /** * 获取分析库中所有指标 * @param poolName @@ -1475,6 +1546,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul mapper.addTaskPoolBreif(currPoolBrief); poolVersion.poolId = currPoolBrief.id; TaskPoolTree poolTree = (TaskPoolTree) treeRespond.getData(); + poolTree.poolBrief = currPoolBrief; poolVersion.versionContents = JSONObject.toJSONString(poolTree); mapper.addTaskPoolVersion(poolVersion); }