diff --git a/project/src/main/java/com/sdm/project/controller/YAModelController.java b/project/src/main/java/com/sdm/project/controller/YAModelController.java index 1f572f98..a229968a 100644 --- a/project/src/main/java/com/sdm/project/controller/YAModelController.java +++ b/project/src/main/java/com/sdm/project/controller/YAModelController.java @@ -110,6 +110,7 @@ public class YAModelController { rsp.setMessage("鉴权失败"); return rsp; } + adaptContext(); UploadFilesReq fileReq = new UploadFilesReq(); fileReq.setFileName(req.getName()); fileReq.setProjectId(req.getProject()); @@ -162,6 +163,7 @@ public class YAModelController { rsp.setMessage("鉴权失败"); return rsp; } + adaptContext(); UploadFilesReq fileReq = new UploadFilesReq(); fileReq.setFileName(req.getName()); fileReq.setProjectId(req.getProject()); @@ -193,6 +195,7 @@ public class YAModelController { private void adaptContext() { ThreadLocalContext.setTenantId(tenantId); + ThreadLocalContext.setUserId(userId); } /** @@ -221,6 +224,7 @@ public class YAModelController { rsp.setMessage("鉴权失败"); return rsp; } + adaptContext(); KeyResultReq addTaskRunReq = new KeyResultReq(); addTaskRunReq.setFile(req.getFile()); SdmResponse fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getScenario(), NodeTypeEnum.TASK.getValue(), 0L); @@ -260,6 +264,7 @@ public class YAModelController { rsp.setMessage("鉴权失败"); return rsp; } + adaptContext(); KeyResultReq keyResultReq = new KeyResultReq(); keyResultReq.setRunId(req.getScenario()); keyResultReq.setKeyResultType(req.getCode()); @@ -351,6 +356,7 @@ public class YAModelController { { if(!verifyBackEndJwt(authorization)) return SdmResponse.failed("鉴权失败"); + adaptContext(); GetSimulationTaskFileReq req = new GetSimulationTaskFileReq(); req.setUuid(outsideReq.getTaskId()); req.setFileBizType(1); @@ -369,6 +375,7 @@ public class YAModelController { { if(!verifyBackEndJwt(authorization)) return SdmResponse.failed("鉴权失败"); + adaptContext(); GetSimulationTaskFileReq req = new GetSimulationTaskFileReq(); req.setUuid(outsideReq.getTaskId()); req.setFileBizType(2); @@ -393,6 +400,7 @@ public class YAModelController { rsp.setMessage("鉴权失败"); return rsp; } + adaptContext(); return nodeService.syncProject(req); } @@ -405,6 +413,7 @@ public class YAModelController { rsp.setMessage("鉴权失败"); return rsp; } + adaptContext(); return taskService.syncCidTask(req); } 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 993e649b..2fed4b04 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 @@ -533,6 +533,8 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul String standardName = ""; for(FileMetadataInfoResp fileMetadataInfoResp : fileMetas) { + if(fileMetadataInfoResp == null) + continue; long parentId = fileMetadataInfoResp.getParentId(); long fileId = fileMetadataInfoResp.getId(); String fileName = fileMetadataInfoResp.getOriginalName();