From 079f3b5a8249ebd7bd876e29be4f0c92340b78f7 Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Thu, 11 Dec 2025 16:31:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B9=E5=BA=93=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=B5=81=E7=A8=8B=E6=A8=A1=E7=89=88=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A1=B9=E5=BA=93ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/entity/SimulationFlowTaskBindInfo.java | 2 +- .../com/sdm/capability/service/impl/FlowServiceImpl.java | 8 ++++++++ .../sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java | 2 ++ .../main/java/com/sdm/task/dao/SimulationPoolMapper.java | 6 +++--- .../model/entity/SimulatePoolTaskFlowTemplateRelate.java | 2 ++ .../java/com/sdm/task/model/entity/TaskPoolVersion.java | 2 +- .../task/service/impl/SimulationTaskPoolServiceImpl.java | 8 ++++++-- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java b/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java index fad7c0aa..134e99a5 100644 --- a/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java +++ b/capability/src/main/java/com/sdm/capability/model/entity/SimulationFlowTaskBindInfo.java @@ -7,7 +7,7 @@ import java.util.List; public class SimulationFlowTaskBindInfo { - public String simulationPoolId; + public int simulationPoolId; public String simulationPoolName; 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 f33f5eef..c6c18e06 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 @@ -107,6 +107,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService { FlowBindTaskPoolItem bindTaskPoolItem = new FlowBindTaskPoolItem(); bindTaskPoolItem.flowCode = flowCode; bindTaskPoolItem.poolName = bindInfo.simulationPoolName; + bindTaskPoolItem.poolId = bindInfo.simulationPoolId; bindTaskPoolItem.version = bindInfo.simulationPoolVersion; for(String taskId : bindInfo.simulationPoolTaskIds) { @@ -337,8 +338,15 @@ public class FlowServiceImpl extends BaseService implements IFlowService { { SimulationFlowTaskBindInfo flowTaskBindInfo = new SimulationFlowTaskBindInfo(); flowTaskBindInfo.simulationPoolName = flowBindTaskPoolItem.poolName; + flowTaskBindInfo.simulationPoolId = flowBindTaskPoolItem.poolId; flowTaskBindInfo.simulationPoolVersion = flowBindTaskPoolItem.version; flowTaskBindInfo.taskBaseInfoList = flowBindTaskPoolItem.taskList; + List taskIds = new ArrayList<>(); + for(TaskBaseInfo taskBaseInfo : flowBindTaskPoolItem.taskList) + { + taskIds.add(taskBaseInfo.uuid); + } + flowTaskBindInfo.simulationPoolTaskIds = taskIds; flowTemplate.simulationPoolInfoList.add(flowTaskBindInfo); } diff --git a/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java b/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java index 3a57f306..a5ddbd3f 100644 --- a/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java +++ b/common/src/main/java/com/sdm/common/entity/pojo/task/FlowBindTaskPoolItem.java @@ -7,6 +7,8 @@ public class FlowBindTaskPoolItem { public String poolName; + public int poolId; + public String version; public String flowCode; diff --git a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java index 59f8ce9b..de29d220 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -218,15 +218,15 @@ public interface SimulationPoolMapper { @Insert({ "" }) int batchAddTaskFlowRelate(@Param("list") List list); - @Insert("INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,version,taskUuid,flowCode) VALUES (#{relate.poolName},#{relate.version},#{relate.taskUuid},#{relate.flowCode})") + @Insert("INSERT INTO simulation_taskpool_flowtemplate_relate(poolName,version,taskUuid,flowCode,poolId) VALUES (#{relate.poolName},#{relate.version},#{relate.taskUuid},#{relate.flowCode},#{relate.poolId})") int addTaskFlowRelate(@Param("relate") SimulatePoolTaskFlowTemplateRelate relate); @Select("SELECT * FROM simulation_taskpool_flowtemplate_relate WHERE flowCode=#{flowCode} AND poolName=#{poolName} AND version=#{version} AND taskUuid=#{taskUuid}") diff --git a/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java b/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java index b5f952b1..b2987e2d 100644 --- a/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java +++ b/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java @@ -6,6 +6,8 @@ public class SimulatePoolTaskFlowTemplateRelate { public String poolName; + public int poolId; + public String version; public String taskUuid; diff --git a/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java b/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java index ee27602d..76456d08 100644 --- a/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java +++ b/task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java @@ -12,7 +12,7 @@ public class TaskPoolVersion extends BaseBean { public String parentVersion; public String childVersion; public String versionContents; - public long poolId; + public int poolId; public long creator; public String createTime; } 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 29b15ca0..a08cd666 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 @@ -76,6 +76,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul SimulatePoolTaskFlowTemplateRelate relate = new SimulatePoolTaskFlowTemplateRelate(); relate.poolName = poolName; relate.version = version; + relate.poolId = poolId; relate.taskUuid = taskPoolItem.uuid; relate.flowCode = template; flowRelationList.add(relate); @@ -121,7 +122,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param version * @param taskPoolItemList */ - private void addTaskRelationCheckRepeat(String poolName,String version,List taskPoolItemList) + private void addTaskRelationCheckRepeat(String poolName,String version,List taskPoolItemList,int poolId) { for(TaskPoolItem taskPoolItem:taskPoolItemList) { String flowTemplate = taskPoolItem.flowTemplate; @@ -136,6 +137,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul SimulatePoolTaskFlowTemplateRelate templateRelate = new SimulatePoolTaskFlowTemplateRelate(); templateRelate.poolName = poolName; templateRelate.version = version; + templateRelate.poolId = poolId; templateRelate.taskUuid = taskPoolItem.uuid; templateRelate.flowCode = template; mapper.addTaskFlowRelate(templateRelate); @@ -173,7 +175,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } //将添加和更新task合并一起后一起添加关联关系，需要检查关系是否重复绑定 addTasks.addAll(updateTasks); - addTaskRelationCheckRepeat(poolName,currentVersion,addTasks); + addTaskRelationCheckRepeat(poolName,currentVersion,addTasks,currentBrief.id); } @@ -1405,6 +1407,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul currPoolBrief.parentVersion = currPoolBrief.currentVersion; currPoolBrief.currentVersion = poolVersion.poolVersion; poolVersion.poolId = mapper.addTaskPoolBreif(currPoolBrief); + currPoolBrief.id = poolVersion.poolId; TaskPoolTree poolTree = (TaskPoolTree) treeRespond.getData(); poolVersion.versionContents = JSONObject.toJSONString(poolTree); mapper.addTaskPoolVersion(poolVersion); @@ -1988,6 +1991,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul templateRelate.flowCode = flowCode; templateRelate.poolName = taskPoolItem.poolName; templateRelate.version = taskPoolItem.version; + templateRelate.poolId = taskPoolItem.poolId; templateRelate.taskUuid = taskBaseInfo.uuid; relations.add(templateRelate); }