From bebe4489242dc6233e6d3cafcdb52b42d24f7654 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 28 Nov 2025 15:27:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:YIAN=E5=85=B3=E9=94=AE=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/YAModelController.java | 40 ++++++++++++++++++- .../req/YA/SaveKeyResultNodeInfoReq.java | 7 +++- 2 files changed, 44 insertions(+), 3 deletions(-) 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 b4760ae4..c7739c2e 100644 --- a/project/src/main/java/com/sdm/project/controller/YAModelController.java +++ b/project/src/main/java/com/sdm/project/controller/YAModelController.java @@ -2,14 +2,18 @@ package com.sdm.project.controller; import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.enums.NodeTypeEnum; import com.sdm.common.entity.req.data.UploadFilesReq; +import com.sdm.common.entity.resp.data.FileMetadataInfoResp; import com.sdm.common.feign.inter.data.IDataFeignClient; +import com.sdm.project.model.req.KeyResultReq; import com.sdm.project.model.req.YA.*; import com.sdm.project.model.resp.YA.BosimSaveNodeInfoRsp; import com.sdm.project.model.resp.YA.BosimSaveProjectTaskRsp; import com.sdm.project.service.INodeService; import com.sdm.project.service.ITaskService; +import com.sdm.project.service.ISimulationRunService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -34,6 +38,8 @@ public class YAModelController { @Resource ITaskService taskService; + @Resource + ISimulationRunService runService; /** @@ -138,9 +144,41 @@ public class YAModelController { ) public BosimSaveNodeInfoRsp saveKeyResultNodeInfo(SaveKeyResultNodeInfoReq req) { - return null; + KeyResultReq addTaskRunReq = new KeyResultReq(); + addTaskRunReq.setFile(req.getFile()); + SdmResponse fileMetadataInfoResp = dataFeignClient.queryFileMetadataInfo(req.getScenario(), NodeTypeEnum.TASK.getValue(), 0); + if (fileMetadataInfoResp.getData() != null) { + addTaskRunReq.setDirId(fileMetadataInfoResp.getData().getId()); + } + addTaskRunReq.setFileName(req.getFileName()); + addTaskRunReq.setFileType(req.getFileType()); + addTaskRunReq.setRunId(req.getScenario()); + addTaskRunReq.setKeyResultType(req.getCode()); + addTaskRunReq.setName(req.getName()); + addTaskRunReq.setQuantityType(req.getQuantityType()); + addTaskRunReq.setValue(req.getValue()); + addTaskRunReq.setUnits(req.getUnits()); + SdmResponse addTaskRunResp = runService.addSimulationKeyResult(addTaskRunReq); + + BosimSaveNodeInfoRsp rsp = new BosimSaveNodeInfoRsp(); + if(addTaskRunResp.isSuccess()) + { + rsp.setCode("200"); + rsp.setMessage("success"); + rsp.getWorkRequest().add(String.valueOf(addTaskRunResp.getData())); + } + return rsp; } + @PostMapping("") + public BosimSaveNodeInfoRsp deleteModelNodeInfo(DeleteModelNodeInfoReq req) + { + return null; + } + + + + diff --git a/project/src/main/java/com/sdm/project/model/req/YA/SaveKeyResultNodeInfoReq.java b/project/src/main/java/com/sdm/project/model/req/YA/SaveKeyResultNodeInfoReq.java index b4c1f861..fea9b1d0 100644 --- a/project/src/main/java/com/sdm/project/model/req/YA/SaveKeyResultNodeInfoReq.java +++ b/project/src/main/java/com/sdm/project/model/req/YA/SaveKeyResultNodeInfoReq.java @@ -15,8 +15,8 @@ public class SaveKeyResultNodeInfoReq { @Schema(description = "数据名称") private String name; - @Schema(description = "数据类型编号") - private String code; + @Schema(description = "数据类型编号,参考KeyResultTypeEnum") + private Integer code; @Schema(description = "仿真分析项") private String scenario; @@ -45,6 +45,9 @@ public class SaveKeyResultNodeInfoReq { @Schema(description = "文件名称") private String fileName; + @Schema(description = "文件类型,参考FileBizTypeEnum") + private Integer fileType; + @Schema(description = "数值") private String value;