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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
zhuxinru
2025-11-28 18:11:10 +08:00
parent 6bc4c7401e 21d07b99c1
commit 4fb5a8ad3c
17 changed files with 309 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/model/bo/CidTaskNode.java
View File

@@ -187,6 +187,8 @@ public class CidTaskNode extends BaseEntity {
private String group;
@JsonProperty(value = "bCapacity")
private String bCapacity;
@JsonProperty(value = "tag1")
private String tag1;

1
project/src/main/java/com/sdm/project/model/req/SpdmProjectNodeEditReq.java
View File

@@ -131,4 +131,5 @@ public class SpdmProjectNodeEditReq extends BaseEntity {
private String exeStatus;
private List<SpdmNodeExtraReq> extras;
private String englishName;
}

2
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -1491,7 +1491,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
spdmProjectNodeEditReq.setPid(req.getProjectId());
spdmProjectNodeEditReq.setTag1(req.getProjectId());
spdmProjectNodeEditReq.setCreateTime(curDateStr);
spdmProjectNodeEditReq.setTenantId(1999999999999999999L);
spdmProjectNodeEditReq.setTenantId(ThreadLocalContext.getTenantId());
BosimSaveProjectTaskRsp resp = new BosimSaveProjectTaskRsp();
if (nodeMapper.addNodeBatch(Collections.singletonList(spdmProjectNodeEditReq)) <= 0) {
log.error("同步CID项目：{}失败",req.getProjectId() + " " + req.getProjectName());

3
project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
View File

@@ -1265,10 +1265,11 @@ public class TaskServiceImpl implements ITaskService {
for (ProjectTaskInfo projectTaskInfo : taskInfoList) {
CidTaskNode taskNode = new CidTaskNode();
taskNode.setUuid(projectTaskInfo.getTaskId());
taskNode.setTag1(req.getProjectId());
taskNode.setTaskName(projectTaskInfo.getTaskName());
taskNode.setNodeId(req.getProjectId());
taskNode.setCreateTime(curDateStr);
taskNode.setTenantId(1999999999999999999L);
taskNode.setTenantId(ThreadLocalContext.getTenantId());
taskNodeList.add(taskNode);
}
if (projectMapper.batchAddSimulationCidTask(taskNodeList) <= 0) {

2
project/src/main/resources/mapper/SimulationNodeMapper.xml
View File

@@ -10,7 +10,7 @@
achieveStatus,exe_status,tenantId,description,detailImgUrl,creator,create_time,tag1,tag2,tag3,tag4,tag5,tag6,tag7,tag8,tag9,tag10)
values
<foreach collection='addNodeList' item='addNode' index='index' separator=','>
(#{addNode.uuid},#{addNode.ownRootNodeUuid},#{addNode.nodeName},#{addNode.nodeCode},'',#{addNode.nodeType},#{addNode.nodeSubType},'0',#{addNode.pid},
(#{addNode.uuid},#{addNode.ownRootNodeUuid},#{addNode.nodeName},#{addNode.nodeCode},#{addNode.englishName},#{addNode.nodeType},#{addNode.nodeSubType},'0',#{addNode.pid},
'',1,#{addNode.beginTime},#{addNode.endTime},'',#{addNode.progressStatus},#{addNode.achieveStatus},#{addNode.exeStatus},#{addNode.tenantId},#{addNode.description},
#{addNode.detailImgUrl},#{addNode.creator},#{addNode.createTime},#{addNode.tag1},#{addNode.tag2},
#{addNode.tag3},#{addNode.tag4},#{addNode.tag5},#{addNode.tag6},#{addNode.tag7},#{addNode.tag8},#{addNode.tag9},#{addNode.tag10})

4
project/src/main/resources/mapper/SimulationProjectMapper.xml
View File

@@ -58,9 +58,9 @@
</insert>
<insert id="batchAddSimulationTaskExtra">
insert into simulation_task_extra (uuid,task_id,nodeId,property_name,property_value,value_type,property_class) values
insert into simulation_task_extra (uuid,task_id,nodeId,property_name,property_value,value_type,property_class,create_time) values
<foreach collection='list' item='it' index='index' separator=','>
(#{it.uuid},#{it.taskId},#{it.nodeId},#{it.propertyName},#{it.propertyValue},#{it.valueType},#{it.propertyClass})
(#{it.uuid},#{it.taskId},#{it.nodeId},#{it.propertyName},#{it.propertyValue},#{it.valueType},#{it.propertyClass},#{it.createTime})
</foreach>
</insert>