From 5882200f4b501d48604d97f47615fb77ee79421b Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 7 Jan 2026 16:13:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=90=8C=E6=AD=A5=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=20bugfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SimulationTaskController.java | 7 +++ .../controller/SimulationWorkController.java | 7 +++ .../project/model/req/SpdmWorkListReq.java | 59 +++++++++++++++++++ .../com/sdm/project/service/ITaskService.java | 2 + .../impl/LyricInternalServiceImpl.java | 12 ++-- .../project/service/impl/TaskServiceImpl.java | 14 +++++ 6 files changed, 95 insertions(+), 6 deletions(-) create mode 100644 project/src/main/java/com/sdm/project/model/req/SpdmWorkListReq.java 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 3fcd29f5..5dc538ed 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationTaskController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationTaskController.java @@ -16,6 +16,7 @@ import com.sdm.project.service.ITaskService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotBlank; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -257,4 +258,10 @@ public class SimulationTaskController implements ISimulationTaskFeignClient { return taskService.deleteTask(req); } + @GetMapping("/queryTaskByProjectCodeForEp") + @Operation(summary = "通过项目code查询任务（EP系统使用）", description = "通过项目code查询任务（EP系统使用）") + public SdmResponse queryTaskByProjectCodeForEp(@RequestParam @NotBlank String projectCode) { + return taskService.queryTaskByProjectCodeForEp(projectCode); + } + } diff --git a/project/src/main/java/com/sdm/project/controller/SimulationWorkController.java b/project/src/main/java/com/sdm/project/controller/SimulationWorkController.java index 4b940c72..2307955a 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationWorkController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationWorkController.java @@ -34,4 +34,11 @@ public class SimulationWorkController { return simulationWorkService.updateWork(req); } +// @SysLog("查询报工") +// @PostMapping("/queryWork") +// @Operation(summary = "查询报工", description = "查询报工") +// public SdmResponse queryWork(@RequestBody SpdmWorkReq req) { +// return simulationWorkService.queryWork(req); +// } + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmWorkListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmWorkListReq.java new file mode 100644 index 00000000..087f0c4a --- /dev/null +++ b/project/src/main/java/com/sdm/project/model/req/SpdmWorkListReq.java @@ -0,0 +1,59 @@ +package com.sdm.project.model.req; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class SpdmWorkListReq { + + @NotNull(message = "current不能为空") + private Integer current; + + @NotNull(message = "size不能为空") + private Integer size; + + /** + * 本地应用名称 + */ + private String localAppName; + + /** + * 本地应用版本 + */ + private String localAppVersion; + + + /** + * 计算任务所属算力名称 + */ + private String runName; + + /** + * 计算任务所属任务名称 + */ + private String taskName; + + /** + * 任务开始时间（建议格式：yyyy-MM-dd HH:mm:ss） + */ + private String startTime; + + /** + * 任务结束时间（建议格式：yyyy-MM-dd HH:mm:ss） + */ + private String endTime; + + /** + * 任务状态，Running,Finished,Failed + */ + private String jobStatus; + + + /** + * 错误信息 + */ + private String errMsg; + +} 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 6a959f83..a954bd0a 100644 --- a/project/src/main/java/com/sdm/project/service/ITaskService.java +++ b/project/src/main/java/com/sdm/project/service/ITaskService.java @@ -79,4 +79,6 @@ public interface ITaskService { SdmResponse deleteTask(SpdmDeleteTaskReq req); + SdmResponse queryTaskByProjectCodeForEp(String projectCode); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index c778cd14..7f1fb777 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -201,7 +201,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { SpdmAddDemandReq spdmAddDemandReq = new SpdmAddDemandReq(); uuid = RandomUtil.generateString(32); spdmAddDemandReq.setUuid(uuid); - spdmAddDemandReq.setDemandName(emulation.getEmulationDemand()); + spdmAddDemandReq.setDemandName(emulation.getSubject()); if (ObjectUtils.isNotEmpty(emulation.getTodoId())) { spdmAddDemandReq.setDemandCode(String.valueOf(emulation.getTodoId())); } @@ -280,11 +280,11 @@ public class LyricInternalServiceImpl implements ILyricInternalService { extraReq15.setPropertyName("requiredTime"); extraReq15.setPropertyValue(emulation.getRequiredTime()); extras.add(extraReq15); - SpdmDemandExtraReq extraReq20 = new SpdmDemandExtraReq(); - extraReq20.setDemandId(uuid); - extraReq20.setPropertyName("subject"); - extraReq20.setPropertyValue(emulation.getSubject()); - extras.add(extraReq20); +// SpdmDemandExtraReq extraReq20 = new SpdmDemandExtraReq(); +// extraReq20.setDemandId(uuid); +// extraReq20.setPropertyName("subject"); +// extraReq20.setPropertyValue(emulation.getSubject()); +// extras.add(extraReq20); SpdmDemandExtraReq extraReq21 = new SpdmDemandExtraReq(); extraReq21.setDemandId(uuid); extraReq21.setPropertyName("todoNum"); 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 81e95d9c..dd3c753d 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 @@ -2757,4 +2757,18 @@ public class TaskServiceImpl implements ITaskService { return SdmResponse.success("删除任务成功"); } + @Override + public SdmResponse queryTaskByProjectCodeForEp(String projectCode) { + // 通过projectCode查询项目 + SimulationNode simulationNode = nodeService.lambdaQuery() + .eq(SimulationNode::getNodeCode, projectCode) + .eq(SimulationNode::getNodeType, NodeTypeEnum.PROJECT.getValue()) + .one(); + if (ObjectUtils.isEmpty(simulationNode)) { + return SdmResponse.failed("未查询到项目信息"); + } + List taskList = simulationTaskService.lambdaQuery().eq(SimulationTask::getTag1, simulationNode.getUuid()).list(); + return SdmResponse.success(taskList); + } + }