ci4s
/
ci4sManagement-cloud
41
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

修改接口BUG

This commit is contained in:
fans 2024-01-25 14:51:23 +08:00
parent e2c4a2403e
commit f106466cb7
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java
View File

@ -115,13 +115,12 @@ public class ExperimentInsController {
/**
* 查询实验实例日志
*
* @param req Map类型的请求头
* @return 运行日志
*/
@GetMapping(("/log/"))
@GetMapping(("/log"))
@ApiOperation("查询实例日志")
public AjaxResult showExperimentInsLog(@RequestParam Integer id,
public AjaxResult showExperimentInsLog(@RequestParam("id") Integer id,
@RequestParam("component_id") String componentId){
return AjaxResult.success(this.experimentInsService.showExperimentInsLog(id,componentId));
}

10
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java
View File

@ -59,7 +59,7 @@ public class Experiment implements Serializable {
*/
private Integer state;
private List<ExperimentIns> experimentInsList;
private String workflowName;
public String getName() {
return name;
}
@ -149,5 +149,13 @@ public class Experiment implements Serializable {
public void setExperimentInsList(List<ExperimentIns> experimentInsList) {
this.experimentInsList = experimentInsList;
}
public String getWorkflowName() {
return workflowName;
}
public void setWorkflowName(String workflowName) {
this.workflowName = workflowName;
}
}

2
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
View File

@ -241,8 +241,6 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
throw new RuntimeException("工作流状态为空。");
}
//解析流水线开始时间，开始时间一定存在，所以不需要判断
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
Date startTime = DateUtils.convertUTCtoShanghaiDate((String) status.get("startedAt"));
experimentIns.setStartTime(startTime);

7
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java
View File

@ -85,16 +85,9 @@ public class ExperimentServiceImpl implements ExperimentService {
*/
@Override
public Page<Experiment> queryByPage(Experiment experiment, PageRequest pageRequest) {
// long total = this.experimentDao.count(experiment);
// return new PageImpl<>(this.experimentDao.queryAllByLimit(experiment, pageRequest), pageRequest, total);
List<Experiment> experimentList = this.experimentDao.queryAllByLimit(experiment, pageRequest);
long total = this.experimentDao.count(experiment);
// 存储所有实验的ID列表
//对于每一个从Experiment表中查询出来的id，可能有多个实例，每个实例的实验id是不同的
// for (Experiment exp: experimentList) {
// List<ExperimentIns> experimentInsList = this.experimentInsService.getByExperimentId(exp.getId());
// exp.setExperimentInsList(experimentInsList);
// }
return new PageImpl<>(experimentList,pageRequest,total);
}