toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加仿真流程模版库

Browse Source
This commit is contained in:
daiqy88
2025-11-13 08:45:16 +08:00
parent 09992e1887
commit 2faf3a0985
34 changed files with 791 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java
View File

@@ -94,7 +94,5 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC
{
return service.handleApproveNotice(req);
}
}

4
task/src/main/java/com/sdm/task/model/entity/NodeBase.java
View File

@@ -18,9 +18,9 @@ public class NodeBase extends BaseBean {
public String levelType;
public int pId;
public String pUuid;
public String tenantId;
public long tenantId;
public String description;
public String createTime;
public String creator;
public long creator;
public List<NodeBase> children = new ArrayList<>(); //适配前端组件
}

4
task/src/main/java/com/sdm/task/model/entity/TaskPoolBrief.java
View File

@@ -13,7 +13,7 @@ public class TaskPoolBrief extends BaseBean
public String comment;
public String parentVersion;
public String currentVersion;
public String tenantId;
public String creator;
public long tenantId;
public long creator;
public String createTime;
}

2
task/src/main/java/com/sdm/task/model/entity/TaskPoolVersion.java
View File

@@ -12,6 +12,6 @@ public class TaskPoolVersion extends BaseBean {
public String parentVersion;
public String childVersion;
public String versionContents;
public String creator;
public long creator;
public String createTime;
}

13
task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
View File

@@ -111,6 +111,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
poolNode.parentId = parentId;
poolNode.poolVersion = brief.currentVersion;
poolNode.tenantId = brief.tenantId;
poolNode.creator = brief.creator;
if(poolNodes != null) { //兼容在node下新增子树情况
poolNodes.add(poolNode);
}
@@ -136,6 +137,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
item.poolVersion = brief.currentVersion;
item.tenantId = brief.tenantId;
item.nodeId = poolNode.uuid;
item.creator = brief.creator;
if(!bStringNotBlank(item.uuid)) {//兼容在分析项下添加指标情况
item.uuid = generatePoolTaskUuid();
}
@@ -170,6 +172,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
performance.standard = item.standard;
performance.poolName = item.poolName;
performance.tenantId = brief.tenantId;
performance.creator = brief.creator;
if(taskPerformances != null) {
taskPerformances.add(performance);
}
@@ -411,7 +414,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
public SdmResponse createTaskPool(JSONObject poolTreeObj)
{
TaskPoolTree poolTree = paraseTaskPoolTree(poolTreeObj);
if(poolTree.bApprove)
if(poolTreeObj.getBoolean("bApprove"))
{
String approveContents = poolTreeObj.toJSONString();
int approveAction = 1;
@@ -427,6 +430,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
}
SdmResponse response = SdmResponse.success();
TaskPoolBrief poolBrief = poolTree.poolBrief;
poolBrief.creator = ThreadLocalContext.getUserId();
poolBrief.tenantId = ThreadLocalContext.getTenantId();
poolBrief.currentVersion = "V1.0"; //新建时初始版本号
String poolName = poolBrief.poolName;
if(poolName == null)
@@ -952,6 +957,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
*/
private boolean preProcessTaskUpdateBean(TaskPoolUpdateBean updateBean)
{
updateBean.poolBrief.tenantId = ThreadLocalContext.getTenantId();
updateBean.poolBrief.creator = ThreadLocalContext.getTenantId();
if(updateBean.addNodeArray != null)//处理node json结构
{
for(int index=0; index<updateBean.addNodeArray.size(); index++)
@@ -1026,7 +1033,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
//评审处理
if(updateBean.bApprove)
{
String approveContents = updateBean.toString();
String approveContents = JSONObject.toJSONString(updateBean);
int approveAction = 2;
//发起评审
if(launchTaskPoolApprove(updateBean.approveTemplateId,updateBean.approveTemplateName,approveContents,approveAction))
@@ -1300,7 +1307,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
poolBriefObj.put("poolName",poolName);
}
//response = createTaskPool(poolTreeObj);
response.setData(poolBriefObj);
response.setData(poolTreeObj);
}
return response;
}