From e44b31d7998d755f9baa50242bd89717c57e3dbf Mon Sep 17 00:00:00 2001 From: daiqy88 Date: Fri, 28 Nov 2025 13:39:47 +0800 Subject: [PATCH] =?UTF-8?q?YA=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/resources/application-local.yml | 2 +- .../project/controller/YAModelController.java | 129 ++++++++++++++---- ...NodeRsp.java => BosimSaveNodeInfoRsp.java} | 8 +- .../src/main/resources/application-local.yml | 2 +- 4 files changed, 109 insertions(+), 32 deletions(-) rename project/src/main/java/com/sdm/project/model/resp/YA/{BosimSaveModelNodeRsp.java => BosimSaveNodeInfoRsp.java} (75%) diff --git a/data/src/main/resources/application-local.yml b/data/src/main/resources/application-local.yml index 379d4052..5aa87bb6 100644 --- a/data/src/main/resources/application-local.yml +++ b/data/src/main/resources/application-local.yml @@ -35,7 +35,7 @@ spring: nacos: discovery: server-addr: 192.168.65.161:8848 - group: LOCAL_GROUP + group: DAI_GROUP enabled: true servlet: multipart: 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 8f11e4db..87e90c3a 100644 --- a/project/src/main/java/com/sdm/project/controller/YAModelController.java +++ b/project/src/main/java/com/sdm/project/controller/YAModelController.java @@ -1,14 +1,12 @@ package com.sdm.project.controller; +import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; import com.sdm.common.entity.req.data.UploadFilesReq; -import com.sdm.project.model.req.YA.GetModelNodeInfoReq; -import com.sdm.project.model.req.YA.SaveModelNodeInfoReq; -import com.sdm.project.model.req.YA.SyncCidProjectReq; -import com.sdm.project.model.req.YA.SyncCidTaskReq; -import com.sdm.project.service.INodeService; -import com.sdm.project.service.ITaskService; +import com.sdm.common.feign.inter.data.IDataFeignClient; +import com.sdm.project.model.req.YA.*; +import com.sdm.project.model.resp.YA.BosimSaveNodeInfoRsp; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -16,26 +14,19 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/dataManager/tree/node") @Tag(name = "宜安项目数据归档", description = "宜安项目模型数据关了") public class YAModelController { - @Resource - private INodeService nodeService; + @Autowired + private IDataFeignClient dataFeignClient; - @Resource - private ITaskService taskService; /** - * 创建文件夹 + * 保存仿真模型数据 * * @param req * @return @@ -53,9 +44,8 @@ public class YAModelController { ) ) ) - public SdmResponse saveModelNodeInfo(@RequestBody @Validated SaveModelNodeInfoReq req) + public BosimSaveNodeInfoRsp saveModelNodeInfo(SaveModelNodeInfoReq req) { - UploadFilesReq fileReq = new UploadFilesReq(); fileReq.setFileName(req.getName()); fileReq.setProjectId(req.getProject()); @@ -63,10 +53,95 @@ public class YAModelController { fileReq.setFile(req.getFile()); fileReq.setUuid(req.getScenario()); fileReq.setAnalysisDirectionId(req.getScenario()); - - return null; + SdmResponse uploadRespond = dataFeignClient.uploadFiles(fileReq); + BosimSaveNodeInfoRsp rsp = new BosimSaveNodeInfoRsp(); + if(uploadRespond.isSuccess()) + { + JSONObject data = (JSONObject) uploadRespond.getData(); + rsp.setCode("200"); + rsp.setMessage("success"); + long fileId = data.getLong("fileId"); + rsp.getWorkRequest().add(String.valueOf(fileId)); + } + return rsp; } + /** + * 保存仿真报告 + * + * @param req + * @return + */ + @PostMapping(value = "/SaveReportNodeInfo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + @Operation( + summary = "上传仿真报告", + description = "仿真报告归档，支持同时上传文件和附加参数", + requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "仿真报告上传请求", + required = true, + content = @Content( + mediaType = MediaType.MULTIPART_FORM_DATA_VALUE, + schema = @Schema(implementation = SaveReportNodeInfoReq.class) + ) + ) + ) + public BosimSaveNodeInfoRsp saveReportNodeInfo(SaveReportNodeInfoReq req) + { + UploadFilesReq fileReq = new UploadFilesReq(); + fileReq.setFileName(req.getName()); + fileReq.setProjectId(req.getProject()); + fileReq.setFileType(2); + fileReq.setFile(req.getFile()); + fileReq.setUuid(req.getScenario()); + fileReq.setAnalysisDirectionId(req.getScenario()); + SdmResponse uploadRespond = dataFeignClient.uploadFiles(fileReq); + BosimSaveNodeInfoRsp rsp = new BosimSaveNodeInfoRsp(); + if(uploadRespond.isSuccess()) + { + JSONObject data = (JSONObject) uploadRespond.getData(); + rsp.setCode("200"); + rsp.setMessage("success"); + long fileId = data.getLong("fileId"); + rsp.getWorkRequest().add(String.valueOf(fileId)); + } + return rsp; + } + + /** + * 保存仿真关键结果 + * @param req + * @return + */ + @PostMapping(value = "/SaveKeyResultNodeInfo", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + @Operation( + summary = "保存仿真关键结果", + description = "仿真关键结果归档，支持同时上传文件和附加参数", + requestBody = @io.swagger.v3.oas.annotations.parameters.RequestBody( + description = "仿真关键结果上传请求", + required = true, + content = @Content( + mediaType = MediaType.MULTIPART_FORM_DATA_VALUE, + schema = @Schema(implementation = SaveReportNodeInfoReq.class) + ) + ) + ) + public BosimSaveNodeInfoRsp saveKeyResultNodeInfo(SaveKeyResultNodeInfoReq req) + { + + } + + @PostMapping("") + public BosimSaveNodeInfoRsp deleteModelNodeInfo(DeleteModelNodeInfoReq req) + { + + } + + + + + + + @PostMapping("GetModelNodeInfoByIdAndType") public void getModelNodeInfo(@RequestBody @Validated GetModelNodeInfoReq req) { @@ -79,16 +154,16 @@ public class YAModelController { } - @PostMapping("syncProject") - public void syncCidProject(@RequestBody @Validated SyncCidProjectReq req) + @PostMapping("SyncProject") + public void syncCidProject() { - nodeService.syncProject(req); + } - @PostMapping("syncCidTask") - public void syncCidTask(@RequestBody @Validated SyncCidTaskReq req) + @PostMapping("SyncCidTask") + public void syncCidTask() { - taskService.syncCidTask(req); + } } \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/model/resp/YA/BosimSaveModelNodeRsp.java b/project/src/main/java/com/sdm/project/model/resp/YA/BosimSaveNodeInfoRsp.java similarity index 75% rename from project/src/main/java/com/sdm/project/model/resp/YA/BosimSaveModelNodeRsp.java rename to project/src/main/java/com/sdm/project/model/resp/YA/BosimSaveNodeInfoRsp.java index 43d5c2d4..ceb54bd7 100644 --- a/project/src/main/java/com/sdm/project/model/resp/YA/BosimSaveModelNodeRsp.java +++ b/project/src/main/java/com/sdm/project/model/resp/YA/BosimSaveNodeInfoRsp.java @@ -1,17 +1,19 @@ package com.sdm.project.model.resp.YA; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import java.util.ArrayList; import java.util.List; -public class BosimSaveModelNodeRsp { +@Data +public class BosimSaveNodeInfoRsp { @Schema(description = "返回码") - private String code; + private String code ; @Schema(description = "返回信息") - private String message; + private String message = ""; private List workRequest = new ArrayList<>(); } diff --git a/project/src/main/resources/application-local.yml b/project/src/main/resources/application-local.yml index d20ac8f9..209fba0a 100644 --- a/project/src/main/resources/application-local.yml +++ b/project/src/main/resources/application-local.yml @@ -36,7 +36,7 @@ spring: discovery: server-addr: 192.168.65.161:8848 enabled: true - group: LOCAL_GROUP + group: DAI_GROUP # username: nacos # password: ENC(+QKYnI6gAYu1SbLaZQTkZA==) data: