diff --git a/1-sql/2026-02-26/simulation_run_key_result.sql b/1-sql/2026-02-26/simulation_run_key_result.sql new file mode 100644 index 00000000..b09e828a --- /dev/null +++ b/1-sql/2026-02-26/simulation_run_key_result.sql @@ -0,0 +1 @@ +ALTER TABLE spdm_baseline.simulation_run_key_result MODIFY COLUMN runId varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' NULL COMMENT '所属Run UUID'; diff --git a/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java b/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java index 94d32e46..214bce9d 100644 --- a/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java +++ b/common/src/main/java/com/sdm/common/feign/impl/data/DataClientFeignClientImpl.java @@ -301,8 +301,8 @@ public class DataClientFeignClientImpl implements IDataFeignClient { } @Override - public SdmResponse copyFileToTask(CopyFileToTaskReq req) { - SdmResponse response; + public SdmResponse copyFileToTask(CopyFileToTaskReq req) { + SdmResponse response; try { response = dataClient.copyFileToTask(req); return response; diff --git a/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java index 5e9a6f0e..7cb74670 100644 --- a/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java +++ b/common/src/main/java/com/sdm/common/feign/inter/data/IDataFeignClient.java @@ -108,5 +108,5 @@ public interface IDataFeignClient { SdmResponse getMultipartFileByFileId(@RequestParam(value = "fileId") @Validated Long fileId); @PostMapping("/data/copyFileToTask") - SdmResponse copyFileToTask(@RequestBody CopyFileToTaskReq req); + SdmResponse copyFileToTask(@RequestBody CopyFileToTaskReq req); } diff --git a/data/src/main/java/com/sdm/data/controller/DataFileController.java b/data/src/main/java/com/sdm/data/controller/DataFileController.java index f525b40d..2543f105 100644 --- a/data/src/main/java/com/sdm/data/controller/DataFileController.java +++ b/data/src/main/java/com/sdm/data/controller/DataFileController.java @@ -709,7 +709,7 @@ public class DataFileController implements IDataFeignClient { @PostMapping("/copyFileToTask") @Operation(summary = "复制关键结果文件到task下", description = "复制关键结果文件到task下") - public SdmResponse copyFileToTask(@RequestBody CopyFileToTaskReq req) { + public SdmResponse copyFileToTask(@RequestBody CopyFileToTaskReq req) { return IDataFileService.copyFileToTask(req); } diff --git a/data/src/main/java/com/sdm/data/service/IDataFileService.java b/data/src/main/java/com/sdm/data/service/IDataFileService.java index 50ceceb9..471e7fd8 100644 --- a/data/src/main/java/com/sdm/data/service/IDataFileService.java +++ b/data/src/main/java/com/sdm/data/service/IDataFileService.java @@ -412,7 +412,7 @@ public interface IDataFileService { SdmResponse> batchAddFileInfo(UploadFilesReq req); - SdmResponse copyFileToTask(CopyFileToTaskReq req); + SdmResponse copyFileToTask(CopyFileToTaskReq req); SdmResponse chunkUploadToMinio(ChunkUploadMinioFileReq req); diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java index fb6bebeb..dff25955 100644 --- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java @@ -1610,7 +1610,7 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } @Override - public SdmResponse copyFileToTask(CopyFileToTaskReq req) { + public SdmResponse copyFileToTask(CopyFileToTaskReq req) { // 源文件 FileMetadataInfo sourceMetadataInfo = fileMetadataInfoService.lambdaQuery().eq(FileMetadataInfo::getId, req.getSourceFileId()).one(); if (ObjectUtils.isEmpty(sourceMetadataInfo)) { @@ -1647,7 +1647,15 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { FileMetadataInfo fileInfo = createFileMetadata(newDirMinioObjectKey, sourceMetadataInfo.getOriginalName(), null, null, null, targetParentMetadataInfo.getId(), sourceMetadataInfo.getFileSize(), sourceMetadataInfo.getTag1()); fileMetadataInfoService.save(fileInfo); - return SdmResponse.success("复制文件成功"); + + UploadFilesReq uploadFilesReq = new UploadFilesReq(); + uploadFilesReq.setSize(sourceMetadataInfo.getFileSize()); + List ancestorDirIds = collectAncestorDirIds(targetParentMetadataInfo.getId()); + saveFileStorageStats(fileInfo, uploadFilesReq, ancestorDirIds); + saveCopyFileTags(uploadFilesReq, fileInfo, sourceMetadataInfo, ancestorDirIds); + createFilePermission(fileInfo.getId()); + + return SdmResponse.success(fileInfo.getId()); } catch (Exception e) { log.error("复制文件失败", e); throw new RuntimeException("复制文件失败: " + e.getMessage(), e); @@ -2305,6 +2313,38 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService { } } + private void saveCopyFileTags(UploadFilesReq req, FileMetadataInfo fileInfo, FileMetadataInfo oldFileInfo, + List ancestorDirIds) { + + Long tenantId = ThreadLocalContext.getTenantId(); + Long creatorId = ThreadLocalContext.getUserId(); + long fileSize = resolveFileSize(req); + // 旧文件的标签 + List oldTagRelList = fileTagRelService.lambdaQuery().eq(FileTagRel::getFileId, oldFileInfo.getId()).list(); + if (CollectionUtils.isNotEmpty(oldTagRelList)) { + List allTagRelList = new ArrayList<>(); + List tagIdList = oldTagRelList.stream().map(FileTagRel::getTagId).distinct().toList(); + for (Integer tagId : tagIdList) { + // 遍历查询结果，构造文件标签关系 + // 为所有目录（当前目录 + 祖先目录）创建标签关系 + for (Long dirIdItem : ancestorDirIds) { + FileTagRel tagRel = new FileTagRel(); + tagRel.setFileId(fileInfo.getId()); + tagRel.setTagId(tagId); + tagRel.setDirId(dirIdItem); + tagRel.setTenantId(tenantId); + tagRel.setCreatorId(creatorId); + tagRel.setFileSize(fileSize); + allTagRelList.add(tagRel); + } + } + // 一次性批量插入所有标签关系 + if (CollectionUtils.isNotEmpty(allTagRelList)) { + fileTagRelService.saveBatch(allTagRelList); + } + } + } + private void bindSimulationPool(UploadFilesReq req, FileMetadataInfo fileInfo) { diff --git a/project/src/main/java/com/sdm/project/bo/ExportOperate.java b/project/src/main/java/com/sdm/project/bo/ExportOperate.java index df0126ec..cba715ca 100644 --- a/project/src/main/java/com/sdm/project/bo/ExportOperate.java +++ b/project/src/main/java/com/sdm/project/bo/ExportOperate.java @@ -1,14 +1,17 @@ package com.sdm.project.bo; +import com.alibaba.fastjson2.JSONObject; +import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.ExportExcelFormat; import com.sdm.common.utils.SystemOperate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; +import java.io.*; import java.nio.charset.Charset; +import java.util.List; @Slf4j @Component @@ -42,11 +45,11 @@ public class ExportOperate { } finally { File taskFile = new File(taskJsonFileName); if (taskFile.exists()) { -// taskFile.delete(); + taskFile.delete(); } File columnFile = new File(columnFileName); if (columnFile.exists()) { -// columnFile.delete(); + columnFile.delete(); } } } @@ -80,5 +83,97 @@ public class ExportOperate { } + private String uploadMultipartFile(MultipartFile multipartFile) + { + String fileName = multipartFile.getOriginalFilename(); + File file = null; + String saveName = ""; + try + { + saveName = TEMP_EXPORT_PATH + System.currentTimeMillis()+"_"+fileName; + file = new File(saveName); + FileOutputStream os = new FileOutputStream(file); + InputStream is = multipartFile.getInputStream(); + int readLen = 0; + byte[] buffer = new byte[1024*8]; + while((readLen = is.read(buffer)) > 0) + { + os.write(buffer,0,readLen); + } + is.close(); + os.close(); + } + catch (IOException e) + { + e.printStackTrace(); + } + return saveName; + } + + public SdmResponse parsePerformance(MultipartFile performanceFile, String columns) + { + SdmResponse response = SdmResponse.success(); + String performanceFileName = uploadMultipartFile(performanceFile); + String columnFileName = TEMP_EXPORT_PATH + System.currentTimeMillis() + "column.json"; + if(!saveContentsToFile(columns,columnFileName)) { + response = SdmResponse.failed("保存指标字段信息失败"); + } + else { + // 脚本解析导入的指标文件 + String shellPath = scriptPath + File.separator + "inputExcel.py"; + String poolJsonFileName = TEMP_EXPORT_PATH + System.currentTimeMillis() + "performance.json"; + String pythonCmd = "python " + shellPath + " '" + poolJsonFileName + " '" + " '" + performanceFileName + "' " + " '" + columnFileName + " '" ; + try + { + log.info("shell begin time:"+System.currentTimeMillis()); + String resultString = SystemOperate.exeShellCmd(pythonCmd); + log.info("shell end time:"+System.currentTimeMillis()); + if(resultString.contains("error")) { + response = SdmResponse.failed("解析指标文件脚本执行错误"); + } + else { + InputStream is = new FileInputStream(poolJsonFileName); + byte[] jsonContents = is.readAllBytes(); + String poolJsonString = new String(jsonContents, "utf-8"); + if (poolJsonString != null && poolJsonString.length() > 0) { + JSONObject poolJsonObj = JSONObject.parseObject(poolJsonString); + response.setData(poolJsonObj); + } + } + + } + catch (Exception e) { + e.printStackTrace(); + } + finally + { +// if(poolFileName != null && poolFileName.length() > 0) +// { +// File pFile = new File(poolFileName); +// if(pFile.exists()) { +// pFile.delete(); +// } +// } +// File dictFile = new File(dictFileName); +// if(dictFile.exists()) +// { +// dictFile.delete(); +// } +// File poolJsonFile = new File(poolJsonFileName); +// if(poolJsonFile.exists()) +// { +// poolJsonFile.delete(); +// } +// +// File columnFile = new File(columnFileName); +// if(columnFile.exists()) +// { +// columnFile.delete(); +// } + } + } + return response; + } + } diff --git a/project/src/main/java/com/sdm/project/controller/SimulationTaskController.java b/project/src/main/java/com/sdm/project/controller/SimulationTaskController.java index 1a181bb6..52493f5b 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationTaskController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationTaskController.java @@ -2,6 +2,7 @@ package com.sdm.project.controller; import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.req.performance.PerformanceExportExcelFormat; import com.sdm.common.entity.req.project.GetAllTasksByDisciplineReq; import com.sdm.common.entity.req.project.GetTaskDetailReq; import com.sdm.common.entity.req.task.TaskExportExcelFormat; @@ -20,6 +21,7 @@ import jakarta.validation.constraints.NotBlank; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.List; @@ -300,4 +302,16 @@ public class SimulationTaskController implements ISimulationTaskFeignClient { return taskService.batchOperation(batchTaskOpr); } + /** + * 任务执行————导入指标 + * @param file + * @param columns + * @return + */ + @PostMapping(value = "/importSimulationPerformance") + @ResponseBody + SdmResponse importSimulationPerformance(@RequestParam("file") MultipartFile file, @RequestParam("columns")String columns) { + return taskService.importSimulationPerformance(file,columns); + } + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmEditDemandReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmEditDemandReq.java index d2890006..6f9a546c 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmEditDemandReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmEditDemandReq.java @@ -107,6 +107,16 @@ public class SpdmEditDemandReq extends BaseEntity { */ private String nodeId; + /** + * 机台id + */ + private String machineId; + + /** + * 工位id + */ + private String workspaceId; + /** * 3D负责人 */ diff --git a/project/src/main/java/com/sdm/project/service/ITaskService.java b/project/src/main/java/com/sdm/project/service/ITaskService.java index da0df4f5..e056b560 100644 --- a/project/src/main/java/com/sdm/project/service/ITaskService.java +++ b/project/src/main/java/com/sdm/project/service/ITaskService.java @@ -5,6 +5,7 @@ import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.export.PerformanceAnalysisExportExcelFormat; import com.sdm.common.entity.req.export.RunAnalysisExportExcelFormat; import com.sdm.common.entity.req.export.TaskAnalysisExportExcelFormat; +import com.sdm.common.entity.req.performance.PerformanceExportExcelFormat; import com.sdm.common.entity.req.project.GetAllTasksByDisciplineReq; import com.sdm.common.entity.req.project.GetTaskDetailReq; import com.sdm.common.entity.req.task.TaskExportExcelFormat; @@ -17,6 +18,7 @@ import com.sdm.project.model.resp.YA.BosimSaveProjectTaskRsp; import com.sdm.common.entity.resp.project.SpdmTaskVo; import jakarta.servlet.http.HttpServletResponse; import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; import java.util.List; import java.util.Map; @@ -104,4 +106,6 @@ public interface ITaskService { SdmResponse batchOperation(SpdmBatchTaskOpr batchTaskOpr); + SdmResponse importSimulationPerformance(MultipartFile file, String columns); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java index 6cf2a23d..49bf5c68 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java @@ -2640,6 +2640,7 @@ public class SimulationRunServiceImpl extends ServiceImpl taskKeyResultList = new ArrayList<>(); for (String keyResultId : req.getKeyResultIdList()) { SimulationRunKeyResult keyResult = simulationKeyResultService.lambdaQuery().eq(SimulationRunKeyResult::getUuid, keyResultId).one(); if (keyResult == null) { @@ -2658,11 +2659,20 @@ public class SimulationRunServiceImpl extends ServiceImpl response = dataFeignClient.copyFileToTask(copyFileToTaskReq); if (!response.isSuccess()) { return SdmResponse.failed("归档关键结果文件失败"); } + // 同时归档一份keyResult到表里，因为任务下的曲线预览也需要展示物理量和单位 + SimulationRunKeyResult simulationRunKeyResult = new SimulationRunKeyResult(); + BeanUtils.copyProperties(keyResult, simulationRunKeyResult); + simulationRunKeyResult.setId(null); + simulationRunKeyResult.setUuid(RandomUtil.generateString(32)); + simulationRunKeyResult.setRunId(null); + simulationRunKeyResult.setFileId(response.getData()); + taskKeyResultList.add(simulationRunKeyResult); } + simulationKeyResultService.saveBatch(taskKeyResultList); } } else { // 将算例下的指标分析值同步到任务指标 diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index 88cd8788..b98f1d16 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -14,6 +14,7 @@ import com.sdm.common.entity.req.export.PerformanceAnalysisExportExcelFormat; import com.sdm.common.entity.req.export.RunAnalysisExportExcelFormat; import com.sdm.common.entity.req.export.TaskAnalysisExportExcelFormat; import com.sdm.common.entity.req.export.TaskAnalysisExportExcelParam; +import com.sdm.common.entity.req.performance.PerformanceExportExcelFormat; import com.sdm.common.entity.req.project.GetAllTasksByDisciplineReq; import com.sdm.common.entity.req.project.GetTaskDetailReq; import com.sdm.common.entity.req.project.SimulationPerformance; @@ -74,9 +75,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StopWatch; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.*; import java.util.function.Consumer; @@ -4176,6 +4181,25 @@ public class TaskServiceImpl implements ITaskService { return SdmResponse.success(); } + + + @Override + public SdmResponse importSimulationPerformance(MultipartFile file, String columns) { + SdmResponse response = exportOperate.parsePerformance(file,columns); + if(response.getCode() != ResultCode.SUCCESS.getCode()) { + return response; + } + else { + JSONObject poolTreeObj = (JSONObject) response.getData(); + response.setData(poolTreeObj); + } + log.info("import endTime:"+System.currentTimeMillis()); + return response; + + } + + + public static String getMaxNonEmptyTagForTask(SimulationTask req) { // 空对象校验 if (req == null) { diff --git a/project/src/main/resources/mapper/SimulationDemandMapper.xml b/project/src/main/resources/mapper/SimulationDemandMapper.xml index 5a5ffb5c..8774c7fa 100644 --- a/project/src/main/resources/mapper/SimulationDemandMapper.xml +++ b/project/src/main/resources/mapper/SimulationDemandMapper.xml @@ -68,8 +68,11 @@ phase_id = #{req.phaseId}, - - node_id = #{req.nodeId}, + + machine_id = #{req.machineId}, + + + workspace_id = #{req.workspaceId}, updater = #{jobNumber}, diff --git a/system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java b/system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java index 0fe349b6..8bce67cc 100644 --- a/system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java +++ b/system/src/main/java/com/sdm/system/dao/SimulationSystemMapper.java @@ -29,7 +29,7 @@ public interface SimulationSystemMapper { @Delete("DELETE FROM simulation_data_dictionary WHERE dictClass=#{dictClass} AND tenantId=#{tenantId}") int deleteDictionaryClassItems(@Param("dictClass")String dictClass,@Param("tenantId") long tenantId); - @Select("SELECT * FROM simulation_data_dictionary WHERE dictName=#{dictName} AND dictClass=#{dictClass} AND tenantId=#{tenantId} LIMIT 1") + @Select("SELECT * FROM simulation_data_dictionary WHERE BINARY dictName=#{dictName} AND dictClass=#{dictClass} AND tenantId=#{tenantId} LIMIT 1") DataDictionary queryDataDictionary(@Param("dictName")String dictName,@Param("dictClass")String dictClass,@Param("tenantId")long tenantId); @Select("SELECT * FROM simulation_data_dictionary WHERE classType=#{classType} AND dictValue=#{dictValue} AND tenantId=#{tenantId} LIMIT 1") diff --git a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java index 9c00ac45..88de5eb6 100644 --- a/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java +++ b/system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java @@ -88,27 +88,26 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS * @return */ public SdmResponse addDataDictionary(DataDictionary dict) { - SdmResponse response = SdmResponse.success(); long tenantId = ThreadLocalContext.getTenantId(); DataDictionary dictionary = mapper.queryDataDictionary(dict.dictName, dict.dictClass, tenantId); if (dictionary != null) { - response = SdmResponse.failed("数据字典信息已存在"); + return SdmResponse.failed("数据字典信息已存在"); } if (ObjectUtils.isNotEmpty(dict.classType)) { DataDictionary dataDictionary = mapper.queryDataDictionaryByDictTypeAndDictName(dict.classType, dict.dictValue, tenantId); if (dataDictionary != null) { - response = SdmResponse.failed("数据字典:"+dataDictionary.dictClass+"-"+dataDictionary.aliasName+"已存在,请重新命名数据字典值"); + return SdmResponse.failed("数据字典:"+dataDictionary.dictClass+"-"+dataDictionary.aliasName+"已存在,请重新命名数据字典值"); } } dict.tenantId = ThreadLocalContext.getTenantId(); dict.creator = ThreadLocalContext.getUserId(); dict.uuid = generateDictionaryUuid(); if (mapper.addDataDictionary(dict) <= 0) { - response = SdmResponse.failed("添加数据字典信息失败"); + return SdmResponse.failed("添加数据字典信息失败"); } - return response; + return SdmResponse.success(); } /** 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 976059ea..3831cc2d 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -41,8 +41,8 @@ public interface SimulationPoolMapper { @Select("SELECT poolName,poolVersion,poolId FROM simulation_pool_versions GROUP BY poolName,poolVersion,poolId") List queryAllTaskPoolVersion(); - @Select("SELECT * FROM simulation_pool") - List queryAllTaskPool(); + @Select("SELECT * FROM simulation_pool WHERE tenantId = #{tenantId}") + List queryAllTaskPool(@Param("tenantId") Long tenantId); @Select("SELECT versionContents FROM simulation_pool_versions WHERE poolName=#{poolName} AND poolVersion=#{version}") String queryTaskPoolVersionContent(@Param("poolName")String poolName,@Param("version")String version); 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 0cdce08f..af436e62 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 @@ -583,7 +583,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul public SdmResponse getAllTaslPoolCurrentVersion() { SdmResponse response = SdmResponse.success(); - List taskPoolBriefs = mapper.queryAllTaskPool(); + Long tenantId = ThreadLocalContext.getTenantId(); + List taskPoolBriefs = mapper.queryAllTaskPool(tenantId); JSONArray taskPoolArray = new JSONArray(); for(TaskPoolBrief taskPoolBrief : taskPoolBriefs) { @@ -1532,7 +1533,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul public SdmResponse getAllTaskPool(boolean bCurrent) { SdmResponse response = SdmResponse.success(); - List poolBriefs = mapper.queryAllTaskPool(); + Long tenantId = ThreadLocalContext.getTenantId(); + List poolBriefs = mapper.queryAllTaskPool(tenantId); if(!bCurrent) { List allPoolVersions = mapper.queryAllTaskPoolVersion();