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:
gulongcheng
2026-03-19 14:58:14 +08:00
parent 7e229ed553 f32e51c12f
commit d1f08f22ed
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/com/sdm/project/dao/SimulationTaskMapper.java
View File

@@ -21,7 +21,7 @@ import java.util.List;
public interface SimulationTaskMapper extends BaseMapper<SimulationTask> {
SdmResponse list(SpdmTaskListReq req);
List<SpdmNewTaskVo> list(@Param("tenantId") Long tenantId);
List<SpdmTaskVo> getTaskList(@Param("tenantId") Long tenantId, @Param("req") SpdmTaskListReq req);

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

@@ -171,6 +171,7 @@ public class SpdmTaskListReq {
/**
* 利元亨定制，支持查询主题名（需求名）
*/
@JsonProperty(value = "tag10")
private String tag10;
/**

6
project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
View File

@@ -314,7 +314,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
userPermissions.put(userId, FilePermissionEnum.ALL.getValue());
// 仿真负责人
if (CollectionUtils.isNotEmpty(allMemberList)) {
allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).forEach(member -> {
// 兼容创建人和负责人是同一个人的情况
allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && !Objects.equals(userId, member.getUserId())).forEach(member -> {
userPermissions.put(member.getUserId(), FilePermissionEnum.BASE.getValue());
});
}
@@ -1790,7 +1791,8 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
userPermissions.put(userId, FilePermissionEnum.ALL.getValue());
// 仿真负责人
if (CollectionUtils.isNotEmpty(allMemberList)) {
allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType())).forEach(member -> {
// 兼容创建人和负责人是同一个人的情况
allMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && !Objects.equals(userId, member.getUserId())).forEach(member -> {
userPermissions.put(member.getUserId(), FilePermissionEnum.BASE.getValue());
});
}

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

@@ -5053,23 +5053,11 @@ public class TaskServiceImpl implements ITaskService {
}
Integer resultType = req.getResultType();
List<NodeMergeQueryResp> mergeQueryRespList = new ArrayList<>();
Long tenantId = ThreadLocalContext.getTenantId();
// 如果是任务或算例就传：task或run，其他的传tag1到tag10
String type = req.getType();
if (MERGE_QUERY_TASK.equals(type) || MERGE_QUERY_RUN.equals(type)) {
SpdmTaskListReq taskListReq = new SpdmTaskListReq();
taskListReq.setType(TaskQryTypeEnum.ALL.getCode());
taskListReq.setCurrent(1);
taskListReq.setSize(10000);
TaskNodeTag taskNodeTag = new TaskNodeTag();
taskNodeTag.setKey(null);
taskNodeTag.setValue("tag1");
taskListReq.setIdMap(Collections.singletonList(taskNodeTag));
SdmResponse response = list(taskListReq);
if (!response.isSuccess()) {
return SdmResponse.success(Collections.emptyList());
}
JSONObject dataObj = (JSONObject) response.getData();
List<SpdmNewTaskVo> taskVoList = (List<SpdmNewTaskVo>) dataObj.get("data");
List<SpdmNewTaskVo> taskVoList = mapper.list(tenantId);
if (CollectionUtils.isEmpty(taskVoList)) {
return SdmResponse.success(Collections.emptyList());
}
@@ -5108,7 +5096,6 @@ public class TaskServiceImpl implements ITaskService {
if (StringUtils.isBlank(nodeType)) {
return SdmResponse.failed("系统中没有当前节点类型：{}",type);
}
Long tenantId = ThreadLocalContext.getTenantId();
List<SimulationNode> nodeList = nodeService.lambdaQuery().eq(SimulationNode::getNodeType, nodeType)
.eq(SimulationNode::getTenantId,tenantId).list();
if (CollectionUtils.isEmpty(nodeList)) {

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

@@ -85,7 +85,9 @@
</delete>
<select id="list" resultType="com.sdm.common.common.SdmResponse"></select>
<select id="list" resultType="com.sdm.project.model.vo.SpdmNewTaskVo">
select * from simulation_task where tenant_Id = #{tenantId}
</select>
<select id="getTaskList" resultType="com.sdm.common.entity.resp.project.SpdmTaskVo">
select * from simulation_task where tenant_id = #{tenantId}