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

fix[project]: 修改合并查询接口

Browse Source
This commit is contained in:
lidongyang
2026-03-19 12:50:29 +08:00
parent ca022b3384
commit f32e51c12f
3 changed files with 6 additions and 17 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);

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}