diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java index a8169bbc..48951900 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java @@ -29,7 +29,7 @@ public interface ExperimentInsDao { * @param pageable 分页对象 * @return 对象列表 */ - List queryAllByLimit(@Param("experimentIns")ExperimentIns experimentIns, @Param("pageable") Pageable pageable); + List queryAllByLimit(@Param("experimentIns") ExperimentIns experimentIns, @Param("pageable") Pageable pageable); /** * 统计总行数 @@ -70,7 +70,7 @@ public interface ExperimentInsDao { * @param experimentIns 实例对象 * @return 影响行数 */ - int update(ExperimentIns experimentIns); + int update(@Param("experimentIns") ExperimentIns experimentIns); /** * 通过主键删除数据 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index e9dcd214..fa1eebf8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -77,7 +78,6 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { } } - return experimentIns; } @@ -242,6 +242,19 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { if (status == null || status.isEmpty()) { throw new RuntimeException("工作流状态为空。"); } + //解析流水线开始时间,开始时间一定存在,所以不需要判断 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + + String startedAtString = (String) status.get("startedAt"); + Date startTime = dateFormat.parse(startedAtString); + experimentIns.setStartTime(startTime); + + //解析流水线结束时间 + String finishedAtString = (String) status.get("finishedAt"); + if (finishedAtString != null && !finishedAtString.isEmpty()) { + Date finishTime = dateFormat.parse(finishedAtString); + experimentIns.setFinishTime(finishTime); + } // 解析nodes字段,提取节点状态并转换为JSON字符串 Map nodes = (Map) status.get("nodes"); @@ -262,7 +275,6 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { } - /** * 终止已经创建的实验实例 * diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml index e9005805..9a4462fb 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml @@ -62,10 +62,10 @@ and nodes_logs = #{experimentIns.nodesLogs} - + and start_time = #{experimentIns.startTime} - + and finish_time = #{experimentIns.finishTime} @@ -111,10 +111,10 @@ and nodes_logs = #{experimentIns.nodesLogs} - + and start_time = #{experimentIns.startTime} - + and finish_time = #{experimentIns.finishTime} @@ -161,10 +161,10 @@ and nodes_logs = #{experimentIns.nodesLogs} - + and start_time = #{experimentIns.startTime} - + and finish_time = #{experimentIns.finishTime} @@ -231,10 +231,10 @@ nodes_logs = #{experimentIns.nodesLogs}, - + start_time = #{experimentIns.startTime}, - + finish_time = #{experimentIns.finishTime},