1、查询报工接口
This commit is contained in:
2
1-sql/2026-01-07/project/simulation_work.sql
Normal file
2
1-sql/2026-01-07/project/simulation_work.sql
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE `spdm_baseline`.`simulation_work`
|
||||||
|
ADD COLUMN `taskId` VARCHAR(255) NULL COMMENT '关联的任务id' AFTER `updateTime`;
|
||||||
@@ -2,6 +2,7 @@ package com.sdm.project.controller;
|
|||||||
|
|
||||||
import com.sdm.common.common.SdmResponse;
|
import com.sdm.common.common.SdmResponse;
|
||||||
import com.sdm.common.log.annotation.SysLog;
|
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.model.req.SpdmWorkReq;
|
||||||
import com.sdm.project.service.ISimulationWorkService;
|
import com.sdm.project.service.ISimulationWorkService;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
@@ -34,11 +35,11 @@ public class SimulationWorkController {
|
|||||||
return simulationWorkService.updateWork(req);
|
return simulationWorkService.updateWork(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
// @SysLog("查询报工")
|
@SysLog("查询报工")
|
||||||
// @PostMapping("/queryWork")
|
@PostMapping("/queryWork")
|
||||||
// @Operation(summary = "查询报工", description = "查询报工")
|
@Operation(summary = "查询报工", description = "查询报工")
|
||||||
// public SdmResponse queryWork(@RequestBody SpdmWorkReq req) {
|
public SdmResponse queryWork(@RequestBody SpdmWorkListReq req) {
|
||||||
// return simulationWorkService.queryWork(req);
|
return simulationWorkService.queryWork(req);
|
||||||
// }
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,5 +84,8 @@ public class SimulationWork implements Serializable {
|
|||||||
@TableField("updateTime")
|
@TableField("updateTime")
|
||||||
private String updateTime;
|
private String updateTime;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "关联的任务id")
|
||||||
|
@TableField("taskId")
|
||||||
|
private String taskId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,46 +14,6 @@ public class SpdmWorkListReq {
|
|||||||
@NotNull(message = "size不能为空")
|
@NotNull(message = "size不能为空")
|
||||||
private Integer size;
|
private Integer size;
|
||||||
|
|
||||||
/**
|
@NotNull(message = "taskId不能为空")
|
||||||
* 本地应用名称
|
private String taskId;
|
||||||
*/
|
|
||||||
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;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,4 +35,6 @@ public class SpdmWorkReq {
|
|||||||
*/
|
*/
|
||||||
private Integer type;
|
private Integer type;
|
||||||
|
|
||||||
|
private String taskId;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.sdm.project.service;
|
|||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.sdm.common.common.SdmResponse;
|
import com.sdm.common.common.SdmResponse;
|
||||||
import com.sdm.project.model.entity.SimulationWork;
|
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.model.req.SpdmWorkReq;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,4 +21,6 @@ public interface ISimulationWorkService extends IService<SimulationWork> {
|
|||||||
|
|
||||||
SdmResponse updateWork(SpdmWorkReq req);
|
SdmResponse updateWork(SpdmWorkReq req);
|
||||||
|
|
||||||
|
SdmResponse queryWork(SpdmWorkListReq req);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,15 @@ package com.sdm.project.service.impl;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
|
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
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.common.SdmResponse;
|
||||||
|
import com.sdm.common.utils.PageUtils;
|
||||||
import com.sdm.common.utils.TimeCalculator;
|
import com.sdm.common.utils.TimeCalculator;
|
||||||
import com.sdm.project.dao.SimulationWorkMapper;
|
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.entity.SimulationWork;
|
||||||
|
import com.sdm.project.model.req.SpdmWorkListReq;
|
||||||
import com.sdm.project.model.req.SpdmWorkReq;
|
import com.sdm.project.model.req.SpdmWorkReq;
|
||||||
import com.sdm.project.service.ISimulationWorkService;
|
import com.sdm.project.service.ISimulationWorkService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -17,6 +22,7 @@ import org.springframework.stereotype.Service;
|
|||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
@@ -85,4 +91,12 @@ public class SimulationWorkServiceImpl extends ServiceImpl<SimulationWorkMapper,
|
|||||||
return updateFlag ? SdmResponse.success() : SdmResponse.failed("更新报工信息失败");
|
return updateFlag ? SdmResponse.success() : SdmResponse.failed("更新报工信息失败");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SdmResponse queryWork(SpdmWorkListReq req) {
|
||||||
|
PageHelper.startPage(req.getCurrent(), req.getSize());
|
||||||
|
List<SimulationWork> workList = this.lambdaQuery().eq(SimulationWork::getTaskId,req.getTaskId()).list();
|
||||||
|
PageInfo<SimulationWork> page = new PageInfo<>(workList);
|
||||||
|
return PageUtils.getJsonObjectSdmResponse(workList, page);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user