From 725b8ad794498f08032daa84a3953fe5cd1a4ed4 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 7 Jan 2026 19:03:29 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9F=A5=E8=AF=A2=E6=8A=A5=E5=B7=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1-sql/2026-01-07/project/simulation_work.sql | 2 + .../controller/SimulationWorkController.java | 13 +++--- .../project/model/entity/SimulationWork.java | 3 ++ .../project/model/req/SpdmWorkListReq.java | 44 +------------------ .../sdm/project/model/req/SpdmWorkReq.java | 2 + .../service/ISimulationWorkService.java | 3 ++ .../impl/SimulationWorkServiceImpl.java | 14 ++++++ 7 files changed, 33 insertions(+), 48 deletions(-) create mode 100644 1-sql/2026-01-07/project/simulation_work.sql diff --git a/1-sql/2026-01-07/project/simulation_work.sql b/1-sql/2026-01-07/project/simulation_work.sql new file mode 100644 index 00000000..fe5aa71e --- /dev/null +++ b/1-sql/2026-01-07/project/simulation_work.sql @@ -0,0 +1,2 @@ +ALTER TABLE `spdm_baseline`.`simulation_work` + ADD COLUMN `taskId` VARCHAR(255) NULL COMMENT '关联的任务id' AFTER `updateTime`; \ No newline at end of file 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 2307955a..2ad4a50b 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationWorkController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationWorkController.java @@ -2,6 +2,7 @@ package com.sdm.project.controller; import com.sdm.common.common.SdmResponse; import com.sdm.common.log.annotation.SysLog; +import com.sdm.project.model.req.SpdmWorkListReq; import com.sdm.project.model.req.SpdmWorkReq; import com.sdm.project.service.ISimulationWorkService; import io.swagger.v3.oas.annotations.Operation; @@ -34,11 +35,11 @@ public class SimulationWorkController { return simulationWorkService.updateWork(req); } -// @SysLog("查询报工") -// @PostMapping("/queryWork") -// @Operation(summary = "查询报工", description = "查询报工") -// public SdmResponse queryWork(@RequestBody SpdmWorkReq req) { -// return simulationWorkService.queryWork(req); -// } + @SysLog("查询报工") + @PostMapping("/queryWork") + @Operation(summary = "查询报工", description = "查询报工") + public SdmResponse queryWork(@RequestBody SpdmWorkListReq req) { + return simulationWorkService.queryWork(req); + } } diff --git a/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java b/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java index cf0e6732..90f98a1a 100644 --- a/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java +++ b/project/src/main/java/com/sdm/project/model/entity/SimulationWork.java @@ -84,5 +84,8 @@ public class SimulationWork implements Serializable { @TableField("updateTime") private String updateTime; + @ApiModelProperty(value = "关联的任务id") + @TableField("taskId") + private String taskId; } 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 index 087f0c4a..0f6b429f 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmWorkListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmWorkListReq.java @@ -14,46 +14,6 @@ public class SpdmWorkListReq { @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; - + @NotNull(message = "taskId不能为空") + private String taskId; } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmWorkReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmWorkReq.java index 1b9a037c..14e513e5 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmWorkReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmWorkReq.java @@ -35,4 +35,6 @@ public class SpdmWorkReq { */ private Integer type; + private String taskId; + } diff --git a/project/src/main/java/com/sdm/project/service/ISimulationWorkService.java b/project/src/main/java/com/sdm/project/service/ISimulationWorkService.java index 9e815e79..48960142 100644 --- a/project/src/main/java/com/sdm/project/service/ISimulationWorkService.java +++ b/project/src/main/java/com/sdm/project/service/ISimulationWorkService.java @@ -3,6 +3,7 @@ package com.sdm.project.service; import com.baomidou.mybatisplus.extension.service.IService; import com.sdm.common.common.SdmResponse; import com.sdm.project.model.entity.SimulationWork; +import com.sdm.project.model.req.SpdmWorkListReq; import com.sdm.project.model.req.SpdmWorkReq; /** @@ -20,4 +21,6 @@ public interface ISimulationWorkService extends IService { SdmResponse updateWork(SpdmWorkReq req); + SdmResponse queryWork(SpdmWorkListReq req); + } diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java index c177dee3..6720669b 100644 --- a/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/SimulationWorkServiceImpl.java @@ -2,10 +2,15 @@ package com.sdm.project.service.impl; import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sdm.common.common.SdmResponse; +import com.sdm.common.utils.PageUtils; import com.sdm.common.utils.TimeCalculator; import com.sdm.project.dao.SimulationWorkMapper; +import com.sdm.project.model.entity.SimulationLocalJob; import com.sdm.project.model.entity.SimulationWork; +import com.sdm.project.model.req.SpdmWorkListReq; import com.sdm.project.model.req.SpdmWorkReq; import com.sdm.project.service.ISimulationWorkService; import lombok.extern.slf4j.Slf4j; @@ -17,6 +22,7 @@ import org.springframework.stereotype.Service; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** *

@@ -85,4 +91,12 @@ public class SimulationWorkServiceImpl extends ServiceImpl workList = this.lambdaQuery().eq(SimulationWork::getTaskId,req.getTaskId()).list(); + PageInfo page = new PageInfo<>(workList); + return PageUtils.getJsonObjectSdmResponse(workList, page); + } + }